From e71fe514bd370c8369c86d88120ce12f35357e6b Mon Sep 17 00:00:00 2001 From: Bharath Ramsundar Date: Mon, 25 Jun 2018 20:04:01 -0700 Subject: [PATCH] safemath changes --- build/contracts/AttributeStore.json | 28 +- build/contracts/BasicToken.json | 640 +- build/contracts/ConstructableToken.json | 204 +- build/contracts/DLL.json | 3472 ++--- build/contracts/ERC20.json | 456 +- build/contracts/ERC20Basic.json | 324 +- build/contracts/PLCRVoting.json | 12364 +++++++++--------- build/contracts/Parameterizer.json | 12490 +++++++++--------- build/contracts/Registry.json | 15002 ++++++++++++---------- build/contracts/SafeMath.json | 956 +- build/contracts/StandardToken.json | 1548 +-- contracts/PLCRVoting.sol | 12 +- contracts/Parameterizer.sol | 10 +- contracts/Registry.sol | 22 +- 14 files changed, 25195 insertions(+), 22333 deletions(-) diff --git a/build/contracts/AttributeStore.json b/build/contracts/AttributeStore.json index 2129061..f9af681 100644 --- a/build/contracts/AttributeStore.json +++ b/build/contracts/AttributeStore.json @@ -55,14 +55,14 @@ "type": "function" } ], - "bytecode": "0x6103bf610030600b82828239805160001a6073146000811461002057610022565bfe5b5030600052607381538281f3007300000000000000000000000000000000000000003014608060405260043610610063576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806350389f5c14610068578063977aa031146100f0575b600080fd5b6100da600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061017b565b6040518082815260200191505060405180910390f35b8180156100fc57600080fd5b50610179600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050610287565b005b600080838360405160200180836000191660001916815260200182805190602001908083835b6020831015156101c657805182526020820191506020810190506020830392506101a1565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b602083101515610230578051825260208201915060208101905060208303925061020b565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508460000160008260001916600019168152602001908152602001600020549150509392505050565b6000838360405160200180836000191660001916815260200182805190602001908083835b6020831015156102d157805182526020820191506020810190506020830392506102ac565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561033b5780518252602082019150602081019050602083039250610316565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508185600001600083600019166000191681526020019081526020016000208190555050505050505600a165627a7a723058204122d2ae8a5f7124771b2c565fe950884c6a6c74ad1fca39d3dcb4f83dbe66b10029", - "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610063576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806350389f5c14610068578063977aa031146100f0575b600080fd5b6100da600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061017b565b6040518082815260200191505060405180910390f35b8180156100fc57600080fd5b50610179600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050610287565b005b600080838360405160200180836000191660001916815260200182805190602001908083835b6020831015156101c657805182526020820191506020810190506020830392506101a1565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b602083101515610230578051825260208201915060208101905060208303925061020b565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508460000160008260001916600019168152602001908152602001600020549150509392505050565b6000838360405160200180836000191660001916815260200182805190602001908083835b6020831015156102d157805182526020820191506020810190506020830392506102ac565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561033b5780518252602082019150602081019050602083039250610316565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508185600001600083600019166000191681526020019081526020016000208190555050505050505600a165627a7a723058204122d2ae8a5f7124771b2c565fe950884c6a6c74ad1fca39d3dcb4f83dbe66b10029", + "bytecode": "0x6103bf610030600b82828239805160001a6073146000811461002057610022565bfe5b5030600052607381538281f3007300000000000000000000000000000000000000003014608060405260043610610063576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806350389f5c14610068578063977aa031146100f0575b600080fd5b6100da600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061017b565b6040518082815260200191505060405180910390f35b8180156100fc57600080fd5b50610179600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050610287565b005b600080838360405160200180836000191660001916815260200182805190602001908083835b6020831015156101c657805182526020820191506020810190506020830392506101a1565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b602083101515610230578051825260208201915060208101905060208303925061020b565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508460000160008260001916600019168152602001908152602001600020549150509392505050565b6000838360405160200180836000191660001916815260200182805190602001908083835b6020831015156102d157805182526020820191506020810190506020830392506102ac565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561033b5780518252602082019150602081019050602083039250610316565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508185600001600083600019166000191681526020019081526020016000208190555050505050505600a165627a7a723058203765cf99eae34e1c2e0f4ee06ce5ba3e5c6126ea4a373539f4c7cc9816de21820029", + "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610063576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806350389f5c14610068578063977aa031146100f0575b600080fd5b6100da600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061017b565b6040518082815260200191505060405180910390f35b8180156100fc57600080fd5b50610179600480360381019080803590602001909291908035600019169060200190929190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050610287565b005b600080838360405160200180836000191660001916815260200182805190602001908083835b6020831015156101c657805182526020820191506020810190506020830392506101a1565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b602083101515610230578051825260208201915060208101905060208303925061020b565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508460000160008260001916600019168152602001908152602001600020549150509392505050565b6000838360405160200180836000191660001916815260200182805190602001908083835b6020831015156102d157805182526020820191506020810190506020830392506102ac565b6001836020036101000a038019825116818451168082178552505050505050905001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561033b5780518252602082019150602081019050602083039250610316565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090508185600001600083600019166000191681526020019081526020016000208190555050505050505600a165627a7a723058203765cf99eae34e1c2e0f4ee06ce5ba3e5c6126ea4a373539f4c7cc9816de21820029", "sourceMap": "26:510:0:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24", "deployedSourceMap": "26:510:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;110:203;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;317:217;;8:9:-1;5:2;;;30:1;27;20:12;5:2;317:217:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;110:203;207:4;221:11;262:5;269:9;245:34;;;;;;;;;;;;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;245:34:0;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;245:34:0;;;235:45;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;235:45:0;;;;;;;;;;;;;;;;221:59;;293:4;:10;;:15;304:3;293:15;;;;;;;;;;;;;;;;;;286:22;;110:203;;;;;;:::o;317:217::-;438:11;479:5;486:9;462:34;;;;;;;;;;;;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;462:34:0;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;462:34:0;;;452:45;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;452:45:0;;;;;;;;;;;;;;;;438:59;;521:8;503:4;:10;;:15;514:3;503:15;;;;;;;;;;;;;;;;;:26;;;;317:217;;;;;:::o", "source": "pragma solidity 0.4.24;\n\n\nlibrary AttributeStore {\n struct Data {\n mapping(bytes32 => uint) store;\n }\n\n function getAttribute(Data storage self, bytes32 _UUID, string _attrName)\n public view returns (uint)\n {\n bytes32 key = keccak256(abi.encodePacked(_UUID, _attrName));\n return self.store[key];\n }\n\n function setAttribute(\n Data storage self,\n bytes32 _UUID,\n string _attrName,\n uint _attrVal) public\n {\n bytes32 key = keccak256(abi.encodePacked(_UUID, _attrName));\n self.store[key] = _attrVal;\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/AttributeStore.sol", + "sourcePath": "/home/bharath/computable/contracts/AttributeStore.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/AttributeStore.sol", + "absolutePath": "/home/bharath/computable/contracts/AttributeStore.sol", "exportedSymbols": { "AttributeStore": [ 64 @@ -239,7 +239,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 4140, "src": "245:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -286,7 +286,7 @@ "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, + "referencedDeclaration": 4147, "src": "235:9:0", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", @@ -598,7 +598,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 4140, "src": "462:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -645,7 +645,7 @@ "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, + "referencedDeclaration": 4147, "src": "452:9:0", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", @@ -902,7 +902,7 @@ "src": "0:537:0" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/AttributeStore.sol", + "absolutePath": "/home/bharath/computable/contracts/AttributeStore.sol", "exportedSymbols": { "AttributeStore": [ 64 @@ -1079,7 +1079,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 4140, "src": "245:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -1126,7 +1126,7 @@ "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, + "referencedDeclaration": 4147, "src": "235:9:0", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", @@ -1438,7 +1438,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 4140, "src": "462:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -1485,7 +1485,7 @@ "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, + "referencedDeclaration": 4147, "src": "452:9:0", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", @@ -1747,5 +1747,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.346Z" + "updatedAt": "2018-06-26T02:58:22.314Z" } \ No newline at end of file diff --git a/build/contracts/BasicToken.json b/build/contracts/BasicToken.json index 7c5f261..2fc987f 100644 --- a/build/contracts/BasicToken.json +++ b/build/contracts/BasicToken.json @@ -80,24 +80,24 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b50610415806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610087578063a9059cbb146100de575b600080fd5b34801561006857600080fd5b50610071610143565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b506100c8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061014d565b6040518082815260200191505060405180910390f35b3480156100ea57600080fd5b50610129600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610195565b604051808215151515815260200191505060405180910390f35b6000600154905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156101d257600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561021f57600080fd5b610270826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103b490919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610303826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103cd90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b60008282111515156103c257fe5b818303905092915050565b600081830190508281101515156103e057fe5b809050929150505600a165627a7a723058201ee6f856adcd86c99435448c9a176c40a945000c983b6b598e121514e11d53c70029", - "deployedBytecode": "0x608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610087578063a9059cbb146100de575b600080fd5b34801561006857600080fd5b50610071610143565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b506100c8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061014d565b6040518082815260200191505060405180910390f35b3480156100ea57600080fd5b50610129600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610195565b604051808215151515815260200191505060405180910390f35b6000600154905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156101d257600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561021f57600080fd5b610270826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103b490919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610303826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103cd90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b60008282111515156103c257fe5b818303905092915050565b600081830190508281101515156103e057fe5b809050929150505600a165627a7a723058201ee6f856adcd86c99435448c9a176c40a945000c983b6b598e121514e11d53c70029", + "bytecode": "0x608060405234801561001057600080fd5b50610415806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610087578063a9059cbb146100de575b600080fd5b34801561006857600080fd5b50610071610143565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b506100c8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061014d565b6040518082815260200191505060405180910390f35b3480156100ea57600080fd5b50610129600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610195565b604051808215151515815260200191505060405180910390f35b6000600154905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156101d257600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561021f57600080fd5b610270826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103b490919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610303826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103cd90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b60008282111515156103c257fe5b818303905092915050565b600081830190508281101515156103e057fe5b809050929150505600a165627a7a72305820e82c1751a9dfccd6e942d46aac3bf65a4d8c7a47a4db44f98e1645a7743316590029", + "deployedBytecode": "0x608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610087578063a9059cbb146100de575b600080fd5b34801561006857600080fd5b50610071610143565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b506100c8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061014d565b6040518082815260200191505060405180910390f35b3480156100ea57600080fd5b50610129600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610195565b604051808215151515815260200191505060405180910390f35b6000600154905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156101d257600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561021f57600080fd5b610270826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103b490919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610303826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546103cd90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b60008282111515156103c257fe5b818303905092915050565b600081830190508281101515156103e057fe5b809050929150505600a165627a7a72305820e82c1751a9dfccd6e942d46aac3bf65a4d8c7a47a4db44f98e1645a7743316590029", "sourceMap": "170:1053:1:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;170:1053:1;;;;;;;", "deployedSourceMap": "170:1053:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;361:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;361:83:1;;;;;;;;;;;;;;;;;;;;;;;1121:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1121:99:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;598:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;598:321:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;361:83;405:7;427:12;;420:19;;361:83;:::o;1121:99::-;1177:7;1199:8;:16;1208:6;1199:16;;;;;;;;;;;;;;;;1192:23;;1121:99;;;:::o;598:321::-;661:4;696:1;681:17;;:3;:17;;;;673:26;;;;;;;;723:8;:20;732:10;723:20;;;;;;;;;;;;;;;;713:6;:30;;705:39;;;;;;;;774:32;799:6;774:8;:20;783:10;774:20;;;;;;;;;;;;;;;;:24;;:32;;;;:::i;:::-;751:8;:20;760:10;751:20;;;;;;;;;;;;;;;:55;;;;828:25;846:6;828:8;:13;837:3;828:13;;;;;;;;;;;;;;;;:17;;:25;;;;:::i;:::-;812:8;:13;821:3;812:13;;;;;;;;;;;;;;;:41;;;;885:3;864:33;;873:10;864:33;;;890:6;864:33;;;;;;;;;;;;;;;;;;910:4;903:11;;598:321;;;;:::o;1041:110:9:-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;1213:123::-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o", "source": "pragma solidity 0.4.24;\n\n\nimport \"./ERC20Basic.sol\";\nimport \"./SafeMath.sol\";\n\n\n/**\n * @title Basic token\n * @dev Basic version of StandardToken, with no allowances.\n */\ncontract BasicToken is ERC20Basic {\n using SafeMath for uint256;\n\n mapping(address => uint256) balances;\n\n uint256 totalSupply_;\n\n /**\n * @dev Total number of tokens in existence\n */\n function totalSupply() public view returns (uint256) {\n return totalSupply_;\n }\n\n /**\n * @dev Transfer token for a specified address\n * @param _to The address to transfer to.\n * @param _value The amount to be transferred.\n */\n function transfer(address _to, uint256 _value) public returns (bool) {\n require(_to != address(0));\n require(_value <= balances[msg.sender]);\n\n balances[msg.sender] = balances[msg.sender].sub(_value);\n balances[_to] = balances[_to].add(_value);\n emit Transfer(msg.sender, _to, _value);\n return true;\n }\n\n /**\n * @dev Gets the balance of the specified address.\n * @param _owner The address to query the the balance of.\n * @return An uint256 representing the amount owned by the passed address.\n */\n function balanceOf(address _owner) public view returns (uint256) {\n return balances[_owner];\n }\n\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/BasicToken.sol", + "sourcePath": "/home/bharath/computable/contracts/BasicToken.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/BasicToken.sol", + "absolutePath": "/home/bharath/computable/contracts/BasicToken.sol", "exportedSymbols": { "BasicToken": [ - 154 + 160 ] }, - "id": 155, + "id": 161, "nodeType": "SourceUnit", "nodes": [ { - "id": 60, + "id": 66, "literals": [ "solidity", "0.4", @@ -107,23 +107,23 @@ "src": "0:23:1" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "file": "./ERC20Basic.sol", - "id": 61, + "id": 67, "nodeType": "ImportDirective", - "scope": 155, - "sourceUnit": 555, + "scope": 161, + "sourceUnit": 561, "src": "26:26:1", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 62, + "id": 68, "nodeType": "ImportDirective", - "scope": 155, - "sourceUnit": 3772, + "scope": 161, + "sourceUnit": 3892, "src": "53:24:1", "symbolAliases": [], "unitAlias": "" @@ -134,53 +134,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 63, + "id": 69, "name": "ERC20Basic", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 554, + "referencedDeclaration": 560, "src": "193:10:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20Basic_$554", + "typeIdentifier": "t_contract$_ERC20Basic_$560", "typeString": "contract ERC20Basic" } }, - "id": 64, + "id": 70, "nodeType": "InheritanceSpecifier", "src": "193:10:1" } ], "contractDependencies": [ - 554 + 560 ], "contractKind": "contract", "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.", "fullyImplemented": true, - "id": 154, + "id": 160, "linearizedBaseContracts": [ - 154, - 554 + 160, + 560 ], "name": "BasicToken", "nodeType": "ContractDefinition", "nodes": [ { - "id": 67, + "id": 73, "libraryName": { "contractScope": null, - "id": 65, + "id": 71, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3771, + "referencedDeclaration": 3891, "src": "214:8:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3771", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "208:27:1", "typeName": { - "id": 66, + "id": 72, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "227:7:1", @@ -192,10 +192,10 @@ }, { "constant": false, - "id": 71, + "id": 77, "name": "balances", "nodeType": "VariableDeclaration", - "scope": 154, + "scope": 160, "src": "239:36:1", "stateVariable": true, "storageLocation": "default", @@ -204,9 +204,9 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 70, + "id": 76, "keyType": { - "id": 68, + "id": 74, "name": "address", "nodeType": "ElementaryTypeName", "src": "247:7:1", @@ -222,7 +222,7 @@ "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 69, + "id": 75, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "258:7:1", @@ -237,10 +237,10 @@ }, { "constant": false, - "id": 73, + "id": 79, "name": "totalSupply_", "nodeType": "VariableDeclaration", - "scope": 154, + "scope": 160, "src": "280:20:1", "stateVariable": true, "storageLocation": "default", @@ -249,7 +249,7 @@ "typeString": "uint256" }, "typeName": { - "id": 72, + "id": 78, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "280:7:1", @@ -263,33 +263,33 @@ }, { "body": { - "id": 80, + "id": 86, "nodeType": "Block", "src": "414:30:1", "statements": [ { "expression": { "argumentTypes": null, - "id": 78, + "id": 84, "name": "totalSupply_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 73, + "referencedDeclaration": 79, "src": "427:12:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 77, - "id": 79, + "functionReturnParameters": 83, + "id": 85, "nodeType": "Return", "src": "420:19:1" } ] }, "documentation": "@dev Total number of tokens in existence", - "id": 81, + "id": 87, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -297,22 +297,22 @@ "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 74, + "id": 80, "nodeType": "ParameterList", "parameters": [], "src": "381:2:1" }, "payable": false, "returnParameters": { - "id": 77, + "id": 83, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 76, + "id": 82, "name": "", "nodeType": "VariableDeclaration", - "scope": 81, + "scope": 87, "src": "405:7:1", "stateVariable": false, "storageLocation": "default", @@ -321,7 +321,7 @@ "typeString": "uint256" }, "typeName": { - "id": 75, + "id": 81, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "405:7:1", @@ -336,15 +336,15 @@ ], "src": "404:9:1" }, - "scope": 154, + "scope": 160, "src": "361:83:1", "stateMutability": "view", - "superFunction": 529, + "superFunction": 535, "visibility": "public" }, { "body": { - "id": 140, + "id": 146, "nodeType": "Block", "src": "667:252:1", "statements": [ @@ -358,18 +358,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 95, + "id": 101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 91, + "id": 97, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "681:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -384,7 +384,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 93, + "id": 99, "isConstant": false, "isLValue": false, "isPure": true, @@ -407,7 +407,7 @@ "typeString": "int_const 0" } ], - "id": 92, + "id": 98, "isConstant": false, "isLValue": false, "isPure": true, @@ -420,7 +420,7 @@ }, "typeName": "address" }, - "id": 94, + "id": 100, "isConstant": false, "isLValue": false, "isPure": true, @@ -448,21 +448,21 @@ "typeString": "bool" } ], - "id": 90, + "id": 96, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "673:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 96, + "id": 102, "isConstant": false, "isLValue": false, "isPure": false, @@ -476,7 +476,7 @@ "typeString": "tuple()" } }, - "id": 97, + "id": 103, "nodeType": "ExpressionStatement", "src": "673:26:1" }, @@ -490,18 +490,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 104, + "id": 110, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 99, + "id": 105, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "713:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -514,34 +514,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 100, + "id": 106, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "723:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 103, + "id": 109, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 101, + "id": 107, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "732:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 102, + "id": 108, "isConstant": false, "isLValue": false, "isPure": false, @@ -580,21 +580,21 @@ "typeString": "bool" } ], - "id": 98, + "id": 104, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "705:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 105, + "id": 111, "isConstant": false, "isLValue": false, "isPure": false, @@ -608,14 +608,14 @@ "typeString": "tuple()" } }, - "id": 106, + "id": 112, "nodeType": "ExpressionStatement", "src": "705:39:1" }, { "expression": { "argumentTypes": null, - "id": 118, + "id": 124, "isConstant": false, "isLValue": false, "isPure": false, @@ -624,34 +624,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 107, + "id": 113, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "751:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 110, + "id": 116, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 108, + "id": 114, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "760:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 109, + "id": 115, "isConstant": false, "isLValue": false, "isPure": false, @@ -683,11 +683,11 @@ "arguments": [ { "argumentTypes": null, - "id": 116, + "id": 122, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "799:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -706,34 +706,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 111, + "id": 117, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "774:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 114, + "id": 120, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 112, + "id": 118, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "783:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 113, + "id": 119, "isConstant": false, "isLValue": false, "isPure": false, @@ -758,21 +758,21 @@ "typeString": "uint256" } }, - "id": 115, + "id": 121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "774:24:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 117, + "id": 123, "isConstant": false, "isLValue": false, "isPure": false, @@ -792,14 +792,14 @@ "typeString": "uint256" } }, - "id": 119, + "id": 125, "nodeType": "ExpressionStatement", "src": "751:55:1" }, { "expression": { "argumentTypes": null, - "id": 129, + "id": 135, "isConstant": false, "isLValue": false, "isPure": false, @@ -808,25 +808,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 120, + "id": 126, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "812:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 122, + "id": 128, "indexExpression": { "argumentTypes": null, - "id": 121, + "id": 127, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "821:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -851,11 +851,11 @@ "arguments": [ { "argumentTypes": null, - "id": 127, + "id": 133, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "846:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -874,25 +874,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 123, + "id": 129, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "828:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 125, + "id": 131, "indexExpression": { "argumentTypes": null, - "id": 124, + "id": 130, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "837:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -910,21 +910,21 @@ "typeString": "uint256" } }, - "id": 126, + "id": 132, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "828:17:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 128, + "id": 134, "isConstant": false, "isLValue": false, "isPure": false, @@ -944,7 +944,7 @@ "typeString": "uint256" } }, - "id": 130, + "id": 136, "nodeType": "ExpressionStatement", "src": "812:41:1" }, @@ -956,18 +956,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 132, + "id": 138, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "873:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 133, + "id": 139, "isConstant": false, "isLValue": false, "isPure": false, @@ -983,11 +983,11 @@ }, { "argumentTypes": null, - "id": 134, + "id": 140, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "885:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -996,11 +996,11 @@ }, { "argumentTypes": null, - "id": 135, + "id": 141, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "890:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1023,18 +1023,18 @@ "typeString": "uint256" } ], - "id": 131, + "id": 137, "name": "Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 553, + "referencedDeclaration": 559, "src": "864:8:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 136, + "id": 142, "isConstant": false, "isLValue": false, "isPure": false, @@ -1048,7 +1048,7 @@ "typeString": "tuple()" } }, - "id": 137, + "id": 143, "nodeType": "EmitStatement", "src": "859:38:1" }, @@ -1056,7 +1056,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 138, + "id": 144, "isConstant": false, "isLValue": false, "isPure": true, @@ -1071,15 +1071,15 @@ }, "value": "true" }, - "functionReturnParameters": 89, - "id": 139, + "functionReturnParameters": 95, + "id": 145, "nodeType": "Return", "src": "903:11:1" } ] }, "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.", - "id": 141, + "id": 147, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -1087,15 +1087,15 @@ "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 86, + "id": 92, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 83, + "id": 89, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "616:11:1", "stateVariable": false, "storageLocation": "default", @@ -1104,7 +1104,7 @@ "typeString": "address" }, "typeName": { - "id": 82, + "id": 88, "name": "address", "nodeType": "ElementaryTypeName", "src": "616:7:1", @@ -1118,10 +1118,10 @@ }, { "constant": false, - "id": 85, + "id": 91, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "629:14:1", "stateVariable": false, "storageLocation": "default", @@ -1130,7 +1130,7 @@ "typeString": "uint256" }, "typeName": { - "id": 84, + "id": 90, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "629:7:1", @@ -1147,15 +1147,15 @@ }, "payable": false, "returnParameters": { - "id": 89, + "id": 95, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 88, + "id": 94, "name": "", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "661:4:1", "stateVariable": false, "storageLocation": "default", @@ -1164,7 +1164,7 @@ "typeString": "bool" }, "typeName": { - "id": 87, + "id": 93, "name": "bool", "nodeType": "ElementaryTypeName", "src": "661:4:1", @@ -1179,15 +1179,15 @@ ], "src": "660:6:1" }, - "scope": 154, + "scope": 160, "src": "598:321:1", "stateMutability": "nonpayable", - "superFunction": 545, + "superFunction": 551, "visibility": "public" }, { "body": { - "id": 152, + "id": 158, "nodeType": "Block", "src": "1186:34:1", "statements": [ @@ -1196,25 +1196,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 148, + "id": 154, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1199:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 150, + "id": 156, "indexExpression": { "argumentTypes": null, - "id": 149, + "id": 155, "name": "_owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 143, + "referencedDeclaration": 149, "src": "1208:6:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1232,15 +1232,15 @@ "typeString": "uint256" } }, - "functionReturnParameters": 147, - "id": 151, + "functionReturnParameters": 153, + "id": 157, "nodeType": "Return", "src": "1192:23:1" } ] }, "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.", - "id": 153, + "id": 159, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1248,15 +1248,15 @@ "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 144, + "id": 150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 143, + "id": 149, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 153, + "scope": 159, "src": "1140:14:1", "stateVariable": false, "storageLocation": "default", @@ -1265,7 +1265,7 @@ "typeString": "address" }, "typeName": { - "id": 142, + "id": 148, "name": "address", "nodeType": "ElementaryTypeName", "src": "1140:7:1", @@ -1282,15 +1282,15 @@ }, "payable": false, "returnParameters": { - "id": 147, + "id": 153, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 146, + "id": 152, "name": "", "nodeType": "VariableDeclaration", - "scope": 153, + "scope": 159, "src": "1177:7:1", "stateVariable": false, "storageLocation": "default", @@ -1299,7 +1299,7 @@ "typeString": "uint256" }, "typeName": { - "id": 145, + "id": 151, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1177:7:1", @@ -1314,31 +1314,31 @@ ], "src": "1176:9:1" }, - "scope": 154, + "scope": 160, "src": "1121:99:1", "stateMutability": "view", - "superFunction": 536, + "superFunction": 542, "visibility": "public" } ], - "scope": 155, + "scope": 161, "src": "170:1053:1" } ], "src": "0:1224:1" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/BasicToken.sol", + "absolutePath": "/home/bharath/computable/contracts/BasicToken.sol", "exportedSymbols": { "BasicToken": [ - 154 + 160 ] }, - "id": 155, + "id": 161, "nodeType": "SourceUnit", "nodes": [ { - "id": 60, + "id": 66, "literals": [ "solidity", "0.4", @@ -1348,23 +1348,23 @@ "src": "0:23:1" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "file": "./ERC20Basic.sol", - "id": 61, + "id": 67, "nodeType": "ImportDirective", - "scope": 155, - "sourceUnit": 555, + "scope": 161, + "sourceUnit": 561, "src": "26:26:1", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 62, + "id": 68, "nodeType": "ImportDirective", - "scope": 155, - "sourceUnit": 3772, + "scope": 161, + "sourceUnit": 3892, "src": "53:24:1", "symbolAliases": [], "unitAlias": "" @@ -1375,53 +1375,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 63, + "id": 69, "name": "ERC20Basic", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 554, + "referencedDeclaration": 560, "src": "193:10:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20Basic_$554", + "typeIdentifier": "t_contract$_ERC20Basic_$560", "typeString": "contract ERC20Basic" } }, - "id": 64, + "id": 70, "nodeType": "InheritanceSpecifier", "src": "193:10:1" } ], "contractDependencies": [ - 554 + 560 ], "contractKind": "contract", "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.", "fullyImplemented": true, - "id": 154, + "id": 160, "linearizedBaseContracts": [ - 154, - 554 + 160, + 560 ], "name": "BasicToken", "nodeType": "ContractDefinition", "nodes": [ { - "id": 67, + "id": 73, "libraryName": { "contractScope": null, - "id": 65, + "id": 71, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3771, + "referencedDeclaration": 3891, "src": "214:8:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3771", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "208:27:1", "typeName": { - "id": 66, + "id": 72, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "227:7:1", @@ -1433,10 +1433,10 @@ }, { "constant": false, - "id": 71, + "id": 77, "name": "balances", "nodeType": "VariableDeclaration", - "scope": 154, + "scope": 160, "src": "239:36:1", "stateVariable": true, "storageLocation": "default", @@ -1445,9 +1445,9 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 70, + "id": 76, "keyType": { - "id": 68, + "id": 74, "name": "address", "nodeType": "ElementaryTypeName", "src": "247:7:1", @@ -1463,7 +1463,7 @@ "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 69, + "id": 75, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "258:7:1", @@ -1478,10 +1478,10 @@ }, { "constant": false, - "id": 73, + "id": 79, "name": "totalSupply_", "nodeType": "VariableDeclaration", - "scope": 154, + "scope": 160, "src": "280:20:1", "stateVariable": true, "storageLocation": "default", @@ -1490,7 +1490,7 @@ "typeString": "uint256" }, "typeName": { - "id": 72, + "id": 78, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "280:7:1", @@ -1504,33 +1504,33 @@ }, { "body": { - "id": 80, + "id": 86, "nodeType": "Block", "src": "414:30:1", "statements": [ { "expression": { "argumentTypes": null, - "id": 78, + "id": 84, "name": "totalSupply_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 73, + "referencedDeclaration": 79, "src": "427:12:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 77, - "id": 79, + "functionReturnParameters": 83, + "id": 85, "nodeType": "Return", "src": "420:19:1" } ] }, "documentation": "@dev Total number of tokens in existence", - "id": 81, + "id": 87, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1538,22 +1538,22 @@ "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 74, + "id": 80, "nodeType": "ParameterList", "parameters": [], "src": "381:2:1" }, "payable": false, "returnParameters": { - "id": 77, + "id": 83, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 76, + "id": 82, "name": "", "nodeType": "VariableDeclaration", - "scope": 81, + "scope": 87, "src": "405:7:1", "stateVariable": false, "storageLocation": "default", @@ -1562,7 +1562,7 @@ "typeString": "uint256" }, "typeName": { - "id": 75, + "id": 81, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "405:7:1", @@ -1577,15 +1577,15 @@ ], "src": "404:9:1" }, - "scope": 154, + "scope": 160, "src": "361:83:1", "stateMutability": "view", - "superFunction": 529, + "superFunction": 535, "visibility": "public" }, { "body": { - "id": 140, + "id": 146, "nodeType": "Block", "src": "667:252:1", "statements": [ @@ -1599,18 +1599,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 95, + "id": 101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 91, + "id": 97, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "681:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1625,7 +1625,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 93, + "id": 99, "isConstant": false, "isLValue": false, "isPure": true, @@ -1648,7 +1648,7 @@ "typeString": "int_const 0" } ], - "id": 92, + "id": 98, "isConstant": false, "isLValue": false, "isPure": true, @@ -1661,7 +1661,7 @@ }, "typeName": "address" }, - "id": 94, + "id": 100, "isConstant": false, "isLValue": false, "isPure": true, @@ -1689,21 +1689,21 @@ "typeString": "bool" } ], - "id": 90, + "id": 96, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "673:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 96, + "id": 102, "isConstant": false, "isLValue": false, "isPure": false, @@ -1717,7 +1717,7 @@ "typeString": "tuple()" } }, - "id": 97, + "id": 103, "nodeType": "ExpressionStatement", "src": "673:26:1" }, @@ -1731,18 +1731,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 104, + "id": 110, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 99, + "id": 105, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "713:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1755,34 +1755,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 100, + "id": 106, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "723:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 103, + "id": 109, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 101, + "id": 107, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "732:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 102, + "id": 108, "isConstant": false, "isLValue": false, "isPure": false, @@ -1821,21 +1821,21 @@ "typeString": "bool" } ], - "id": 98, + "id": 104, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "705:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 105, + "id": 111, "isConstant": false, "isLValue": false, "isPure": false, @@ -1849,14 +1849,14 @@ "typeString": "tuple()" } }, - "id": 106, + "id": 112, "nodeType": "ExpressionStatement", "src": "705:39:1" }, { "expression": { "argumentTypes": null, - "id": 118, + "id": 124, "isConstant": false, "isLValue": false, "isPure": false, @@ -1865,34 +1865,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 107, + "id": 113, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "751:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 110, + "id": 116, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 108, + "id": 114, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "760:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 109, + "id": 115, "isConstant": false, "isLValue": false, "isPure": false, @@ -1924,11 +1924,11 @@ "arguments": [ { "argumentTypes": null, - "id": 116, + "id": 122, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "799:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1947,34 +1947,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 111, + "id": 117, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "774:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 114, + "id": 120, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 112, + "id": 118, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "783:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 113, + "id": 119, "isConstant": false, "isLValue": false, "isPure": false, @@ -1999,21 +1999,21 @@ "typeString": "uint256" } }, - "id": 115, + "id": 121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "774:24:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 117, + "id": 123, "isConstant": false, "isLValue": false, "isPure": false, @@ -2033,14 +2033,14 @@ "typeString": "uint256" } }, - "id": 119, + "id": 125, "nodeType": "ExpressionStatement", "src": "751:55:1" }, { "expression": { "argumentTypes": null, - "id": 129, + "id": 135, "isConstant": false, "isLValue": false, "isPure": false, @@ -2049,25 +2049,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 120, + "id": 126, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "812:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 122, + "id": 128, "indexExpression": { "argumentTypes": null, - "id": 121, + "id": 127, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "821:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2092,11 +2092,11 @@ "arguments": [ { "argumentTypes": null, - "id": 127, + "id": 133, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "846:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2115,25 +2115,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 123, + "id": 129, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "828:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 125, + "id": 131, "indexExpression": { "argumentTypes": null, - "id": 124, + "id": 130, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "837:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2151,21 +2151,21 @@ "typeString": "uint256" } }, - "id": 126, + "id": 132, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "828:17:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 128, + "id": 134, "isConstant": false, "isLValue": false, "isPure": false, @@ -2185,7 +2185,7 @@ "typeString": "uint256" } }, - "id": 130, + "id": 136, "nodeType": "ExpressionStatement", "src": "812:41:1" }, @@ -2197,18 +2197,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 132, + "id": 138, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "873:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 133, + "id": 139, "isConstant": false, "isLValue": false, "isPure": false, @@ -2224,11 +2224,11 @@ }, { "argumentTypes": null, - "id": 134, + "id": 140, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, + "referencedDeclaration": 89, "src": "885:3:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2237,11 +2237,11 @@ }, { "argumentTypes": null, - "id": 135, + "id": 141, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, + "referencedDeclaration": 91, "src": "890:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2264,18 +2264,18 @@ "typeString": "uint256" } ], - "id": 131, + "id": 137, "name": "Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 553, + "referencedDeclaration": 559, "src": "864:8:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 136, + "id": 142, "isConstant": false, "isLValue": false, "isPure": false, @@ -2289,7 +2289,7 @@ "typeString": "tuple()" } }, - "id": 137, + "id": 143, "nodeType": "EmitStatement", "src": "859:38:1" }, @@ -2297,7 +2297,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 138, + "id": 144, "isConstant": false, "isLValue": false, "isPure": true, @@ -2312,15 +2312,15 @@ }, "value": "true" }, - "functionReturnParameters": 89, - "id": 139, + "functionReturnParameters": 95, + "id": 145, "nodeType": "Return", "src": "903:11:1" } ] }, "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.", - "id": 141, + "id": 147, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -2328,15 +2328,15 @@ "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 86, + "id": 92, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 83, + "id": 89, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "616:11:1", "stateVariable": false, "storageLocation": "default", @@ -2345,7 +2345,7 @@ "typeString": "address" }, "typeName": { - "id": 82, + "id": 88, "name": "address", "nodeType": "ElementaryTypeName", "src": "616:7:1", @@ -2359,10 +2359,10 @@ }, { "constant": false, - "id": 85, + "id": 91, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "629:14:1", "stateVariable": false, "storageLocation": "default", @@ -2371,7 +2371,7 @@ "typeString": "uint256" }, "typeName": { - "id": 84, + "id": 90, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "629:7:1", @@ -2388,15 +2388,15 @@ }, "payable": false, "returnParameters": { - "id": 89, + "id": 95, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 88, + "id": 94, "name": "", "nodeType": "VariableDeclaration", - "scope": 141, + "scope": 147, "src": "661:4:1", "stateVariable": false, "storageLocation": "default", @@ -2405,7 +2405,7 @@ "typeString": "bool" }, "typeName": { - "id": 87, + "id": 93, "name": "bool", "nodeType": "ElementaryTypeName", "src": "661:4:1", @@ -2420,15 +2420,15 @@ ], "src": "660:6:1" }, - "scope": 154, + "scope": 160, "src": "598:321:1", "stateMutability": "nonpayable", - "superFunction": 545, + "superFunction": 551, "visibility": "public" }, { "body": { - "id": 152, + "id": 158, "nodeType": "Block", "src": "1186:34:1", "statements": [ @@ -2437,25 +2437,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 148, + "id": 154, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1199:8:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 150, + "id": 156, "indexExpression": { "argumentTypes": null, - "id": 149, + "id": 155, "name": "_owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 143, + "referencedDeclaration": 149, "src": "1208:6:1", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2473,15 +2473,15 @@ "typeString": "uint256" } }, - "functionReturnParameters": 147, - "id": 151, + "functionReturnParameters": 153, + "id": 157, "nodeType": "Return", "src": "1192:23:1" } ] }, "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.", - "id": 153, + "id": 159, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -2489,15 +2489,15 @@ "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 144, + "id": 150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 143, + "id": 149, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 153, + "scope": 159, "src": "1140:14:1", "stateVariable": false, "storageLocation": "default", @@ -2506,7 +2506,7 @@ "typeString": "address" }, "typeName": { - "id": 142, + "id": 148, "name": "address", "nodeType": "ElementaryTypeName", "src": "1140:7:1", @@ -2523,15 +2523,15 @@ }, "payable": false, "returnParameters": { - "id": 147, + "id": 153, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 146, + "id": 152, "name": "", "nodeType": "VariableDeclaration", - "scope": 153, + "scope": 159, "src": "1177:7:1", "stateVariable": false, "storageLocation": "default", @@ -2540,7 +2540,7 @@ "typeString": "uint256" }, "typeName": { - "id": 145, + "id": 151, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1177:7:1", @@ -2555,14 +2555,14 @@ ], "src": "1176:9:1" }, - "scope": 154, + "scope": 160, "src": "1121:99:1", "stateMutability": "view", - "superFunction": 536, + "superFunction": 542, "visibility": "public" } ], - "scope": 155, + "scope": 161, "src": "170:1053:1" } ], @@ -2574,5 +2574,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:21:14.778Z" + "updatedAt": "2018-06-26T02:58:22.314Z" } \ No newline at end of file diff --git a/build/contracts/ConstructableToken.json b/build/contracts/ConstructableToken.json index 00aef4d..1b2baea 100644 --- a/build/contracts/ConstructableToken.json +++ b/build/contracts/ConstructableToken.json @@ -236,24 +236,24 @@ "type": "event" } ], - "bytecode": "0x608060405234801561001057600080fd5b506040516040806110cf8339810180604052810190808051906020019092919080519060200190929190505050806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550806001819055505050611037806100986000396000f30060806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a7230582046e6f646bd05a5ece836e67e6f742f07ebf0fec1505abda4eab232b1a3f9a4650029", - "deployedBytecode": "0x60806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a7230582046e6f646bd05a5ece836e67e6f742f07ebf0fec1505abda4eab232b1a3f9a4650029", + "bytecode": "0x608060405234801561001057600080fd5b506040516040806110cf8339810180604052810190808051906020019092919080519060200190929190505050806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550806001819055505050611037806100986000396000f30060806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a723058200b615d4167aa7d0470f743fd0245f43a7110eda86daaff774a68073f20db484a0029", + "deployedBytecode": "0x60806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a723058200b615d4167aa7d0470f743fd0245f43a7110eda86daaff774a68073f20db484a0029", "sourceMap": "288:207:2:-;;;338:154;8:9:-1;5:2;;;30:1;27;20:12;5:2;338:154:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;438:14;411:8;:24;420:14;411:24;;;;;;;;;;;;;;;:41;;;;473:14;458:12;:29;;;;338:154;;288:207;;;;;;", "deployedSourceMap": "288:207:2:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:188:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1813:188:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;361:83:1;;8:9:-1;5:2;;;30:1;27;20:12;5:2;361:83:1;;;;;;;;;;;;;;;;;;;;;;;725:470:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;725:470:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3678:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3678:431:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1121:99:1;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1121:99:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;598:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;598:321:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2925:296:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2925:296:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2320:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2320:153:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:188;1880:4;1924:6;1892:7;:19;1900:10;1892:19;;;;;;;;;;;;;;;:29;1912:8;1892:29;;;;;;;;;;;;;;;:38;;;;1962:8;1941:38;;1950:10;1941:38;;;1972:6;1941:38;;;;;;;;;;;;;;;;;;1992:4;1985:11;;1813:188;;;;:::o;361:83:1:-;405:7;427:12;;420:19;;361:83;:::o;725:470:10:-;831:4;868:1;853:17;;:3;:17;;;;845:26;;;;;;;;895:8;:15;904:5;895:15;;;;;;;;;;;;;;;;885:6;:25;;877:34;;;;;;;;935:7;:14;943:5;935:14;;;;;;;;;;;;;;;:26;950:10;935:26;;;;;;;;;;;;;;;;925:6;:36;;917:45;;;;;;;;987:27;1007:6;987:8;:15;996:5;987:15;;;;;;;;;;;;;;;;:19;;:27;;;;:::i;:::-;969:8;:15;978:5;969:15;;;;;;;;;;;;;;;:45;;;;1036:25;1054:6;1036:8;:13;1045:3;1036:13;;;;;;;;;;;;;;;;:17;;:25;;;;:::i;:::-;1020:8;:13;1029:3;1020:13;;;;;;;;;;;;;;;:41;;;;1096:38;1127:6;1096:7;:14;1104:5;1096:14;;;;;;;;;;;;;;;:26;1111:10;1096:26;;;;;;;;;;;;;;;;:30;;:38;;;;:::i;:::-;1067:7;:14;1075:5;1067:14;;;;;;;;;;;;;;;:26;1082:10;1067:26;;;;;;;;;;;;;;;:67;;;;1161:3;1145:28;;1154:5;1145:28;;;1166:6;1145:28;;;;;;;;;;;;;;;;;;1186:4;1179:11;;725:470;;;;;:::o;3678:431::-;3784:4;3798:16;3817:7;:19;3825:10;3817:19;;;;;;;;;;;;;;;:29;3837:8;3817:29;;;;;;;;;;;;;;;;3798:48;;3875:8;3856:16;:27;3852:164;;;3925:1;3893:7;:19;3901:10;3893:19;;;;;;;;;;;;;;;:29;3913:8;3893:29;;;;;;;;;;;;;;;:33;;;;3852:164;;;3979:30;3992:16;3979:8;:12;;:30;;;;:::i;:::-;3947:7;:19;3955:10;3947:19;;;;;;;;;;;;;;;:29;3967:8;3947:29;;;;;;;;;;;;;;;:62;;;;3852:164;4047:8;4026:61;;4035:10;4026:61;;;4057:7;:19;4065:10;4057:19;;;;;;;;;;;;;;;:29;4077:8;4057:29;;;;;;;;;;;;;;;;4026:61;;;;;;;;;;;;;;;;;;4100:4;4093:11;;3678:431;;;;;:::o;1121:99:1:-;1177:7;1199:8;:16;1208:6;1199:16;;;;;;;;;;;;;;;;1192:23;;1121:99;;;:::o;598:321::-;661:4;696:1;681:17;;:3;:17;;;;673:26;;;;;;;;723:8;:20;732:10;723:20;;;;;;;;;;;;;;;;713:6;:30;;705:39;;;;;;;;774:32;799:6;774:8;:20;783:10;774:20;;;;;;;;;;;;;;;;:24;;:32;;;;:::i;:::-;751:8;:20;760:10;751:20;;;;;;;;;;;;;;;:55;;;;828:25;846:6;828:8;:13;837:3;828:13;;;;;;;;;;;;;;;;:17;;:25;;;;:::i;:::-;812:8;:13;821:3;812:13;;;;;;;;;;;;;;;:41;;;;885:3;864:33;;873:10;864:33;;;890:6;864:33;;;;;;;;;;;;;;;;;;910:4;903:11;;598:321;;;;:::o;2925:296:10:-;3026:4;3080:46;3114:11;3080:7;:19;3088:10;3080:19;;;;;;;;;;;;;;;:29;3100:8;3080:29;;;;;;;;;;;;;;;;:33;;:46;;;;:::i;:::-;3040:7;:19;3048:10;3040:19;;;;;;;;;;;;;;;:29;3060:8;3040:29;;;;;;;;;;;;;;;:87;;;;3159:8;3138:61;;3147:10;3138:61;;;3169:7;:19;3177:10;3169:19;;;;;;;;;;;;;;;:29;3189:8;3169:29;;;;;;;;;;;;;;;;3138:61;;;;;;;;;;;;;;;;;;3212:4;3205:11;;2925:296;;;;:::o;2320:153::-;2419:7;2443;:15;2451:6;2443:15;;;;;;;;;;;;;;;:25;2459:8;2443:25;;;;;;;;;;;;;;;;2436:32;;2320:153;;;;:::o;1041:110:9:-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;1213:123::-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o", "source": "pragma solidity 0.4.24;\n\nimport \"./StandardToken.sol\";\n\n\n/**\n * A subclass of the Open Zeppelin StandardToken with a constructor.\n *\n * NOTE: This is essentially what O.Z. refers to as a \"StandardTokenMock\".\n * We feel that it is just a subclass that belongs with the other contracts\n */\ncontract ConstructableToken is StandardToken {\n\n constructor(address initialAccount, uint256 initialBalance) public {\n balances[initialAccount] = initialBalance;\n totalSupply_ = initialBalance;\n }\n\n}\n\n\n", - "sourcePath": "/home/rob/Github/computable/contracts/ConstructableToken.sol", + "sourcePath": "/home/bharath/computable/contracts/ConstructableToken.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/ConstructableToken.sol", + "absolutePath": "/home/bharath/computable/contracts/ConstructableToken.sol", "exportedSymbols": { "ConstructableToken": [ - 178 + 184 ] }, - "id": 179, + "id": 185, "nodeType": "SourceUnit", "nodes": [ { - "id": 156, + "id": 162, "literals": [ "solidity", "0.4", @@ -263,12 +263,12 @@ "src": "0:23:2" }, { - "absolutePath": "/home/rob/Github/computable/contracts/StandardToken.sol", + "absolutePath": "/home/bharath/computable/contracts/StandardToken.sol", "file": "./StandardToken.sol", - "id": 157, + "id": 163, "nodeType": "ImportDirective", - "scope": 179, - "sourceUnit": 4019, + "scope": 185, + "sourceUnit": 4139, "src": "25:29:2", "symbolAliases": [], "unitAlias": "" @@ -279,51 +279,51 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 158, + "id": 164, "name": "StandardToken", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4018, + "referencedDeclaration": 4138, "src": "319:13:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_StandardToken_$4018", + "typeIdentifier": "t_contract$_StandardToken_$4138", "typeString": "contract StandardToken" } }, - "id": 159, + "id": 165, "nodeType": "InheritanceSpecifier", "src": "319:13:2" } ], "contractDependencies": [ - 154, - 522, - 554, - 4018 + 160, + 528, + 560, + 4138 ], "contractKind": "contract", "documentation": "A subclass of the Open Zeppelin StandardToken with a constructor.\n * NOTE: This is essentially what O.Z. refers to as a \"StandardTokenMock\".\nWe feel that it is just a subclass that belongs with the other contracts", "fullyImplemented": true, - "id": 178, + "id": 184, "linearizedBaseContracts": [ - 178, - 4018, - 154, - 522, - 554 + 184, + 4138, + 160, + 528, + 560 ], "name": "ConstructableToken", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 176, + "id": 182, "nodeType": "Block", "src": "405:87:2", "statements": [ { "expression": { "argumentTypes": null, - "id": 170, + "id": 176, "isConstant": false, "isLValue": false, "isPure": false, @@ -332,25 +332,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 166, + "id": 172, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "411:8:2", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 168, + "id": 174, "indexExpression": { "argumentTypes": null, - "id": 167, + "id": 173, "name": "initialAccount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 161, + "referencedDeclaration": 167, "src": "420:14:2", "typeDescriptions": { "typeIdentifier": "t_address", @@ -372,11 +372,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 169, + "id": 175, "name": "initialBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 163, + "referencedDeclaration": 169, "src": "438:14:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -389,25 +389,25 @@ "typeString": "uint256" } }, - "id": 171, + "id": 177, "nodeType": "ExpressionStatement", "src": "411:41:2" }, { "expression": { "argumentTypes": null, - "id": 174, + "id": 180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 172, + "id": 178, "name": "totalSupply_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 73, + "referencedDeclaration": 79, "src": "458:12:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -418,11 +418,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 173, + "id": 179, "name": "initialBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 163, + "referencedDeclaration": 169, "src": "473:14:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -435,14 +435,14 @@ "typeString": "uint256" } }, - "id": 175, + "id": 181, "nodeType": "ExpressionStatement", "src": "458:29:2" } ] }, "documentation": null, - "id": 177, + "id": 183, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -450,15 +450,15 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 164, + "id": 170, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 161, + "id": 167, "name": "initialAccount", "nodeType": "VariableDeclaration", - "scope": 177, + "scope": 183, "src": "350:22:2", "stateVariable": false, "storageLocation": "default", @@ -467,7 +467,7 @@ "typeString": "address" }, "typeName": { - "id": 160, + "id": 166, "name": "address", "nodeType": "ElementaryTypeName", "src": "350:7:2", @@ -481,10 +481,10 @@ }, { "constant": false, - "id": 163, + "id": 169, "name": "initialBalance", "nodeType": "VariableDeclaration", - "scope": 177, + "scope": 183, "src": "374:22:2", "stateVariable": false, "storageLocation": "default", @@ -493,7 +493,7 @@ "typeString": "uint256" }, "typeName": { - "id": 162, + "id": 168, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "374:7:2", @@ -510,36 +510,36 @@ }, "payable": false, "returnParameters": { - "id": 165, + "id": 171, "nodeType": "ParameterList", "parameters": [], "src": "405:0:2" }, - "scope": 178, + "scope": 184, "src": "338:154:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 179, + "scope": 185, "src": "288:207:2" } ], "src": "0:498:2" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/ConstructableToken.sol", + "absolutePath": "/home/bharath/computable/contracts/ConstructableToken.sol", "exportedSymbols": { "ConstructableToken": [ - 178 + 184 ] }, - "id": 179, + "id": 185, "nodeType": "SourceUnit", "nodes": [ { - "id": 156, + "id": 162, "literals": [ "solidity", "0.4", @@ -549,12 +549,12 @@ "src": "0:23:2" }, { - "absolutePath": "/home/rob/Github/computable/contracts/StandardToken.sol", + "absolutePath": "/home/bharath/computable/contracts/StandardToken.sol", "file": "./StandardToken.sol", - "id": 157, + "id": 163, "nodeType": "ImportDirective", - "scope": 179, - "sourceUnit": 4019, + "scope": 185, + "sourceUnit": 4139, "src": "25:29:2", "symbolAliases": [], "unitAlias": "" @@ -565,51 +565,51 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 158, + "id": 164, "name": "StandardToken", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4018, + "referencedDeclaration": 4138, "src": "319:13:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_StandardToken_$4018", + "typeIdentifier": "t_contract$_StandardToken_$4138", "typeString": "contract StandardToken" } }, - "id": 159, + "id": 165, "nodeType": "InheritanceSpecifier", "src": "319:13:2" } ], "contractDependencies": [ - 154, - 522, - 554, - 4018 + 160, + 528, + 560, + 4138 ], "contractKind": "contract", "documentation": "A subclass of the Open Zeppelin StandardToken with a constructor.\n * NOTE: This is essentially what O.Z. refers to as a \"StandardTokenMock\".\nWe feel that it is just a subclass that belongs with the other contracts", "fullyImplemented": true, - "id": 178, + "id": 184, "linearizedBaseContracts": [ - 178, - 4018, - 154, - 522, - 554 + 184, + 4138, + 160, + 528, + 560 ], "name": "ConstructableToken", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 176, + "id": 182, "nodeType": "Block", "src": "405:87:2", "statements": [ { "expression": { "argumentTypes": null, - "id": 170, + "id": 176, "isConstant": false, "isLValue": false, "isPure": false, @@ -618,25 +618,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 166, + "id": 172, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "411:8:2", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 168, + "id": 174, "indexExpression": { "argumentTypes": null, - "id": 167, + "id": 173, "name": "initialAccount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 161, + "referencedDeclaration": 167, "src": "420:14:2", "typeDescriptions": { "typeIdentifier": "t_address", @@ -658,11 +658,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 169, + "id": 175, "name": "initialBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 163, + "referencedDeclaration": 169, "src": "438:14:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -675,25 +675,25 @@ "typeString": "uint256" } }, - "id": 171, + "id": 177, "nodeType": "ExpressionStatement", "src": "411:41:2" }, { "expression": { "argumentTypes": null, - "id": 174, + "id": 180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 172, + "id": 178, "name": "totalSupply_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 73, + "referencedDeclaration": 79, "src": "458:12:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -704,11 +704,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 173, + "id": 179, "name": "initialBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 163, + "referencedDeclaration": 169, "src": "473:14:2", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -721,14 +721,14 @@ "typeString": "uint256" } }, - "id": 175, + "id": 181, "nodeType": "ExpressionStatement", "src": "458:29:2" } ] }, "documentation": null, - "id": 177, + "id": 183, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -736,15 +736,15 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 164, + "id": 170, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 161, + "id": 167, "name": "initialAccount", "nodeType": "VariableDeclaration", - "scope": 177, + "scope": 183, "src": "350:22:2", "stateVariable": false, "storageLocation": "default", @@ -753,7 +753,7 @@ "typeString": "address" }, "typeName": { - "id": 160, + "id": 166, "name": "address", "nodeType": "ElementaryTypeName", "src": "350:7:2", @@ -767,10 +767,10 @@ }, { "constant": false, - "id": 163, + "id": 169, "name": "initialBalance", "nodeType": "VariableDeclaration", - "scope": 177, + "scope": 183, "src": "374:22:2", "stateVariable": false, "storageLocation": "default", @@ -779,7 +779,7 @@ "typeString": "uint256" }, "typeName": { - "id": 162, + "id": 168, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "374:7:2", @@ -796,19 +796,19 @@ }, "payable": false, "returnParameters": { - "id": 165, + "id": 171, "nodeType": "ParameterList", "parameters": [], "src": "405:0:2" }, - "scope": 178, + "scope": 184, "src": "338:154:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 179, + "scope": 185, "src": "288:207:2" } ], @@ -820,5 +820,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:21:14.779Z" + "updatedAt": "2018-06-26T02:58:22.315Z" } \ No newline at end of file diff --git a/build/contracts/DLL.json b/build/contracts/DLL.json index 9aa8d86..a2a3677 100644 --- a/build/contracts/DLL.json +++ b/build/contracts/DLL.json @@ -172,31 +172,31 @@ "type": "function" } ], - "bytecode": "0x610553610030600b82828239805160001a6073146000811461002057610022565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600436106100a5576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806307d29ac9146100aa57806330fe0a0a146100e8578063366a5ba2146101265780636d900ed0146101685780637c11cf641461019f5780639735c51b146101d3578063c426b0061461021e578063ee4f1ac414610256575b600080fd5b6100d2600480360381019080803590602001909291908035906020019092919050505061028a565b6040518082815260200191505060405180910390f35b61011060048036038101908080359060200190929190803590602001909291905050506102ad565b6040518082815260200191505060405180910390f35b61014e60048036038101908080359060200190929190803590602001909291905050506102d0565b604051808215151515815260200191505060405180910390f35b81801561017457600080fd5b5061019d6004803603810190808035906020019092919080359060200190929190505050610350565b005b6101bd600480360381019080803590602001909291905050506103e9565b6040518082815260200191505060405180910390f35b8180156101df57600080fd5b5061021c600480360381019080803590602001909291908035906020019092919080359060200190929190803590602001909291905050506103fd565b005b61023c600480360381019080803590602001909291905050506104ff565b604051808215151515815260200191505060405180910390f35b61027460048036038101908080359060200190929190505050610513565b6040518082815260200191505060405180910390f35b600082600001600083815260200190815260200160002060000154905092915050565b600082600001600083815260200190815260200160002060010154905092915050565b60008060006102de856104ff565b806102e95750600084145b156102f75760009250610348565b8361030186610513565b148015610315575083610313866103e9565b145b91506000610323868661028a565b1480156103395750600061033786866102ad565b145b90508180610345575080155b92505b505092915050565b60008061035d84846102d0565b1515610368576103e3565b610372848461028a565b915061037e84846102ad565b905080846000016000848152602001908152602001600020600101819055508184600001600083815260200190815260200160002060000181905550836000016000848152602001908152602001600020600080820160009055600182016000905550505b50505050565b60006103f68260006102ad565b9050919050565b6000821415151561040d57600080fd5b6104178483610350565b600083148061042c575061042b84846102d0565b5b151561043757600080fd5b600081148061044c575061044b84826102d0565b5b151561045757600080fd5b80610462858561028a565b14151561046e57600080fd5b8261047985836102ad565b14151561048557600080fd5b828460000160008481526020019081526020016000206001018190555080846000016000848152602001908152602001600020600001819055508184600001600085815260200190815260200160002060000181905550818460000160008381526020019081526020016000206001018190555050505050565b60008061050b83610513565b149050919050565b600061052082600061028a565b90509190505600a165627a7a72305820a3d0c95f0a09b2fe82802192e2a1d9456001c512679e06e17b4c9aa5d0bf71490029", - "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a5576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806307d29ac9146100aa57806330fe0a0a146100e8578063366a5ba2146101265780636d900ed0146101685780637c11cf641461019f5780639735c51b146101d3578063c426b0061461021e578063ee4f1ac414610256575b600080fd5b6100d2600480360381019080803590602001909291908035906020019092919050505061028a565b6040518082815260200191505060405180910390f35b61011060048036038101908080359060200190929190803590602001909291905050506102ad565b6040518082815260200191505060405180910390f35b61014e60048036038101908080359060200190929190803590602001909291905050506102d0565b604051808215151515815260200191505060405180910390f35b81801561017457600080fd5b5061019d6004803603810190808035906020019092919080359060200190929190505050610350565b005b6101bd600480360381019080803590602001909291905050506103e9565b6040518082815260200191505060405180910390f35b8180156101df57600080fd5b5061021c600480360381019080803590602001909291908035906020019092919080359060200190929190803590602001909291905050506103fd565b005b61023c600480360381019080803590602001909291905050506104ff565b604051808215151515815260200191505060405180910390f35b61027460048036038101908080359060200190929190505050610513565b6040518082815260200191505060405180910390f35b600082600001600083815260200190815260200160002060000154905092915050565b600082600001600083815260200190815260200160002060010154905092915050565b60008060006102de856104ff565b806102e95750600084145b156102f75760009250610348565b8361030186610513565b148015610315575083610313866103e9565b145b91506000610323868661028a565b1480156103395750600061033786866102ad565b145b90508180610345575080155b92505b505092915050565b60008061035d84846102d0565b1515610368576103e3565b610372848461028a565b915061037e84846102ad565b905080846000016000848152602001908152602001600020600101819055508184600001600083815260200190815260200160002060000181905550836000016000848152602001908152602001600020600080820160009055600182016000905550505b50505050565b60006103f68260006102ad565b9050919050565b6000821415151561040d57600080fd5b6104178483610350565b600083148061042c575061042b84846102d0565b5b151561043757600080fd5b600081148061044c575061044b84826102d0565b5b151561045757600080fd5b80610462858561028a565b14151561046e57600080fd5b8261047985836102ad565b14151561048557600080fd5b828460000160008481526020019081526020016000206001018190555080846000016000848152602001908152602001600020600001819055508184600001600085815260200190815260200160002060000181905550818460000160008381526020019081526020016000206001018190555050505050565b60008061050b83610513565b149050919050565b600061052082600061028a565b90509190505600a165627a7a72305820a3d0c95f0a09b2fe82802192e2a1d9456001c512679e06e17b4c9aa5d0bf71490029", - "sourceMap": "26:2260:1:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24", - "deployedSourceMap": "26:2260:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;680:113;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;797;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;296:380;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2000:284;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2000:284:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1027:107;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1479:517;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1479:517:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;181:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;914:109;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;680:113;749:4;768;:8;;:15;777:5;768:15;;;;;;;;;;;:20;;;761:27;;680:113;;;;:::o;797:::-;866:4;885;:8;;:15;894:5;885:15;;;;;;;;;;;:20;;;878:27;;797:113;;;;:::o;296:380::-;366:4;455:17;533:15;382:13;390:4;382:7;:13::i;:::-;:38;;;;72:1;399:5;:21;382:38;378:71;;;437:5;430:12;;;;378:71;494:5;476:14;485:4;476:8;:14::i;:::-;:23;475:52;;;;;521:5;505:12;512:4;505:6;:12::i;:::-;:21;475:52;455:72;;72:1;552:20;560:4;566:5;552:7;:20::i;:::-;:36;551:80;;;;;72:1;594:20;602:4;608:5;594:7;:20::i;:::-;:36;551:80;533:98;;644:12;:27;;;;661:10;660:11;644:27;637:34;;296:380;;;;;;;:::o;2000:284::-;2115:9;2153;2065:21;2074:4;2080:5;2065:8;:21::i;:::-;2064:22;2060:49;;;2096:7;;2060:49;2127:20;2135:4;2141:5;2127:7;:20::i;:::-;2115:32;;2165:20;2173:4;2179:5;2165:7;:20::i;:::-;2153:32;;2214:4;2192;:8;;:14;2201:4;2192:14;;;;;;;;;;;:19;;:26;;;;2246:4;2224;:8;;:14;2233:4;2224:14;;;;;;;;;;;:19;;:26;;;;2264:4;:8;;:15;2273:5;2264:15;;;;;;;;;;;;2257:22;;;;;;;;;;;;;;2000:284;;;;;:::o;1027:107::-;1083:4;1102:27;1110:4;72:1;1102:7;:27::i;:::-;1095:34;;1027:107;;;:::o;1479:517::-;72:1;1593:5;:21;;1585:30;;;;;;;;1622:19;1629:4;1635:5;1622:6;:19::i;:::-;72:1;1656:5;:21;:46;;;;1681:21;1690:4;1696:5;1681:8;:21::i;:::-;1656:46;1648:55;;;;;;;;72:1;1717:5;:21;:46;;;;1742:21;1751:4;1757:5;1742:8;:21::i;:::-;1717:46;1709:55;;;;;;;;1803:5;1779:20;1787:4;1793:5;1779:7;:20::i;:::-;:29;1771:38;;;;;;;;1847:5;1823:20;1831:4;1837:5;1823:7;:20::i;:::-;:29;1815:38;;;;;;;;1883:5;1860:4;:8;;:15;1869:5;1860:15;;;;;;;;;;;:20;;:28;;;;1917:5;1894:4;:8;;:15;1903:5;1894:15;;;;;;;;;;;:20;;:28;;;;1952:5;1929:4;:8;;:15;1938:5;1929:15;;;;;;;;;;;:20;;:28;;;;1986:5;1963:4;:8;;:15;1972:5;1963:15;;;;;;;;;;;:20;;:28;;;;1479:517;;;;:::o;181:111::-;238:4;72:1;257:14;266:4;257:8;:14::i;:::-;:30;250:37;;181:111;;;:::o;914:109::-;972:4;991:27;999:4;72:1;991:7;:27::i;:::-;984:34;;914:109;;;:::o", + "bytecode": "0x610553610030600b82828239805160001a6073146000811461002057610022565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600436106100a5576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806307d29ac9146100aa57806330fe0a0a146100e8578063366a5ba2146101265780636d900ed0146101685780637c11cf641461019f5780639735c51b146101d3578063c426b0061461021e578063ee4f1ac414610256575b600080fd5b6100d2600480360381019080803590602001909291908035906020019092919050505061028a565b6040518082815260200191505060405180910390f35b61011060048036038101908080359060200190929190803590602001909291905050506102ad565b6040518082815260200191505060405180910390f35b61014e60048036038101908080359060200190929190803590602001909291905050506102d0565b604051808215151515815260200191505060405180910390f35b81801561017457600080fd5b5061019d6004803603810190808035906020019092919080359060200190929190505050610350565b005b6101bd600480360381019080803590602001909291905050506103e9565b6040518082815260200191505060405180910390f35b8180156101df57600080fd5b5061021c600480360381019080803590602001909291908035906020019092919080359060200190929190803590602001909291905050506103fd565b005b61023c600480360381019080803590602001909291905050506104ff565b604051808215151515815260200191505060405180910390f35b61027460048036038101908080359060200190929190505050610513565b6040518082815260200191505060405180910390f35b600082600001600083815260200190815260200160002060000154905092915050565b600082600001600083815260200190815260200160002060010154905092915050565b60008060006102de856104ff565b806102e95750600084145b156102f75760009250610348565b8361030186610513565b148015610315575083610313866103e9565b145b91506000610323868661028a565b1480156103395750600061033786866102ad565b145b90508180610345575080155b92505b505092915050565b60008061035d84846102d0565b1515610368576103e3565b610372848461028a565b915061037e84846102ad565b905080846000016000848152602001908152602001600020600101819055508184600001600083815260200190815260200160002060000181905550836000016000848152602001908152602001600020600080820160009055600182016000905550505b50505050565b60006103f68260006102ad565b9050919050565b6000821415151561040d57600080fd5b6104178483610350565b600083148061042c575061042b84846102d0565b5b151561043757600080fd5b600081148061044c575061044b84826102d0565b5b151561045757600080fd5b80610462858561028a565b14151561046e57600080fd5b8261047985836102ad565b14151561048557600080fd5b828460000160008481526020019081526020016000206001018190555080846000016000848152602001908152602001600020600001819055508184600001600085815260200190815260200160002060000181905550818460000160008381526020019081526020016000206001018190555050505050565b60008061050b83610513565b149050919050565b600061052082600061028a565b90509190505600a165627a7a7230582074de26bac0e86a474c5d2a9d7a2fffb2b3b961092111d452022c5e911a4840de0029", + "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a5576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806307d29ac9146100aa57806330fe0a0a146100e8578063366a5ba2146101265780636d900ed0146101685780637c11cf641461019f5780639735c51b146101d3578063c426b0061461021e578063ee4f1ac414610256575b600080fd5b6100d2600480360381019080803590602001909291908035906020019092919050505061028a565b6040518082815260200191505060405180910390f35b61011060048036038101908080359060200190929190803590602001909291905050506102ad565b6040518082815260200191505060405180910390f35b61014e60048036038101908080359060200190929190803590602001909291905050506102d0565b604051808215151515815260200191505060405180910390f35b81801561017457600080fd5b5061019d6004803603810190808035906020019092919080359060200190929190505050610350565b005b6101bd600480360381019080803590602001909291905050506103e9565b6040518082815260200191505060405180910390f35b8180156101df57600080fd5b5061021c600480360381019080803590602001909291908035906020019092919080359060200190929190803590602001909291905050506103fd565b005b61023c600480360381019080803590602001909291905050506104ff565b604051808215151515815260200191505060405180910390f35b61027460048036038101908080359060200190929190505050610513565b6040518082815260200191505060405180910390f35b600082600001600083815260200190815260200160002060000154905092915050565b600082600001600083815260200190815260200160002060010154905092915050565b60008060006102de856104ff565b806102e95750600084145b156102f75760009250610348565b8361030186610513565b148015610315575083610313866103e9565b145b91506000610323868661028a565b1480156103395750600061033786866102ad565b145b90508180610345575080155b92505b505092915050565b60008061035d84846102d0565b1515610368576103e3565b610372848461028a565b915061037e84846102ad565b905080846000016000848152602001908152602001600020600101819055508184600001600083815260200190815260200160002060000181905550836000016000848152602001908152602001600020600080820160009055600182016000905550505b50505050565b60006103f68260006102ad565b9050919050565b6000821415151561040d57600080fd5b6104178483610350565b600083148061042c575061042b84846102d0565b5b151561043757600080fd5b600081148061044c575061044b84826102d0565b5b151561045757600080fd5b80610462858561028a565b14151561046e57600080fd5b8261047985836102ad565b14151561048557600080fd5b828460000160008481526020019081526020016000206001018190555080846000016000848152602001908152602001600020600001819055508184600001600085815260200190815260200160002060000181905550818460000160008381526020019081526020016000206001018190555050505050565b60008061050b83610513565b149050919050565b600061052082600061028a565b90509190505600a165627a7a7230582074de26bac0e86a474c5d2a9d7a2fffb2b3b961092111d452022c5e911a4840de0029", + "sourceMap": "26:2260:3:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24", + "deployedSourceMap": "26:2260:3:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;680:113;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;797;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;296:380;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2000:284;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2000:284:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1027:107;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1479:517;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1479:517:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;181:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;914:109;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;680:113;749:4;768;:8;;:15;777:5;768:15;;;;;;;;;;;:20;;;761:27;;680:113;;;;:::o;797:::-;866:4;885;:8;;:15;894:5;885:15;;;;;;;;;;;:20;;;878:27;;797:113;;;;:::o;296:380::-;366:4;455:17;533:15;382:13;390:4;382:7;:13::i;:::-;:38;;;;72:1;399:5;:21;382:38;378:71;;;437:5;430:12;;;;378:71;494:5;476:14;485:4;476:8;:14::i;:::-;:23;475:52;;;;;521:5;505:12;512:4;505:6;:12::i;:::-;:21;475:52;455:72;;72:1;552:20;560:4;566:5;552:7;:20::i;:::-;:36;551:80;;;;;72:1;594:20;602:4;608:5;594:7;:20::i;:::-;:36;551:80;533:98;;644:12;:27;;;;661:10;660:11;644:27;637:34;;296:380;;;;;;;:::o;2000:284::-;2115:9;2153;2065:21;2074:4;2080:5;2065:8;:21::i;:::-;2064:22;2060:49;;;2096:7;;2060:49;2127:20;2135:4;2141:5;2127:7;:20::i;:::-;2115:32;;2165:20;2173:4;2179:5;2165:7;:20::i;:::-;2153:32;;2214:4;2192;:8;;:14;2201:4;2192:14;;;;;;;;;;;:19;;:26;;;;2246:4;2224;:8;;:14;2233:4;2224:14;;;;;;;;;;;:19;;:26;;;;2264:4;:8;;:15;2273:5;2264:15;;;;;;;;;;;;2257:22;;;;;;;;;;;;;;2000:284;;;;;:::o;1027:107::-;1083:4;1102:27;1110:4;72:1;1102:7;:27::i;:::-;1095:34;;1027:107;;;:::o;1479:517::-;72:1;1593:5;:21;;1585:30;;;;;;;;1622:19;1629:4;1635:5;1622:6;:19::i;:::-;72:1;1656:5;:21;:46;;;;1681:21;1690:4;1696:5;1681:8;:21::i;:::-;1656:46;1648:55;;;;;;;;72:1;1717:5;:21;:46;;;;1742:21;1751:4;1757:5;1742:8;:21::i;:::-;1717:46;1709:55;;;;;;;;1803:5;1779:20;1787:4;1793:5;1779:7;:20::i;:::-;:29;1771:38;;;;;;;;1847:5;1823:20;1831:4;1837:5;1823:7;:20::i;:::-;:29;1815:38;;;;;;;;1883:5;1860:4;:8;;:15;1869:5;1860:15;;;;;;;;;;;:20;;:28;;;;1917:5;1894:4;:8;;:15;1903:5;1894:15;;;;;;;;;;;:20;;:28;;;;1952:5;1929:4;:8;;:15;1938:5;1929:15;;;;;;;;;;;:20;;:28;;;;1986:5;1963:4;:8;;:15;1972:5;1963:15;;;;;;;;;;;:20;;:28;;;;1479:517;;;;:::o;181:111::-;238:4;72:1;257:14;266:4;257:8;:14::i;:::-;:30;250:37;;181:111;;;:::o;914:109::-;972:4;991:27;999:4;72:1;991:7;:27::i;:::-;984:34;;914:109;;;:::o", "source": "pragma solidity 0.4.24;\n\n\nlibrary DLL {\n\n uint constant NULL_NODE_ID = 0;\n\n struct Node {\n uint next;\n uint prev;\n }\n\n struct Data {\n mapping(uint => Node) dll;\n }\n\n function isEmpty(Data storage self) public view returns (bool) {\n return getStart(self) == NULL_NODE_ID;\n }\n\n function contains(Data storage self, uint _curr) public view returns (bool) {\n if (isEmpty(self) || _curr == NULL_NODE_ID) {\n return false;\n }\n\n bool isSingleNode = (getStart(self) == _curr) && (getEnd(self) == _curr);\n bool isNullNode = (getNext(self, _curr) == NULL_NODE_ID) && (getPrev(self, _curr) == NULL_NODE_ID);\n return isSingleNode || !isNullNode;\n }\n\n function getNext(Data storage self, uint _curr) public view returns (uint) {\n return self.dll[_curr].next;\n }\n\n function getPrev(Data storage self, uint _curr) public view returns (uint) {\n return self.dll[_curr].prev;\n }\n\n function getStart(Data storage self) public view returns (uint) {\n return getNext(self, NULL_NODE_ID);\n }\n\n function getEnd(Data storage self) public view returns (uint) {\n return getPrev(self, NULL_NODE_ID);\n }\n\n /**\n @dev Inserts a new node between _prev and _next. When inserting a node already existing in\n the list it will be automatically removed from the old position.\n @param _prev the node which _new will be inserted after\n @param _curr the id of the new node being inserted\n @param _next the node which _new will be inserted before\n */\n function insert(\n Data storage self,\n uint _prev,\n uint _curr,\n uint _next\n ) public\n {\n require(_curr != NULL_NODE_ID);\n\n remove(self, _curr);\n\n require(_prev == NULL_NODE_ID || contains(self, _prev));\n require(_next == NULL_NODE_ID || contains(self, _next));\n\n require(getNext(self, _prev) == _next);\n require(getPrev(self, _next) == _prev);\n\n self.dll[_curr].prev = _prev;\n self.dll[_curr].next = _next;\n\n self.dll[_prev].next = _curr;\n self.dll[_next].prev = _curr;\n }\n\n function remove(Data storage self, uint _curr) public {\n if (!contains(self, _curr)) {\n return;\n }\n\n uint next = getNext(self, _curr);\n uint prev = getPrev(self, _curr);\n\n self.dll[next].prev = prev;\n self.dll[prev].next = next;\n\n delete self.dll[_curr];\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/DLL.sol", + "sourcePath": "/home/bharath/computable/contracts/DLL.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/DLL.sol", + "absolutePath": "/home/bharath/computable/contracts/DLL.sol", "exportedSymbols": { "DLL": [ - 365 + 485 ] }, - "id": 366, + "id": 486, "nodeType": "SourceUnit", "nodes": [ { - "id": 66, + "id": 186, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:1" + "src": "0:23:3" }, { "baseContracts": [], @@ -204,20 +204,20 @@ "contractKind": "library", "documentation": null, "fullyImplemented": true, - "id": 365, + "id": 485, "linearizedBaseContracts": [ - 365 + 485 ], "name": "DLL", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 69, + "id": 189, "name": "NULL_NODE_ID", "nodeType": "VariableDeclaration", - "scope": 365, - "src": "43:30:1", + "scope": 485, + "src": "43:30:3", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -225,10 +225,10 @@ "typeString": "uint256" }, "typeName": { - "id": 67, + "id": 187, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "43:4:1", + "src": "43:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -237,14 +237,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 68, + "id": 188, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "72:1:1", + "src": "72:1:3", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -256,15 +256,15 @@ }, { "canonicalName": "DLL.Node", - "id": 74, + "id": 194, "members": [ { "constant": false, - "id": 71, + "id": 191, "name": "next", "nodeType": "VariableDeclaration", - "scope": 74, - "src": "96:9:1", + "scope": 194, + "src": "96:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -272,10 +272,10 @@ "typeString": "uint256" }, "typeName": { - "id": 70, + "id": 190, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "96:4:1", + "src": "96:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -286,11 +286,11 @@ }, { "constant": false, - "id": 73, + "id": 193, "name": "prev", "nodeType": "VariableDeclaration", - "scope": 74, - "src": "111:9:1", + "scope": 194, + "src": "111:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -298,10 +298,10 @@ "typeString": "uint256" }, "typeName": { - "id": 72, + "id": 192, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "111:4:1", + "src": "111:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -313,54 +313,54 @@ ], "name": "Node", "nodeType": "StructDefinition", - "scope": 365, - "src": "78:47:1", + "scope": 485, + "src": "78:47:3", "visibility": "public" }, { "canonicalName": "DLL.Data", - "id": 79, + "id": 199, "members": [ { "constant": false, - "id": 78, + "id": 198, "name": "dll", "nodeType": "VariableDeclaration", - "scope": 79, - "src": "147:25:1", + "scope": 199, + "src": "147:25:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node)" }, "typeName": { - "id": 77, + "id": 197, "keyType": { - "id": 75, + "id": 195, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "155:4:1", + "src": "155:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "147:21:1", + "src": "147:21:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node)" }, "valueType": { "contractScope": null, - "id": 76, + "id": 196, "name": "Node", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 74, - "src": "163:4:1", + "referencedDeclaration": 194, + "src": "163:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage_ptr", + "typeIdentifier": "t_struct$_Node_$194_storage_ptr", "typeString": "struct DLL.Node" } } @@ -371,15 +371,15 @@ ], "name": "Data", "nodeType": "StructDefinition", - "scope": 365, - "src": "129:48:1", + "scope": 485, + "src": "129:48:3", "visibility": "public" }, { "body": { - "id": 92, + "id": 212, "nodeType": "Block", - "src": "244:48:1", + "src": "244:48:3", "statements": [ { "expression": { @@ -388,7 +388,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 90, + "id": 210, "isConstant": false, "isLValue": false, "isPure": false, @@ -398,14 +398,14 @@ "arguments": [ { "argumentTypes": null, - "id": 87, + "id": 207, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 81, - "src": "266:4:1", + "referencedDeclaration": 201, + "src": "266:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -413,22 +413,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 86, + "id": 206, "name": "getStart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 198, - "src": "257:8:1", + "referencedDeclaration": 318, + "src": "257:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 88, + "id": 208, "isConstant": false, "isLValue": false, "isPure": false, @@ -436,7 +436,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "257:14:1", + "src": "257:14:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -446,32 +446,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 89, + "id": 209, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "275:12:1", + "referencedDeclaration": 189, + "src": "275:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "257:30:1", + "src": "257:30:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 85, - "id": 91, + "functionReturnParameters": 205, + "id": 211, "nodeType": "Return", - "src": "250:37:1" + "src": "250:37:3" } ] }, "documentation": null, - "id": 93, + "id": 213, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -479,31 +479,31 @@ "name": "isEmpty", "nodeType": "FunctionDefinition", "parameters": { - "id": 82, + "id": 202, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 81, + "id": 201, "name": "self", "nodeType": "VariableDeclaration", - "scope": 93, - "src": "198:17:1", + "scope": 213, + "src": "198:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 80, + "id": 200, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "198:4:1", + "referencedDeclaration": 199, + "src": "198:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -511,20 +511,20 @@ "visibility": "internal" } ], - "src": "197:19:1" + "src": "197:19:3" }, "payable": false, "returnParameters": { - "id": 85, + "id": 205, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 84, + "id": 204, "name": "", "nodeType": "VariableDeclaration", - "scope": 93, - "src": "238:4:1", + "scope": 213, + "src": "238:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -532,10 +532,10 @@ "typeString": "bool" }, "typeName": { - "id": 83, + "id": 203, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "238:4:1", + "src": "238:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -545,19 +545,19 @@ "visibility": "internal" } ], - "src": "237:6:1" + "src": "237:6:3" }, - "scope": 365, - "src": "181:111:1", + "scope": 485, + "src": "181:111:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 152, + "id": 272, "nodeType": "Block", - "src": "372:304:1", + "src": "372:304:3", "statements": [ { "condition": { @@ -566,7 +566,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 108, + "id": 228, "isConstant": false, "isLValue": false, "isPure": false, @@ -576,14 +576,14 @@ "arguments": [ { "argumentTypes": null, - "id": 103, + "id": 223, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "390:4:1", + "referencedDeclaration": 215, + "src": "390:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -591,22 +591,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 102, + "id": 222, "name": "isEmpty", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 93, - "src": "382:7:1", + "referencedDeclaration": 213, + "src": "382:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer) view returns (bool)" } }, - "id": 104, + "id": 224, "isConstant": false, "isLValue": false, "isPure": false, @@ -614,7 +614,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "382:13:1", + "src": "382:13:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -628,19 +628,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 107, + "id": 227, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 105, + "id": 225, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "399:5:1", + "referencedDeclaration": 217, + "src": "399:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -650,50 +650,50 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 106, + "id": 226, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "408:12:1", + "referencedDeclaration": 189, + "src": "408:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "399:21:1", + "src": "399:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "382:38:1", + "src": "382:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 112, + "id": 232, "nodeType": "IfStatement", - "src": "378:71:1", + "src": "378:71:3", "trueBody": { - "id": 111, + "id": 231, "nodeType": "Block", - "src": "422:27:1", + "src": "422:27:3", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 109, + "id": 229, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "437:5:1", + "src": "437:5:3", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -701,26 +701,26 @@ }, "value": "false" }, - "functionReturnParameters": 101, - "id": 110, + "functionReturnParameters": 221, + "id": 230, "nodeType": "Return", - "src": "430:12:1" + "src": "430:12:3" } ] } }, { "assignments": [ - 114 + 234 ], "declarations": [ { "constant": false, - "id": 114, + "id": 234, "name": "isSingleNode", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "455:17:1", + "scope": 273, + "src": "455:17:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -728,10 +728,10 @@ "typeString": "bool" }, "typeName": { - "id": 113, + "id": 233, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "455:4:1", + "src": "455:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -741,14 +741,14 @@ "visibility": "internal" } ], - "id": 128, + "id": 248, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 127, + "id": 247, "isConstant": false, "isLValue": false, "isPure": false, @@ -762,7 +762,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 119, + "id": 239, "isConstant": false, "isLValue": false, "isPure": false, @@ -772,14 +772,14 @@ "arguments": [ { "argumentTypes": null, - "id": 116, + "id": 236, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "485:4:1", + "referencedDeclaration": 215, + "src": "485:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -787,22 +787,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 115, + "id": 235, "name": "getStart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 198, - "src": "476:8:1", + "referencedDeclaration": 318, + "src": "476:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 117, + "id": 237, "isConstant": false, "isLValue": false, "isPure": false, @@ -810,7 +810,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "476:14:1", + "src": "476:14:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -820,32 +820,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 118, + "id": 238, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "494:5:1", + "referencedDeclaration": 217, + "src": "494:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "476:23:1", + "src": "476:23:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 120, + "id": 240, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "475:25:1", + "src": "475:25:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -862,7 +862,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 125, + "id": 245, "isConstant": false, "isLValue": false, "isPure": false, @@ -872,14 +872,14 @@ "arguments": [ { "argumentTypes": null, - "id": 122, + "id": 242, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "512:4:1", + "referencedDeclaration": 215, + "src": "512:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -887,22 +887,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 121, + "id": 241, "name": "getEnd", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 211, - "src": "505:6:1", + "referencedDeclaration": 331, + "src": "505:6:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 123, + "id": 243, "isConstant": false, "isLValue": false, "isPure": false, @@ -910,7 +910,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "505:12:1", + "src": "505:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -920,58 +920,58 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 124, + "id": 244, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "521:5:1", + "referencedDeclaration": 217, + "src": "521:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "505:21:1", + "src": "505:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 126, + "id": 246, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "504:23:1", + "src": "504:23:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "475:52:1", + "src": "475:52:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "455:72:1" + "src": "455:72:3" }, { "assignments": [ - 130 + 250 ], "declarations": [ { "constant": false, - "id": 130, + "id": 250, "name": "isNullNode", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "533:15:1", + "scope": 273, + "src": "533:15:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -979,10 +979,10 @@ "typeString": "bool" }, "typeName": { - "id": 129, + "id": 249, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "533:4:1", + "src": "533:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -992,14 +992,14 @@ "visibility": "internal" } ], - "id": 146, + "id": 266, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 145, + "id": 265, "isConstant": false, "isLValue": false, "isPure": false, @@ -1013,7 +1013,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 136, + "id": 256, "isConstant": false, "isLValue": false, "isPure": false, @@ -1023,25 +1023,25 @@ "arguments": [ { "argumentTypes": null, - "id": 132, + "id": 252, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "560:4:1", + "referencedDeclaration": 215, + "src": "560:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 133, + "id": 253, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "566:5:1", + "referencedDeclaration": 217, + "src": "566:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1051,7 +1051,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -1059,18 +1059,18 @@ "typeString": "uint256" } ], - "id": 131, + "id": 251, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "552:7:1", + "referencedDeclaration": 289, + "src": "552:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 134, + "id": 254, "isConstant": false, "isLValue": false, "isPure": false, @@ -1078,7 +1078,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "552:20:1", + "src": "552:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1088,32 +1088,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 135, + "id": 255, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "576:12:1", + "referencedDeclaration": 189, + "src": "576:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "552:36:1", + "src": "552:36:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 137, + "id": 257, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "551:38:1", + "src": "551:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1130,7 +1130,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 143, + "id": 263, "isConstant": false, "isLValue": false, "isPure": false, @@ -1140,25 +1140,25 @@ "arguments": [ { "argumentTypes": null, - "id": 139, + "id": 259, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "602:4:1", + "referencedDeclaration": 215, + "src": "602:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 140, + "id": 260, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "608:5:1", + "referencedDeclaration": 217, + "src": "608:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1168,7 +1168,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -1176,18 +1176,18 @@ "typeString": "uint256" } ], - "id": 138, + "id": 258, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "594:7:1", + "referencedDeclaration": 305, + "src": "594:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 141, + "id": 261, "isConstant": false, "isLValue": false, "isPure": false, @@ -1195,7 +1195,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "594:20:1", + "src": "594:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1205,45 +1205,45 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 142, + "id": 262, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "618:12:1", + "referencedDeclaration": 189, + "src": "618:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "594:36:1", + "src": "594:36:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 144, + "id": 264, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "593:38:1", + "src": "593:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "551:80:1", + "src": "551:80:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "533:98:1" + "src": "533:98:3" }, { "expression": { @@ -1252,19 +1252,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 150, + "id": 270, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 147, + "id": 267, "name": "isSingleNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 114, - "src": "644:12:1", + "referencedDeclaration": 234, + "src": "644:12:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1274,7 +1274,7 @@ "operator": "||", "rightExpression": { "argumentTypes": null, - "id": 149, + "id": 269, "isConstant": false, "isLValue": false, "isPure": false, @@ -1282,15 +1282,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "660:11:1", + "src": "660:11:3", "subExpression": { "argumentTypes": null, - "id": 148, + "id": 268, "name": "isNullNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 130, - "src": "661:10:1", + "referencedDeclaration": 250, + "src": "661:10:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1301,21 +1301,21 @@ "typeString": "bool" } }, - "src": "644:27:1", + "src": "644:27:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 101, - "id": 151, + "functionReturnParameters": 221, + "id": 271, "nodeType": "Return", - "src": "637:34:1" + "src": "637:34:3" } ] }, "documentation": null, - "id": 153, + "id": 273, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1323,31 +1323,31 @@ "name": "contains", "nodeType": "FunctionDefinition", "parameters": { - "id": 98, + "id": 218, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 95, + "id": 215, "name": "self", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "314:17:1", + "scope": 273, + "src": "314:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 94, + "id": 214, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "314:4:1", + "referencedDeclaration": 199, + "src": "314:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -1356,11 +1356,11 @@ }, { "constant": false, - "id": 97, + "id": 217, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "333:10:1", + "scope": 273, + "src": "333:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1368,10 +1368,10 @@ "typeString": "uint256" }, "typeName": { - "id": 96, + "id": 216, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "333:4:1", + "src": "333:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1381,20 +1381,20 @@ "visibility": "internal" } ], - "src": "313:31:1" + "src": "313:31:3" }, "payable": false, "returnParameters": { - "id": 101, + "id": 221, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 100, + "id": 220, "name": "", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "366:4:1", + "scope": 273, + "src": "366:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1402,10 +1402,10 @@ "typeString": "bool" }, "typeName": { - "id": 99, + "id": 219, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "366:4:1", + "src": "366:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1415,19 +1415,19 @@ "visibility": "internal" } ], - "src": "365:6:1" + "src": "365:6:3" }, - "scope": 365, - "src": "296:380:1", + "scope": 485, + "src": "296:380:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 168, + "id": 288, "nodeType": "Block", - "src": "755:38:1", + "src": "755:38:3", "statements": [ { "expression": { @@ -1438,40 +1438,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 162, + "id": 282, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 155, - "src": "768:4:1", + "referencedDeclaration": 275, + "src": "768:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 163, + "id": 283, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "768:8:1", + "referencedDeclaration": 198, + "src": "768:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 165, + "id": 285, "indexExpression": { "argumentTypes": null, - "id": 164, + "id": 284, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 157, - "src": "777:5:1", + "referencedDeclaration": 277, + "src": "777:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1482,35 +1482,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "768:15:1", + "src": "768:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 166, + "id": 286, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "768:20:1", + "referencedDeclaration": 191, + "src": "768:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 161, - "id": 167, + "functionReturnParameters": 281, + "id": 287, "nodeType": "Return", - "src": "761:27:1" + "src": "761:27:3" } ] }, "documentation": null, - "id": 169, + "id": 289, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1518,31 +1518,31 @@ "name": "getNext", "nodeType": "FunctionDefinition", "parameters": { - "id": 158, + "id": 278, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 155, + "id": 275, "name": "self", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "697:17:1", + "scope": 289, + "src": "697:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 154, + "id": 274, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "697:4:1", + "referencedDeclaration": 199, + "src": "697:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -1551,11 +1551,11 @@ }, { "constant": false, - "id": 157, + "id": 277, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "716:10:1", + "scope": 289, + "src": "716:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1563,10 +1563,10 @@ "typeString": "uint256" }, "typeName": { - "id": 156, + "id": 276, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "716:4:1", + "src": "716:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1576,20 +1576,20 @@ "visibility": "internal" } ], - "src": "696:31:1" + "src": "696:31:3" }, "payable": false, "returnParameters": { - "id": 161, + "id": 281, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 160, + "id": 280, "name": "", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "749:4:1", + "scope": 289, + "src": "749:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1597,10 +1597,10 @@ "typeString": "uint256" }, "typeName": { - "id": 159, + "id": 279, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "749:4:1", + "src": "749:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1610,19 +1610,19 @@ "visibility": "internal" } ], - "src": "748:6:1" + "src": "748:6:3" }, - "scope": 365, - "src": "680:113:1", + "scope": 485, + "src": "680:113:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 184, + "id": 304, "nodeType": "Block", - "src": "872:38:1", + "src": "872:38:3", "statements": [ { "expression": { @@ -1633,40 +1633,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 178, + "id": 298, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 171, - "src": "885:4:1", + "referencedDeclaration": 291, + "src": "885:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 179, + "id": 299, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "885:8:1", + "referencedDeclaration": 198, + "src": "885:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 181, + "id": 301, "indexExpression": { "argumentTypes": null, - "id": 180, + "id": 300, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 173, - "src": "894:5:1", + "referencedDeclaration": 293, + "src": "894:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1677,35 +1677,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "885:15:1", + "src": "885:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 182, + "id": 302, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "885:20:1", + "referencedDeclaration": 193, + "src": "885:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 177, - "id": 183, + "functionReturnParameters": 297, + "id": 303, "nodeType": "Return", - "src": "878:27:1" + "src": "878:27:3" } ] }, "documentation": null, - "id": 185, + "id": 305, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1713,31 +1713,31 @@ "name": "getPrev", "nodeType": "FunctionDefinition", "parameters": { - "id": 174, + "id": 294, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 171, + "id": 291, "name": "self", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "814:17:1", + "scope": 305, + "src": "814:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 170, + "id": 290, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "814:4:1", + "referencedDeclaration": 199, + "src": "814:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -1746,11 +1746,11 @@ }, { "constant": false, - "id": 173, + "id": 293, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "833:10:1", + "scope": 305, + "src": "833:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1758,10 +1758,10 @@ "typeString": "uint256" }, "typeName": { - "id": 172, + "id": 292, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "833:4:1", + "src": "833:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1771,20 +1771,20 @@ "visibility": "internal" } ], - "src": "813:31:1" + "src": "813:31:3" }, "payable": false, "returnParameters": { - "id": 177, + "id": 297, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 176, + "id": 296, "name": "", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "866:4:1", + "scope": 305, + "src": "866:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1792,10 +1792,10 @@ "typeString": "uint256" }, "typeName": { - "id": 175, + "id": 295, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "866:4:1", + "src": "866:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1805,19 +1805,19 @@ "visibility": "internal" } ], - "src": "865:6:1" + "src": "865:6:3" }, - "scope": 365, - "src": "797:113:1", + "scope": 485, + "src": "797:113:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 197, + "id": 317, "nodeType": "Block", - "src": "978:45:1", + "src": "978:45:3", "statements": [ { "expression": { @@ -1825,25 +1825,25 @@ "arguments": [ { "argumentTypes": null, - "id": 193, + "id": 313, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 187, - "src": "999:4:1", + "referencedDeclaration": 307, + "src": "999:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 194, + "id": 314, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1005:12:1", + "referencedDeclaration": 189, + "src": "1005:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1853,7 +1853,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -1861,18 +1861,18 @@ "typeString": "uint256" } ], - "id": 192, + "id": 312, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "991:7:1", + "referencedDeclaration": 289, + "src": "991:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 195, + "id": 315, "isConstant": false, "isLValue": false, "isPure": false, @@ -1880,21 +1880,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "991:27:1", + "src": "991:27:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 191, - "id": 196, + "functionReturnParameters": 311, + "id": 316, "nodeType": "Return", - "src": "984:34:1" + "src": "984:34:3" } ] }, "documentation": null, - "id": 198, + "id": 318, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1902,31 +1902,31 @@ "name": "getStart", "nodeType": "FunctionDefinition", "parameters": { - "id": 188, + "id": 308, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 187, + "id": 307, "name": "self", "nodeType": "VariableDeclaration", - "scope": 198, - "src": "932:17:1", + "scope": 318, + "src": "932:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 186, + "id": 306, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "932:4:1", + "referencedDeclaration": 199, + "src": "932:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -1934,20 +1934,20 @@ "visibility": "internal" } ], - "src": "931:19:1" + "src": "931:19:3" }, "payable": false, "returnParameters": { - "id": 191, + "id": 311, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 190, + "id": 310, "name": "", "nodeType": "VariableDeclaration", - "scope": 198, - "src": "972:4:1", + "scope": 318, + "src": "972:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1955,10 +1955,10 @@ "typeString": "uint256" }, "typeName": { - "id": 189, + "id": 309, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "972:4:1", + "src": "972:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1968,19 +1968,19 @@ "visibility": "internal" } ], - "src": "971:6:1" + "src": "971:6:3" }, - "scope": 365, - "src": "914:109:1", + "scope": 485, + "src": "914:109:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 210, + "id": 330, "nodeType": "Block", - "src": "1089:45:1", + "src": "1089:45:3", "statements": [ { "expression": { @@ -1988,25 +1988,25 @@ "arguments": [ { "argumentTypes": null, - "id": 206, + "id": 326, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 200, - "src": "1110:4:1", + "referencedDeclaration": 320, + "src": "1110:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 207, + "id": 327, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1116:12:1", + "referencedDeclaration": 189, + "src": "1116:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2016,7 +2016,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2024,18 +2024,18 @@ "typeString": "uint256" } ], - "id": 205, + "id": 325, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "1102:7:1", + "referencedDeclaration": 305, + "src": "1102:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 208, + "id": 328, "isConstant": false, "isLValue": false, "isPure": false, @@ -2043,21 +2043,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1102:27:1", + "src": "1102:27:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 204, - "id": 209, + "functionReturnParameters": 324, + "id": 329, "nodeType": "Return", - "src": "1095:34:1" + "src": "1095:34:3" } ] }, "documentation": null, - "id": 211, + "id": 331, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -2065,31 +2065,31 @@ "name": "getEnd", "nodeType": "FunctionDefinition", "parameters": { - "id": 201, + "id": 321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 200, + "id": 320, "name": "self", "nodeType": "VariableDeclaration", - "scope": 211, - "src": "1043:17:1", + "scope": 331, + "src": "1043:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 199, + "id": 319, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1043:4:1", + "referencedDeclaration": 199, + "src": "1043:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -2097,20 +2097,20 @@ "visibility": "internal" } ], - "src": "1042:19:1" + "src": "1042:19:3" }, "payable": false, "returnParameters": { - "id": 204, + "id": 324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 203, + "id": 323, "name": "", "nodeType": "VariableDeclaration", - "scope": 211, - "src": "1083:4:1", + "scope": 331, + "src": "1083:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2118,10 +2118,10 @@ "typeString": "uint256" }, "typeName": { - "id": 202, + "id": 322, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1083:4:1", + "src": "1083:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2131,19 +2131,19 @@ "visibility": "internal" } ], - "src": "1082:6:1" + "src": "1082:6:3" }, - "scope": 365, - "src": "1027:107:1", + "scope": 485, + "src": "1027:107:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 309, + "id": 429, "nodeType": "Block", - "src": "1579:417:1", + "src": "1579:417:3", "statements": [ { "expression": { @@ -2155,19 +2155,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 225, + "id": 345, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 223, + "id": 343, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1593:5:1", + "referencedDeclaration": 337, + "src": "1593:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2177,18 +2177,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 224, + "id": 344, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1602:12:1", + "referencedDeclaration": 189, + "src": "1602:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1593:21:1", + "src": "1593:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2202,21 +2202,21 @@ "typeString": "bool" } ], - "id": 222, + "id": 342, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1585:7:1", + "referencedDeclaration": 4156, + "src": "1585:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 226, + "id": 346, "isConstant": false, "isLValue": false, "isPure": false, @@ -2224,15 +2224,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1585:30:1", + "src": "1585:30:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 227, + "id": 347, "nodeType": "ExpressionStatement", - "src": "1585:30:1" + "src": "1585:30:3" }, { "expression": { @@ -2240,25 +2240,25 @@ "arguments": [ { "argumentTypes": null, - "id": 229, + "id": 349, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1629:4:1", + "referencedDeclaration": 333, + "src": "1629:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 230, + "id": 350, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1635:5:1", + "referencedDeclaration": 337, + "src": "1635:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2268,7 +2268,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2276,18 +2276,18 @@ "typeString": "uint256" } ], - "id": 228, + "id": 348, "name": "remove", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 364, - "src": "1622:6:1", + "referencedDeclaration": 484, + "src": "1622:6:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 231, + "id": 351, "isConstant": false, "isLValue": false, "isPure": false, @@ -2295,15 +2295,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1622:19:1", + "src": "1622:19:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 232, + "id": 352, "nodeType": "ExpressionStatement", - "src": "1622:19:1" + "src": "1622:19:3" }, { "expression": { @@ -2315,7 +2315,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 241, + "id": 361, "isConstant": false, "isLValue": false, "isPure": false, @@ -2326,19 +2326,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 236, + "id": 356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 234, + "id": 354, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1656:5:1", + "referencedDeclaration": 335, + "src": "1656:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2348,18 +2348,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 235, + "id": 355, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1665:12:1", + "referencedDeclaration": 189, + "src": "1665:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1656:21:1", + "src": "1656:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2372,25 +2372,25 @@ "arguments": [ { "argumentTypes": null, - "id": 238, + "id": 358, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1690:4:1", + "referencedDeclaration": 333, + "src": "1690:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 239, + "id": 359, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1696:5:1", + "referencedDeclaration": 335, + "src": "1696:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2400,7 +2400,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2408,18 +2408,18 @@ "typeString": "uint256" } ], - "id": 237, + "id": 357, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "1681:8:1", + "referencedDeclaration": 273, + "src": "1681:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 240, + "id": 360, "isConstant": false, "isLValue": false, "isPure": false, @@ -2427,13 +2427,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1681:21:1", + "src": "1681:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "1656:46:1", + "src": "1656:46:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2447,21 +2447,21 @@ "typeString": "bool" } ], - "id": 233, + "id": 353, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1648:7:1", + "referencedDeclaration": 4156, + "src": "1648:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 242, + "id": 362, "isConstant": false, "isLValue": false, "isPure": false, @@ -2469,15 +2469,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1648:55:1", + "src": "1648:55:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 243, + "id": 363, "nodeType": "ExpressionStatement", - "src": "1648:55:1" + "src": "1648:55:3" }, { "expression": { @@ -2489,7 +2489,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 252, + "id": 372, "isConstant": false, "isLValue": false, "isPure": false, @@ -2500,19 +2500,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 247, + "id": 367, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 245, + "id": 365, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1717:5:1", + "referencedDeclaration": 339, + "src": "1717:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2522,18 +2522,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 246, + "id": 366, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1726:12:1", + "referencedDeclaration": 189, + "src": "1726:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1717:21:1", + "src": "1717:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2546,25 +2546,25 @@ "arguments": [ { "argumentTypes": null, - "id": 249, + "id": 369, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1751:4:1", + "referencedDeclaration": 333, + "src": "1751:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 250, + "id": 370, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1757:5:1", + "referencedDeclaration": 339, + "src": "1757:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2574,7 +2574,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2582,18 +2582,18 @@ "typeString": "uint256" } ], - "id": 248, + "id": 368, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "1742:8:1", + "referencedDeclaration": 273, + "src": "1742:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 251, + "id": 371, "isConstant": false, "isLValue": false, "isPure": false, @@ -2601,13 +2601,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1742:21:1", + "src": "1742:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "1717:46:1", + "src": "1717:46:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2621,21 +2621,21 @@ "typeString": "bool" } ], - "id": 244, + "id": 364, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1709:7:1", + "referencedDeclaration": 4156, + "src": "1709:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 253, + "id": 373, "isConstant": false, "isLValue": false, "isPure": false, @@ -2643,15 +2643,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1709:55:1", + "src": "1709:55:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 254, + "id": 374, "nodeType": "ExpressionStatement", - "src": "1709:55:1" + "src": "1709:55:3" }, { "expression": { @@ -2663,7 +2663,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 261, + "id": 381, "isConstant": false, "isLValue": false, "isPure": false, @@ -2673,25 +2673,25 @@ "arguments": [ { "argumentTypes": null, - "id": 257, + "id": 377, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1787:4:1", + "referencedDeclaration": 333, + "src": "1787:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 258, + "id": 378, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1793:5:1", + "referencedDeclaration": 335, + "src": "1793:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2701,7 +2701,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2709,18 +2709,18 @@ "typeString": "uint256" } ], - "id": 256, + "id": 376, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "1779:7:1", + "referencedDeclaration": 289, + "src": "1779:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 259, + "id": 379, "isConstant": false, "isLValue": false, "isPure": false, @@ -2728,7 +2728,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1779:20:1", + "src": "1779:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2738,18 +2738,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 260, + "id": 380, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1803:5:1", + "referencedDeclaration": 339, + "src": "1803:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1779:29:1", + "src": "1779:29:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2763,21 +2763,21 @@ "typeString": "bool" } ], - "id": 255, + "id": 375, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1771:7:1", + "referencedDeclaration": 4156, + "src": "1771:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 262, + "id": 382, "isConstant": false, "isLValue": false, "isPure": false, @@ -2785,15 +2785,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1771:38:1", + "src": "1771:38:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 263, + "id": 383, "nodeType": "ExpressionStatement", - "src": "1771:38:1" + "src": "1771:38:3" }, { "expression": { @@ -2805,7 +2805,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 270, + "id": 390, "isConstant": false, "isLValue": false, "isPure": false, @@ -2815,25 +2815,25 @@ "arguments": [ { "argumentTypes": null, - "id": 266, + "id": 386, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1831:4:1", + "referencedDeclaration": 333, + "src": "1831:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 267, + "id": 387, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1837:5:1", + "referencedDeclaration": 339, + "src": "1837:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2843,7 +2843,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -2851,18 +2851,18 @@ "typeString": "uint256" } ], - "id": 265, + "id": 385, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "1823:7:1", + "referencedDeclaration": 305, + "src": "1823:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 268, + "id": 388, "isConstant": false, "isLValue": false, "isPure": false, @@ -2870,7 +2870,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1823:20:1", + "src": "1823:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2880,18 +2880,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 269, + "id": 389, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1847:5:1", + "referencedDeclaration": 335, + "src": "1847:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1823:29:1", + "src": "1823:29:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2905,21 +2905,21 @@ "typeString": "bool" } ], - "id": 264, + "id": 384, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1815:7:1", + "referencedDeclaration": 4156, + "src": "1815:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 271, + "id": 391, "isConstant": false, "isLValue": false, "isPure": false, @@ -2927,20 +2927,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1815:38:1", + "src": "1815:38:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 272, + "id": 392, "nodeType": "ExpressionStatement", - "src": "1815:38:1" + "src": "1815:38:3" }, { "expression": { "argumentTypes": null, - "id": 280, + "id": 400, "isConstant": false, "isLValue": false, "isPure": false, @@ -2953,40 +2953,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 273, + "id": 393, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1860:4:1", + "referencedDeclaration": 333, + "src": "1860:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 276, + "id": 396, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1860:8:1", + "referencedDeclaration": 198, + "src": "1860:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 277, + "id": 397, "indexExpression": { "argumentTypes": null, - "id": 275, + "id": 395, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1869:5:1", + "referencedDeclaration": 337, + "src": "1869:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2997,21 +2997,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1860:15:1", + "src": "1860:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 278, + "id": 398, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "1860:20:1", + "referencedDeclaration": 193, + "src": "1860:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3021,31 +3021,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 279, + "id": 399, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1883:5:1", + "referencedDeclaration": 335, + "src": "1883:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1860:28:1", + "src": "1860:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 281, + "id": 401, "nodeType": "ExpressionStatement", - "src": "1860:28:1" + "src": "1860:28:3" }, { "expression": { "argumentTypes": null, - "id": 289, + "id": 409, "isConstant": false, "isLValue": false, "isPure": false, @@ -3058,40 +3058,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 282, + "id": 402, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1894:4:1", + "referencedDeclaration": 333, + "src": "1894:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 285, + "id": 405, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1894:8:1", + "referencedDeclaration": 198, + "src": "1894:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 286, + "id": 406, "indexExpression": { "argumentTypes": null, - "id": 284, + "id": 404, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1903:5:1", + "referencedDeclaration": 337, + "src": "1903:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3102,21 +3102,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1894:15:1", + "src": "1894:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 287, + "id": 407, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "1894:20:1", + "referencedDeclaration": 191, + "src": "1894:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3126,31 +3126,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 288, + "id": 408, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1917:5:1", + "referencedDeclaration": 339, + "src": "1917:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1894:28:1", + "src": "1894:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 290, + "id": 410, "nodeType": "ExpressionStatement", - "src": "1894:28:1" + "src": "1894:28:3" }, { "expression": { "argumentTypes": null, - "id": 298, + "id": 418, "isConstant": false, "isLValue": false, "isPure": false, @@ -3163,40 +3163,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 291, + "id": 411, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1929:4:1", + "referencedDeclaration": 333, + "src": "1929:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 294, + "id": 414, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1929:8:1", + "referencedDeclaration": 198, + "src": "1929:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 295, + "id": 415, "indexExpression": { "argumentTypes": null, - "id": 293, + "id": 413, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1938:5:1", + "referencedDeclaration": 335, + "src": "1938:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3207,21 +3207,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1929:15:1", + "src": "1929:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 296, + "id": 416, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "1929:20:1", + "referencedDeclaration": 191, + "src": "1929:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3231,31 +3231,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 297, + "id": 417, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1952:5:1", + "referencedDeclaration": 337, + "src": "1952:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1929:28:1", + "src": "1929:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 299, + "id": 419, "nodeType": "ExpressionStatement", - "src": "1929:28:1" + "src": "1929:28:3" }, { "expression": { "argumentTypes": null, - "id": 307, + "id": 427, "isConstant": false, "isLValue": false, "isPure": false, @@ -3268,40 +3268,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 300, + "id": 420, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1963:4:1", + "referencedDeclaration": 333, + "src": "1963:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 303, + "id": 423, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1963:8:1", + "referencedDeclaration": 198, + "src": "1963:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 304, + "id": 424, "indexExpression": { "argumentTypes": null, - "id": 302, + "id": 422, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1972:5:1", + "referencedDeclaration": 339, + "src": "1972:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3312,21 +3312,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1963:15:1", + "src": "1963:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 305, + "id": 425, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "1963:20:1", + "referencedDeclaration": 193, + "src": "1963:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3336,31 +3336,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 306, + "id": 426, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1986:5:1", + "referencedDeclaration": 337, + "src": "1986:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1963:28:1", + "src": "1963:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 308, + "id": 428, "nodeType": "ExpressionStatement", - "src": "1963:28:1" + "src": "1963:28:3" } ] }, "documentation": "@dev Inserts a new node between _prev and _next. When inserting a node already existing in\nthe list it will be automatically removed from the old position.\n@param _prev the node which _new will be inserted after\n@param _curr the id of the new node being inserted\n@param _next the node which _new will be inserted before", - "id": 310, + "id": 430, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3368,31 +3368,31 @@ "name": "insert", "nodeType": "FunctionDefinition", "parameters": { - "id": 220, + "id": 340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 213, + "id": 333, "name": "self", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1500:17:1", + "scope": 430, + "src": "1500:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 212, + "id": 332, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1500:4:1", + "referencedDeclaration": 199, + "src": "1500:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -3401,11 +3401,11 @@ }, { "constant": false, - "id": 215, + "id": 335, "name": "_prev", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1523:10:1", + "scope": 430, + "src": "1523:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3413,10 +3413,10 @@ "typeString": "uint256" }, "typeName": { - "id": 214, + "id": 334, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1523:4:1", + "src": "1523:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3427,11 +3427,11 @@ }, { "constant": false, - "id": 217, + "id": 337, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1539:10:1", + "scope": 430, + "src": "1539:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3439,10 +3439,10 @@ "typeString": "uint256" }, "typeName": { - "id": 216, + "id": 336, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1539:4:1", + "src": "1539:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3453,11 +3453,11 @@ }, { "constant": false, - "id": 219, + "id": 339, "name": "_next", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1555:10:1", + "scope": 430, + "src": "1555:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3465,10 +3465,10 @@ "typeString": "uint256" }, "typeName": { - "id": 218, + "id": 338, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1555:4:1", + "src": "1555:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3478,31 +3478,31 @@ "visibility": "internal" } ], - "src": "1494:75:1" + "src": "1494:75:3" }, "payable": false, "returnParameters": { - "id": 221, + "id": 341, "nodeType": "ParameterList", "parameters": [], - "src": "1579:0:1" + "src": "1579:0:3" }, - "scope": 365, - "src": "1479:517:1", + "scope": 485, + "src": "1479:517:3", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 363, + "id": 483, "nodeType": "Block", - "src": "2054:230:1", + "src": "2054:230:3", "statements": [ { "condition": { "argumentTypes": null, - "id": 321, + "id": 441, "isConstant": false, "isLValue": false, "isPure": false, @@ -3510,31 +3510,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2064:22:1", + "src": "2064:22:3", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 318, + "id": 438, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2074:4:1", + "referencedDeclaration": 432, + "src": "2074:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 319, + "id": 439, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2080:5:1", + "referencedDeclaration": 434, + "src": "2080:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3544,7 +3544,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -3552,18 +3552,18 @@ "typeString": "uint256" } ], - "id": 317, + "id": 437, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "2065:8:1", + "referencedDeclaration": 273, + "src": "2065:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 320, + "id": 440, "isConstant": false, "isLValue": false, "isPure": false, @@ -3571,7 +3571,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2065:21:1", + "src": "2065:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3583,36 +3583,36 @@ } }, "falseBody": null, - "id": 324, + "id": 444, "nodeType": "IfStatement", - "src": "2060:49:1", + "src": "2060:49:3", "trueBody": { - "id": 323, + "id": 443, "nodeType": "Block", - "src": "2088:21:1", + "src": "2088:21:3", "statements": [ { "expression": null, - "functionReturnParameters": 316, - "id": 322, + "functionReturnParameters": 436, + "id": 442, "nodeType": "Return", - "src": "2096:7:1" + "src": "2096:7:3" } ] } }, { "assignments": [ - 326 + 446 ], "declarations": [ { "constant": false, - "id": 326, + "id": 446, "name": "next", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2115:9:1", + "scope": 484, + "src": "2115:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3620,10 +3620,10 @@ "typeString": "uint256" }, "typeName": { - "id": 325, + "id": 445, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2115:4:1", + "src": "2115:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3633,31 +3633,31 @@ "visibility": "internal" } ], - "id": 331, + "id": 451, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 328, + "id": 448, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2135:4:1", + "referencedDeclaration": 432, + "src": "2135:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 329, + "id": 449, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2141:5:1", + "referencedDeclaration": 434, + "src": "2141:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3667,7 +3667,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -3675,18 +3675,18 @@ "typeString": "uint256" } ], - "id": 327, + "id": 447, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "2127:7:1", + "referencedDeclaration": 289, + "src": "2127:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 330, + "id": 450, "isConstant": false, "isLValue": false, "isPure": false, @@ -3694,27 +3694,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2127:20:1", + "src": "2127:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2115:32:1" + "src": "2115:32:3" }, { "assignments": [ - 333 + 453 ], "declarations": [ { "constant": false, - "id": 333, + "id": 453, "name": "prev", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2153:9:1", + "scope": 484, + "src": "2153:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3722,10 +3722,10 @@ "typeString": "uint256" }, "typeName": { - "id": 332, + "id": 452, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2153:4:1", + "src": "2153:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3735,31 +3735,31 @@ "visibility": "internal" } ], - "id": 338, + "id": 458, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 335, + "id": 455, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2173:4:1", + "referencedDeclaration": 432, + "src": "2173:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 336, + "id": 456, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2179:5:1", + "referencedDeclaration": 434, + "src": "2179:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3769,7 +3769,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -3777,18 +3777,18 @@ "typeString": "uint256" } ], - "id": 334, + "id": 454, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "2165:7:1", + "referencedDeclaration": 305, + "src": "2165:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 337, + "id": 457, "isConstant": false, "isLValue": false, "isPure": false, @@ -3796,19 +3796,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2165:20:1", + "src": "2165:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2153:32:1" + "src": "2153:32:3" }, { "expression": { "argumentTypes": null, - "id": 346, + "id": 466, "isConstant": false, "isLValue": false, "isPure": false, @@ -3821,40 +3821,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 339, + "id": 459, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2192:4:1", + "referencedDeclaration": 432, + "src": "2192:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 342, + "id": 462, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2192:8:1", + "referencedDeclaration": 198, + "src": "2192:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 343, + "id": 463, "indexExpression": { "argumentTypes": null, - "id": 341, + "id": 461, "name": "next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 326, - "src": "2201:4:1", + "referencedDeclaration": 446, + "src": "2201:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3865,21 +3865,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2192:14:1", + "src": "2192:14:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 344, + "id": 464, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "2192:19:1", + "referencedDeclaration": 193, + "src": "2192:19:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3889,31 +3889,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 345, + "id": 465, "name": "prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 333, - "src": "2214:4:1", + "referencedDeclaration": 453, + "src": "2214:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2192:26:1", + "src": "2192:26:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 347, + "id": 467, "nodeType": "ExpressionStatement", - "src": "2192:26:1" + "src": "2192:26:3" }, { "expression": { "argumentTypes": null, - "id": 355, + "id": 475, "isConstant": false, "isLValue": false, "isPure": false, @@ -3926,40 +3926,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 348, + "id": 468, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2224:4:1", + "referencedDeclaration": 432, + "src": "2224:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 351, + "id": 471, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2224:8:1", + "referencedDeclaration": 198, + "src": "2224:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 352, + "id": 472, "indexExpression": { "argumentTypes": null, - "id": 350, + "id": 470, "name": "prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 333, - "src": "2233:4:1", + "referencedDeclaration": 453, + "src": "2233:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3970,21 +3970,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2224:14:1", + "src": "2224:14:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 353, + "id": 473, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "2224:19:1", + "referencedDeclaration": 191, + "src": "2224:19:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3994,31 +3994,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 354, + "id": 474, "name": "next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 326, - "src": "2246:4:1", + "referencedDeclaration": 446, + "src": "2246:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2224:26:1", + "src": "2224:26:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 356, + "id": 476, "nodeType": "ExpressionStatement", - "src": "2224:26:1" + "src": "2224:26:3" }, { "expression": { "argumentTypes": null, - "id": 361, + "id": 481, "isConstant": false, "isLValue": false, "isPure": false, @@ -4026,47 +4026,47 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "2257:22:1", + "src": "2257:22:3", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 357, + "id": 477, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2264:4:1", + "referencedDeclaration": 432, + "src": "2264:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 358, + "id": 478, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2264:8:1", + "referencedDeclaration": 198, + "src": "2264:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 360, + "id": 480, "indexExpression": { "argumentTypes": null, - "id": 359, + "id": 479, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2273:5:1", + "referencedDeclaration": 434, + "src": "2273:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4077,9 +4077,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2264:15:1", + "src": "2264:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, @@ -4088,14 +4088,14 @@ "typeString": "tuple()" } }, - "id": 362, + "id": 482, "nodeType": "ExpressionStatement", - "src": "2257:22:1" + "src": "2257:22:3" } ] }, "documentation": null, - "id": 364, + "id": 484, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -4103,31 +4103,31 @@ "name": "remove", "nodeType": "FunctionDefinition", "parameters": { - "id": 315, + "id": 435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 312, + "id": 432, "name": "self", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2016:17:1", + "scope": 484, + "src": "2016:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 311, + "id": 431, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "2016:4:1", + "referencedDeclaration": 199, + "src": "2016:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -4136,11 +4136,11 @@ }, { "constant": false, - "id": 314, + "id": 434, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2035:10:1", + "scope": 484, + "src": "2035:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4148,10 +4148,10 @@ "typeString": "uint256" }, "typeName": { - "id": 313, + "id": 433, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2035:4:1", + "src": "2035:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4161,47 +4161,47 @@ "visibility": "internal" } ], - "src": "2015:31:1" + "src": "2015:31:3" }, "payable": false, "returnParameters": { - "id": 316, + "id": 436, "nodeType": "ParameterList", "parameters": [], - "src": "2054:0:1" + "src": "2054:0:3" }, - "scope": 365, - "src": "2000:284:1", + "scope": 485, + "src": "2000:284:3", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 366, - "src": "26:2260:1" + "scope": 486, + "src": "26:2260:3" } ], - "src": "0:2287:1" + "src": "0:2287:3" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/DLL.sol", + "absolutePath": "/home/bharath/computable/contracts/DLL.sol", "exportedSymbols": { "DLL": [ - 365 + 485 ] }, - "id": 366, + "id": 486, "nodeType": "SourceUnit", "nodes": [ { - "id": 66, + "id": 186, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:1" + "src": "0:23:3" }, { "baseContracts": [], @@ -4209,20 +4209,20 @@ "contractKind": "library", "documentation": null, "fullyImplemented": true, - "id": 365, + "id": 485, "linearizedBaseContracts": [ - 365 + 485 ], "name": "DLL", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 69, + "id": 189, "name": "NULL_NODE_ID", "nodeType": "VariableDeclaration", - "scope": 365, - "src": "43:30:1", + "scope": 485, + "src": "43:30:3", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -4230,10 +4230,10 @@ "typeString": "uint256" }, "typeName": { - "id": 67, + "id": 187, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "43:4:1", + "src": "43:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4242,14 +4242,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 68, + "id": 188, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "72:1:1", + "src": "72:1:3", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4261,15 +4261,15 @@ }, { "canonicalName": "DLL.Node", - "id": 74, + "id": 194, "members": [ { "constant": false, - "id": 71, + "id": 191, "name": "next", "nodeType": "VariableDeclaration", - "scope": 74, - "src": "96:9:1", + "scope": 194, + "src": "96:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4277,10 +4277,10 @@ "typeString": "uint256" }, "typeName": { - "id": 70, + "id": 190, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "96:4:1", + "src": "96:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4291,11 +4291,11 @@ }, { "constant": false, - "id": 73, + "id": 193, "name": "prev", "nodeType": "VariableDeclaration", - "scope": 74, - "src": "111:9:1", + "scope": 194, + "src": "111:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4303,10 +4303,10 @@ "typeString": "uint256" }, "typeName": { - "id": 72, + "id": 192, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "111:4:1", + "src": "111:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4318,54 +4318,54 @@ ], "name": "Node", "nodeType": "StructDefinition", - "scope": 365, - "src": "78:47:1", + "scope": 485, + "src": "78:47:3", "visibility": "public" }, { "canonicalName": "DLL.Data", - "id": 79, + "id": 199, "members": [ { "constant": false, - "id": 78, + "id": 198, "name": "dll", "nodeType": "VariableDeclaration", - "scope": 79, - "src": "147:25:1", + "scope": 199, + "src": "147:25:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node)" }, "typeName": { - "id": 77, + "id": 197, "keyType": { - "id": 75, + "id": 195, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "155:4:1", + "src": "155:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "147:21:1", + "src": "147:21:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node)" }, "valueType": { "contractScope": null, - "id": 76, + "id": 196, "name": "Node", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 74, - "src": "163:4:1", + "referencedDeclaration": 194, + "src": "163:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage_ptr", + "typeIdentifier": "t_struct$_Node_$194_storage_ptr", "typeString": "struct DLL.Node" } } @@ -4376,15 +4376,15 @@ ], "name": "Data", "nodeType": "StructDefinition", - "scope": 365, - "src": "129:48:1", + "scope": 485, + "src": "129:48:3", "visibility": "public" }, { "body": { - "id": 92, + "id": 212, "nodeType": "Block", - "src": "244:48:1", + "src": "244:48:3", "statements": [ { "expression": { @@ -4393,7 +4393,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 90, + "id": 210, "isConstant": false, "isLValue": false, "isPure": false, @@ -4403,14 +4403,14 @@ "arguments": [ { "argumentTypes": null, - "id": 87, + "id": 207, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 81, - "src": "266:4:1", + "referencedDeclaration": 201, + "src": "266:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -4418,22 +4418,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 86, + "id": 206, "name": "getStart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 198, - "src": "257:8:1", + "referencedDeclaration": 318, + "src": "257:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 88, + "id": 208, "isConstant": false, "isLValue": false, "isPure": false, @@ -4441,7 +4441,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "257:14:1", + "src": "257:14:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4451,32 +4451,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 89, + "id": 209, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "275:12:1", + "referencedDeclaration": 189, + "src": "275:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "257:30:1", + "src": "257:30:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 85, - "id": 91, + "functionReturnParameters": 205, + "id": 211, "nodeType": "Return", - "src": "250:37:1" + "src": "250:37:3" } ] }, "documentation": null, - "id": 93, + "id": 213, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -4484,31 +4484,31 @@ "name": "isEmpty", "nodeType": "FunctionDefinition", "parameters": { - "id": 82, + "id": 202, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 81, + "id": 201, "name": "self", "nodeType": "VariableDeclaration", - "scope": 93, - "src": "198:17:1", + "scope": 213, + "src": "198:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 80, + "id": 200, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "198:4:1", + "referencedDeclaration": 199, + "src": "198:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -4516,20 +4516,20 @@ "visibility": "internal" } ], - "src": "197:19:1" + "src": "197:19:3" }, "payable": false, "returnParameters": { - "id": 85, + "id": 205, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 84, + "id": 204, "name": "", "nodeType": "VariableDeclaration", - "scope": 93, - "src": "238:4:1", + "scope": 213, + "src": "238:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4537,10 +4537,10 @@ "typeString": "bool" }, "typeName": { - "id": 83, + "id": 203, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "238:4:1", + "src": "238:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4550,19 +4550,19 @@ "visibility": "internal" } ], - "src": "237:6:1" + "src": "237:6:3" }, - "scope": 365, - "src": "181:111:1", + "scope": 485, + "src": "181:111:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 152, + "id": 272, "nodeType": "Block", - "src": "372:304:1", + "src": "372:304:3", "statements": [ { "condition": { @@ -4571,7 +4571,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 108, + "id": 228, "isConstant": false, "isLValue": false, "isPure": false, @@ -4581,14 +4581,14 @@ "arguments": [ { "argumentTypes": null, - "id": 103, + "id": 223, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "390:4:1", + "referencedDeclaration": 215, + "src": "390:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -4596,22 +4596,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 102, + "id": 222, "name": "isEmpty", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 93, - "src": "382:7:1", + "referencedDeclaration": 213, + "src": "382:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer) view returns (bool)" } }, - "id": 104, + "id": 224, "isConstant": false, "isLValue": false, "isPure": false, @@ -4619,7 +4619,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "382:13:1", + "src": "382:13:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4633,19 +4633,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 107, + "id": 227, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 105, + "id": 225, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "399:5:1", + "referencedDeclaration": 217, + "src": "399:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4655,50 +4655,50 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 106, + "id": 226, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "408:12:1", + "referencedDeclaration": 189, + "src": "408:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "399:21:1", + "src": "399:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "382:38:1", + "src": "382:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 112, + "id": 232, "nodeType": "IfStatement", - "src": "378:71:1", + "src": "378:71:3", "trueBody": { - "id": 111, + "id": 231, "nodeType": "Block", - "src": "422:27:1", + "src": "422:27:3", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 109, + "id": 229, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "437:5:1", + "src": "437:5:3", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -4706,26 +4706,26 @@ }, "value": "false" }, - "functionReturnParameters": 101, - "id": 110, + "functionReturnParameters": 221, + "id": 230, "nodeType": "Return", - "src": "430:12:1" + "src": "430:12:3" } ] } }, { "assignments": [ - 114 + 234 ], "declarations": [ { "constant": false, - "id": 114, + "id": 234, "name": "isSingleNode", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "455:17:1", + "scope": 273, + "src": "455:17:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4733,10 +4733,10 @@ "typeString": "bool" }, "typeName": { - "id": 113, + "id": 233, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "455:4:1", + "src": "455:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4746,14 +4746,14 @@ "visibility": "internal" } ], - "id": 128, + "id": 248, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 127, + "id": 247, "isConstant": false, "isLValue": false, "isPure": false, @@ -4767,7 +4767,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 119, + "id": 239, "isConstant": false, "isLValue": false, "isPure": false, @@ -4777,14 +4777,14 @@ "arguments": [ { "argumentTypes": null, - "id": 116, + "id": 236, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "485:4:1", + "referencedDeclaration": 215, + "src": "485:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -4792,22 +4792,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 115, + "id": 235, "name": "getStart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 198, - "src": "476:8:1", + "referencedDeclaration": 318, + "src": "476:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 117, + "id": 237, "isConstant": false, "isLValue": false, "isPure": false, @@ -4815,7 +4815,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "476:14:1", + "src": "476:14:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4825,32 +4825,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 118, + "id": 238, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "494:5:1", + "referencedDeclaration": 217, + "src": "494:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "476:23:1", + "src": "476:23:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 120, + "id": 240, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "475:25:1", + "src": "475:25:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4867,7 +4867,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 125, + "id": 245, "isConstant": false, "isLValue": false, "isPure": false, @@ -4877,14 +4877,14 @@ "arguments": [ { "argumentTypes": null, - "id": 122, + "id": 242, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "512:4:1", + "referencedDeclaration": 215, + "src": "512:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } } @@ -4892,22 +4892,22 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } ], - "id": 121, + "id": 241, "name": "getEnd", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 211, - "src": "505:6:1", + "referencedDeclaration": 331, + "src": "505:6:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer) view returns (uint256)" } }, - "id": 123, + "id": 243, "isConstant": false, "isLValue": false, "isPure": false, @@ -4915,7 +4915,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "505:12:1", + "src": "505:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4925,58 +4925,58 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 124, + "id": 244, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "521:5:1", + "referencedDeclaration": 217, + "src": "521:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "505:21:1", + "src": "505:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 126, + "id": 246, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "504:23:1", + "src": "504:23:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "475:52:1", + "src": "475:52:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "455:72:1" + "src": "455:72:3" }, { "assignments": [ - 130 + 250 ], "declarations": [ { "constant": false, - "id": 130, + "id": 250, "name": "isNullNode", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "533:15:1", + "scope": 273, + "src": "533:15:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4984,10 +4984,10 @@ "typeString": "bool" }, "typeName": { - "id": 129, + "id": 249, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "533:4:1", + "src": "533:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4997,14 +4997,14 @@ "visibility": "internal" } ], - "id": 146, + "id": 266, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 145, + "id": 265, "isConstant": false, "isLValue": false, "isPure": false, @@ -5018,7 +5018,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 136, + "id": 256, "isConstant": false, "isLValue": false, "isPure": false, @@ -5028,25 +5028,25 @@ "arguments": [ { "argumentTypes": null, - "id": 132, + "id": 252, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "560:4:1", + "referencedDeclaration": 215, + "src": "560:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 133, + "id": 253, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "566:5:1", + "referencedDeclaration": 217, + "src": "566:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5056,7 +5056,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -5064,18 +5064,18 @@ "typeString": "uint256" } ], - "id": 131, + "id": 251, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "552:7:1", + "referencedDeclaration": 289, + "src": "552:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 134, + "id": 254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5083,7 +5083,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "552:20:1", + "src": "552:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5093,32 +5093,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 135, + "id": 255, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "576:12:1", + "referencedDeclaration": 189, + "src": "576:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "552:36:1", + "src": "552:36:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 137, + "id": 257, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "551:38:1", + "src": "551:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5135,7 +5135,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 143, + "id": 263, "isConstant": false, "isLValue": false, "isPure": false, @@ -5145,25 +5145,25 @@ "arguments": [ { "argumentTypes": null, - "id": 139, + "id": 259, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 95, - "src": "602:4:1", + "referencedDeclaration": 215, + "src": "602:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 140, + "id": 260, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 97, - "src": "608:5:1", + "referencedDeclaration": 217, + "src": "608:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5173,7 +5173,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -5181,18 +5181,18 @@ "typeString": "uint256" } ], - "id": 138, + "id": 258, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "594:7:1", + "referencedDeclaration": 305, + "src": "594:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 141, + "id": 261, "isConstant": false, "isLValue": false, "isPure": false, @@ -5200,7 +5200,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "594:20:1", + "src": "594:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5210,45 +5210,45 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 142, + "id": 262, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "618:12:1", + "referencedDeclaration": 189, + "src": "618:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "594:36:1", + "src": "594:36:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 144, + "id": 264, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "593:38:1", + "src": "593:38:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "551:80:1", + "src": "551:80:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "533:98:1" + "src": "533:98:3" }, { "expression": { @@ -5257,19 +5257,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 150, + "id": 270, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 147, + "id": 267, "name": "isSingleNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 114, - "src": "644:12:1", + "referencedDeclaration": 234, + "src": "644:12:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5279,7 +5279,7 @@ "operator": "||", "rightExpression": { "argumentTypes": null, - "id": 149, + "id": 269, "isConstant": false, "isLValue": false, "isPure": false, @@ -5287,15 +5287,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "660:11:1", + "src": "660:11:3", "subExpression": { "argumentTypes": null, - "id": 148, + "id": 268, "name": "isNullNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 130, - "src": "661:10:1", + "referencedDeclaration": 250, + "src": "661:10:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5306,21 +5306,21 @@ "typeString": "bool" } }, - "src": "644:27:1", + "src": "644:27:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 101, - "id": 151, + "functionReturnParameters": 221, + "id": 271, "nodeType": "Return", - "src": "637:34:1" + "src": "637:34:3" } ] }, "documentation": null, - "id": 153, + "id": 273, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5328,31 +5328,31 @@ "name": "contains", "nodeType": "FunctionDefinition", "parameters": { - "id": 98, + "id": 218, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 95, + "id": 215, "name": "self", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "314:17:1", + "scope": 273, + "src": "314:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 94, + "id": 214, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "314:4:1", + "referencedDeclaration": 199, + "src": "314:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -5361,11 +5361,11 @@ }, { "constant": false, - "id": 97, + "id": 217, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "333:10:1", + "scope": 273, + "src": "333:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5373,10 +5373,10 @@ "typeString": "uint256" }, "typeName": { - "id": 96, + "id": 216, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "333:4:1", + "src": "333:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5386,20 +5386,20 @@ "visibility": "internal" } ], - "src": "313:31:1" + "src": "313:31:3" }, "payable": false, "returnParameters": { - "id": 101, + "id": 221, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 100, + "id": 220, "name": "", "nodeType": "VariableDeclaration", - "scope": 153, - "src": "366:4:1", + "scope": 273, + "src": "366:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5407,10 +5407,10 @@ "typeString": "bool" }, "typeName": { - "id": 99, + "id": 219, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "366:4:1", + "src": "366:4:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5420,19 +5420,19 @@ "visibility": "internal" } ], - "src": "365:6:1" + "src": "365:6:3" }, - "scope": 365, - "src": "296:380:1", + "scope": 485, + "src": "296:380:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 168, + "id": 288, "nodeType": "Block", - "src": "755:38:1", + "src": "755:38:3", "statements": [ { "expression": { @@ -5443,40 +5443,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 162, + "id": 282, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 155, - "src": "768:4:1", + "referencedDeclaration": 275, + "src": "768:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 163, + "id": 283, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "768:8:1", + "referencedDeclaration": 198, + "src": "768:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 165, + "id": 285, "indexExpression": { "argumentTypes": null, - "id": 164, + "id": 284, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 157, - "src": "777:5:1", + "referencedDeclaration": 277, + "src": "777:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5487,35 +5487,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "768:15:1", + "src": "768:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 166, + "id": 286, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "768:20:1", + "referencedDeclaration": 191, + "src": "768:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 161, - "id": 167, + "functionReturnParameters": 281, + "id": 287, "nodeType": "Return", - "src": "761:27:1" + "src": "761:27:3" } ] }, "documentation": null, - "id": 169, + "id": 289, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5523,31 +5523,31 @@ "name": "getNext", "nodeType": "FunctionDefinition", "parameters": { - "id": 158, + "id": 278, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 155, + "id": 275, "name": "self", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "697:17:1", + "scope": 289, + "src": "697:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 154, + "id": 274, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "697:4:1", + "referencedDeclaration": 199, + "src": "697:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -5556,11 +5556,11 @@ }, { "constant": false, - "id": 157, + "id": 277, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "716:10:1", + "scope": 289, + "src": "716:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5568,10 +5568,10 @@ "typeString": "uint256" }, "typeName": { - "id": 156, + "id": 276, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "716:4:1", + "src": "716:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5581,20 +5581,20 @@ "visibility": "internal" } ], - "src": "696:31:1" + "src": "696:31:3" }, "payable": false, "returnParameters": { - "id": 161, + "id": 281, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 160, + "id": 280, "name": "", "nodeType": "VariableDeclaration", - "scope": 169, - "src": "749:4:1", + "scope": 289, + "src": "749:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5602,10 +5602,10 @@ "typeString": "uint256" }, "typeName": { - "id": 159, + "id": 279, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "749:4:1", + "src": "749:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5615,19 +5615,19 @@ "visibility": "internal" } ], - "src": "748:6:1" + "src": "748:6:3" }, - "scope": 365, - "src": "680:113:1", + "scope": 485, + "src": "680:113:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 184, + "id": 304, "nodeType": "Block", - "src": "872:38:1", + "src": "872:38:3", "statements": [ { "expression": { @@ -5638,40 +5638,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 178, + "id": 298, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 171, - "src": "885:4:1", + "referencedDeclaration": 291, + "src": "885:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 179, + "id": 299, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "885:8:1", + "referencedDeclaration": 198, + "src": "885:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 181, + "id": 301, "indexExpression": { "argumentTypes": null, - "id": 180, + "id": 300, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 173, - "src": "894:5:1", + "referencedDeclaration": 293, + "src": "894:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5682,35 +5682,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "885:15:1", + "src": "885:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 182, + "id": 302, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "885:20:1", + "referencedDeclaration": 193, + "src": "885:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 177, - "id": 183, + "functionReturnParameters": 297, + "id": 303, "nodeType": "Return", - "src": "878:27:1" + "src": "878:27:3" } ] }, "documentation": null, - "id": 185, + "id": 305, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5718,31 +5718,31 @@ "name": "getPrev", "nodeType": "FunctionDefinition", "parameters": { - "id": 174, + "id": 294, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 171, + "id": 291, "name": "self", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "814:17:1", + "scope": 305, + "src": "814:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 170, + "id": 290, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "814:4:1", + "referencedDeclaration": 199, + "src": "814:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -5751,11 +5751,11 @@ }, { "constant": false, - "id": 173, + "id": 293, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "833:10:1", + "scope": 305, + "src": "833:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5763,10 +5763,10 @@ "typeString": "uint256" }, "typeName": { - "id": 172, + "id": 292, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "833:4:1", + "src": "833:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5776,20 +5776,20 @@ "visibility": "internal" } ], - "src": "813:31:1" + "src": "813:31:3" }, "payable": false, "returnParameters": { - "id": 177, + "id": 297, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 176, + "id": 296, "name": "", "nodeType": "VariableDeclaration", - "scope": 185, - "src": "866:4:1", + "scope": 305, + "src": "866:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5797,10 +5797,10 @@ "typeString": "uint256" }, "typeName": { - "id": 175, + "id": 295, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "866:4:1", + "src": "866:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5810,19 +5810,19 @@ "visibility": "internal" } ], - "src": "865:6:1" + "src": "865:6:3" }, - "scope": 365, - "src": "797:113:1", + "scope": 485, + "src": "797:113:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 197, + "id": 317, "nodeType": "Block", - "src": "978:45:1", + "src": "978:45:3", "statements": [ { "expression": { @@ -5830,25 +5830,25 @@ "arguments": [ { "argumentTypes": null, - "id": 193, + "id": 313, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 187, - "src": "999:4:1", + "referencedDeclaration": 307, + "src": "999:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 194, + "id": 314, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1005:12:1", + "referencedDeclaration": 189, + "src": "1005:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5858,7 +5858,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -5866,18 +5866,18 @@ "typeString": "uint256" } ], - "id": 192, + "id": 312, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "991:7:1", + "referencedDeclaration": 289, + "src": "991:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 195, + "id": 315, "isConstant": false, "isLValue": false, "isPure": false, @@ -5885,21 +5885,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "991:27:1", + "src": "991:27:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 191, - "id": 196, + "functionReturnParameters": 311, + "id": 316, "nodeType": "Return", - "src": "984:34:1" + "src": "984:34:3" } ] }, "documentation": null, - "id": 198, + "id": 318, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5907,31 +5907,31 @@ "name": "getStart", "nodeType": "FunctionDefinition", "parameters": { - "id": 188, + "id": 308, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 187, + "id": 307, "name": "self", "nodeType": "VariableDeclaration", - "scope": 198, - "src": "932:17:1", + "scope": 318, + "src": "932:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 186, + "id": 306, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "932:4:1", + "referencedDeclaration": 199, + "src": "932:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -5939,20 +5939,20 @@ "visibility": "internal" } ], - "src": "931:19:1" + "src": "931:19:3" }, "payable": false, "returnParameters": { - "id": 191, + "id": 311, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 190, + "id": 310, "name": "", "nodeType": "VariableDeclaration", - "scope": 198, - "src": "972:4:1", + "scope": 318, + "src": "972:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5960,10 +5960,10 @@ "typeString": "uint256" }, "typeName": { - "id": 189, + "id": 309, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "972:4:1", + "src": "972:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5973,19 +5973,19 @@ "visibility": "internal" } ], - "src": "971:6:1" + "src": "971:6:3" }, - "scope": 365, - "src": "914:109:1", + "scope": 485, + "src": "914:109:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 210, + "id": 330, "nodeType": "Block", - "src": "1089:45:1", + "src": "1089:45:3", "statements": [ { "expression": { @@ -5993,25 +5993,25 @@ "arguments": [ { "argumentTypes": null, - "id": 206, + "id": 326, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 200, - "src": "1110:4:1", + "referencedDeclaration": 320, + "src": "1110:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 207, + "id": 327, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1116:12:1", + "referencedDeclaration": 189, + "src": "1116:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6021,7 +6021,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6029,18 +6029,18 @@ "typeString": "uint256" } ], - "id": 205, + "id": 325, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "1102:7:1", + "referencedDeclaration": 305, + "src": "1102:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 208, + "id": 328, "isConstant": false, "isLValue": false, "isPure": false, @@ -6048,21 +6048,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1102:27:1", + "src": "1102:27:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 204, - "id": 209, + "functionReturnParameters": 324, + "id": 329, "nodeType": "Return", - "src": "1095:34:1" + "src": "1095:34:3" } ] }, "documentation": null, - "id": 211, + "id": 331, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -6070,31 +6070,31 @@ "name": "getEnd", "nodeType": "FunctionDefinition", "parameters": { - "id": 201, + "id": 321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 200, + "id": 320, "name": "self", "nodeType": "VariableDeclaration", - "scope": 211, - "src": "1043:17:1", + "scope": 331, + "src": "1043:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 199, + "id": 319, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1043:4:1", + "referencedDeclaration": 199, + "src": "1043:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -6102,20 +6102,20 @@ "visibility": "internal" } ], - "src": "1042:19:1" + "src": "1042:19:3" }, "payable": false, "returnParameters": { - "id": 204, + "id": 324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 203, + "id": 323, "name": "", "nodeType": "VariableDeclaration", - "scope": 211, - "src": "1083:4:1", + "scope": 331, + "src": "1083:4:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6123,10 +6123,10 @@ "typeString": "uint256" }, "typeName": { - "id": 202, + "id": 322, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1083:4:1", + "src": "1083:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6136,19 +6136,19 @@ "visibility": "internal" } ], - "src": "1082:6:1" + "src": "1082:6:3" }, - "scope": 365, - "src": "1027:107:1", + "scope": 485, + "src": "1027:107:3", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 309, + "id": 429, "nodeType": "Block", - "src": "1579:417:1", + "src": "1579:417:3", "statements": [ { "expression": { @@ -6160,19 +6160,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 225, + "id": 345, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 223, + "id": 343, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1593:5:1", + "referencedDeclaration": 337, + "src": "1593:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6182,18 +6182,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 224, + "id": 344, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1602:12:1", + "referencedDeclaration": 189, + "src": "1602:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1593:21:1", + "src": "1593:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6207,21 +6207,21 @@ "typeString": "bool" } ], - "id": 222, + "id": 342, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1585:7:1", + "referencedDeclaration": 4156, + "src": "1585:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 226, + "id": 346, "isConstant": false, "isLValue": false, "isPure": false, @@ -6229,15 +6229,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1585:30:1", + "src": "1585:30:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 227, + "id": 347, "nodeType": "ExpressionStatement", - "src": "1585:30:1" + "src": "1585:30:3" }, { "expression": { @@ -6245,25 +6245,25 @@ "arguments": [ { "argumentTypes": null, - "id": 229, + "id": 349, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1629:4:1", + "referencedDeclaration": 333, + "src": "1629:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 230, + "id": 350, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1635:5:1", + "referencedDeclaration": 337, + "src": "1635:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6273,7 +6273,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6281,18 +6281,18 @@ "typeString": "uint256" } ], - "id": 228, + "id": 348, "name": "remove", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 364, - "src": "1622:6:1", + "referencedDeclaration": 484, + "src": "1622:6:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 231, + "id": 351, "isConstant": false, "isLValue": false, "isPure": false, @@ -6300,15 +6300,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1622:19:1", + "src": "1622:19:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 232, + "id": 352, "nodeType": "ExpressionStatement", - "src": "1622:19:1" + "src": "1622:19:3" }, { "expression": { @@ -6320,7 +6320,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 241, + "id": 361, "isConstant": false, "isLValue": false, "isPure": false, @@ -6331,19 +6331,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 236, + "id": 356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 234, + "id": 354, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1656:5:1", + "referencedDeclaration": 335, + "src": "1656:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6353,18 +6353,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 235, + "id": 355, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1665:12:1", + "referencedDeclaration": 189, + "src": "1665:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1656:21:1", + "src": "1656:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6377,25 +6377,25 @@ "arguments": [ { "argumentTypes": null, - "id": 238, + "id": 358, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1690:4:1", + "referencedDeclaration": 333, + "src": "1690:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 239, + "id": 359, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1696:5:1", + "referencedDeclaration": 335, + "src": "1696:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6405,7 +6405,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6413,18 +6413,18 @@ "typeString": "uint256" } ], - "id": 237, + "id": 357, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "1681:8:1", + "referencedDeclaration": 273, + "src": "1681:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 240, + "id": 360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6432,13 +6432,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1681:21:1", + "src": "1681:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "1656:46:1", + "src": "1656:46:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6452,21 +6452,21 @@ "typeString": "bool" } ], - "id": 233, + "id": 353, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1648:7:1", + "referencedDeclaration": 4156, + "src": "1648:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 242, + "id": 362, "isConstant": false, "isLValue": false, "isPure": false, @@ -6474,15 +6474,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1648:55:1", + "src": "1648:55:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 243, + "id": 363, "nodeType": "ExpressionStatement", - "src": "1648:55:1" + "src": "1648:55:3" }, { "expression": { @@ -6494,7 +6494,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 252, + "id": 372, "isConstant": false, "isLValue": false, "isPure": false, @@ -6505,19 +6505,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 247, + "id": 367, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 245, + "id": 365, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1717:5:1", + "referencedDeclaration": 339, + "src": "1717:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6527,18 +6527,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 246, + "id": 366, "name": "NULL_NODE_ID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 69, - "src": "1726:12:1", + "referencedDeclaration": 189, + "src": "1726:12:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1717:21:1", + "src": "1717:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6551,25 +6551,25 @@ "arguments": [ { "argumentTypes": null, - "id": 249, + "id": 369, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1751:4:1", + "referencedDeclaration": 333, + "src": "1751:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 250, + "id": 370, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1757:5:1", + "referencedDeclaration": 339, + "src": "1757:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6579,7 +6579,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6587,18 +6587,18 @@ "typeString": "uint256" } ], - "id": 248, + "id": 368, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "1742:8:1", + "referencedDeclaration": 273, + "src": "1742:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 251, + "id": 371, "isConstant": false, "isLValue": false, "isPure": false, @@ -6606,13 +6606,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1742:21:1", + "src": "1742:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "1717:46:1", + "src": "1717:46:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6626,21 +6626,21 @@ "typeString": "bool" } ], - "id": 244, + "id": 364, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1709:7:1", + "referencedDeclaration": 4156, + "src": "1709:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 253, + "id": 373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6648,15 +6648,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1709:55:1", + "src": "1709:55:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 254, + "id": 374, "nodeType": "ExpressionStatement", - "src": "1709:55:1" + "src": "1709:55:3" }, { "expression": { @@ -6668,7 +6668,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 261, + "id": 381, "isConstant": false, "isLValue": false, "isPure": false, @@ -6678,25 +6678,25 @@ "arguments": [ { "argumentTypes": null, - "id": 257, + "id": 377, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1787:4:1", + "referencedDeclaration": 333, + "src": "1787:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 258, + "id": 378, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1793:5:1", + "referencedDeclaration": 335, + "src": "1793:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6706,7 +6706,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6714,18 +6714,18 @@ "typeString": "uint256" } ], - "id": 256, + "id": 376, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "1779:7:1", + "referencedDeclaration": 289, + "src": "1779:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 259, + "id": 379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6733,7 +6733,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1779:20:1", + "src": "1779:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6743,18 +6743,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 260, + "id": 380, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1803:5:1", + "referencedDeclaration": 339, + "src": "1803:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1779:29:1", + "src": "1779:29:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6768,21 +6768,21 @@ "typeString": "bool" } ], - "id": 255, + "id": 375, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1771:7:1", + "referencedDeclaration": 4156, + "src": "1771:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 262, + "id": 382, "isConstant": false, "isLValue": false, "isPure": false, @@ -6790,15 +6790,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1771:38:1", + "src": "1771:38:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 263, + "id": 383, "nodeType": "ExpressionStatement", - "src": "1771:38:1" + "src": "1771:38:3" }, { "expression": { @@ -6810,7 +6810,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 270, + "id": 390, "isConstant": false, "isLValue": false, "isPure": false, @@ -6820,25 +6820,25 @@ "arguments": [ { "argumentTypes": null, - "id": 266, + "id": 386, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1831:4:1", + "referencedDeclaration": 333, + "src": "1831:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 267, + "id": 387, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1837:5:1", + "referencedDeclaration": 339, + "src": "1837:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6848,7 +6848,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -6856,18 +6856,18 @@ "typeString": "uint256" } ], - "id": 265, + "id": 385, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "1823:7:1", + "referencedDeclaration": 305, + "src": "1823:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 268, + "id": 388, "isConstant": false, "isLValue": false, "isPure": false, @@ -6875,7 +6875,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1823:20:1", + "src": "1823:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6885,18 +6885,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 269, + "id": 389, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1847:5:1", + "referencedDeclaration": 335, + "src": "1847:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1823:29:1", + "src": "1823:29:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6910,21 +6910,21 @@ "typeString": "bool" } ], - "id": 264, + "id": 384, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "1815:7:1", + "referencedDeclaration": 4156, + "src": "1815:7:3", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 271, + "id": 391, "isConstant": false, "isLValue": false, "isPure": false, @@ -6932,20 +6932,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1815:38:1", + "src": "1815:38:3", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 272, + "id": 392, "nodeType": "ExpressionStatement", - "src": "1815:38:1" + "src": "1815:38:3" }, { "expression": { "argumentTypes": null, - "id": 280, + "id": 400, "isConstant": false, "isLValue": false, "isPure": false, @@ -6958,40 +6958,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 273, + "id": 393, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1860:4:1", + "referencedDeclaration": 333, + "src": "1860:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 276, + "id": 396, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1860:8:1", + "referencedDeclaration": 198, + "src": "1860:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 277, + "id": 397, "indexExpression": { "argumentTypes": null, - "id": 275, + "id": 395, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1869:5:1", + "referencedDeclaration": 337, + "src": "1869:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7002,21 +7002,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1860:15:1", + "src": "1860:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 278, + "id": 398, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "1860:20:1", + "referencedDeclaration": 193, + "src": "1860:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7026,31 +7026,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 279, + "id": 399, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1883:5:1", + "referencedDeclaration": 335, + "src": "1883:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1860:28:1", + "src": "1860:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 281, + "id": 401, "nodeType": "ExpressionStatement", - "src": "1860:28:1" + "src": "1860:28:3" }, { "expression": { "argumentTypes": null, - "id": 289, + "id": 409, "isConstant": false, "isLValue": false, "isPure": false, @@ -7063,40 +7063,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 282, + "id": 402, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1894:4:1", + "referencedDeclaration": 333, + "src": "1894:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 285, + "id": 405, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1894:8:1", + "referencedDeclaration": 198, + "src": "1894:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 286, + "id": 406, "indexExpression": { "argumentTypes": null, - "id": 284, + "id": 404, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1903:5:1", + "referencedDeclaration": 337, + "src": "1903:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7107,21 +7107,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1894:15:1", + "src": "1894:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 287, + "id": 407, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "1894:20:1", + "referencedDeclaration": 191, + "src": "1894:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7131,31 +7131,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 288, + "id": 408, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1917:5:1", + "referencedDeclaration": 339, + "src": "1917:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1894:28:1", + "src": "1894:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 290, + "id": 410, "nodeType": "ExpressionStatement", - "src": "1894:28:1" + "src": "1894:28:3" }, { "expression": { "argumentTypes": null, - "id": 298, + "id": 418, "isConstant": false, "isLValue": false, "isPure": false, @@ -7168,40 +7168,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 291, + "id": 411, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1929:4:1", + "referencedDeclaration": 333, + "src": "1929:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 294, + "id": 414, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1929:8:1", + "referencedDeclaration": 198, + "src": "1929:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 295, + "id": 415, "indexExpression": { "argumentTypes": null, - "id": 293, + "id": 413, "name": "_prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 215, - "src": "1938:5:1", + "referencedDeclaration": 335, + "src": "1938:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7212,21 +7212,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1929:15:1", + "src": "1929:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 296, + "id": 416, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "1929:20:1", + "referencedDeclaration": 191, + "src": "1929:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7236,31 +7236,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 297, + "id": 417, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1952:5:1", + "referencedDeclaration": 337, + "src": "1952:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1929:28:1", + "src": "1929:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 299, + "id": 419, "nodeType": "ExpressionStatement", - "src": "1929:28:1" + "src": "1929:28:3" }, { "expression": { "argumentTypes": null, - "id": 307, + "id": 427, "isConstant": false, "isLValue": false, "isPure": false, @@ -7273,40 +7273,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 300, + "id": 420, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 213, - "src": "1963:4:1", + "referencedDeclaration": 333, + "src": "1963:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 303, + "id": 423, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "1963:8:1", + "referencedDeclaration": 198, + "src": "1963:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 304, + "id": 424, "indexExpression": { "argumentTypes": null, - "id": 302, + "id": 422, "name": "_next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 219, - "src": "1972:5:1", + "referencedDeclaration": 339, + "src": "1972:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7317,21 +7317,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1963:15:1", + "src": "1963:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 305, + "id": 425, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "1963:20:1", + "referencedDeclaration": 193, + "src": "1963:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7341,31 +7341,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 306, + "id": 426, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 217, - "src": "1986:5:1", + "referencedDeclaration": 337, + "src": "1986:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1963:28:1", + "src": "1963:28:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 308, + "id": 428, "nodeType": "ExpressionStatement", - "src": "1963:28:1" + "src": "1963:28:3" } ] }, "documentation": "@dev Inserts a new node between _prev and _next. When inserting a node already existing in\nthe list it will be automatically removed from the old position.\n@param _prev the node which _new will be inserted after\n@param _curr the id of the new node being inserted\n@param _next the node which _new will be inserted before", - "id": 310, + "id": 430, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -7373,31 +7373,31 @@ "name": "insert", "nodeType": "FunctionDefinition", "parameters": { - "id": 220, + "id": 340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 213, + "id": 333, "name": "self", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1500:17:1", + "scope": 430, + "src": "1500:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 212, + "id": 332, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1500:4:1", + "referencedDeclaration": 199, + "src": "1500:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -7406,11 +7406,11 @@ }, { "constant": false, - "id": 215, + "id": 335, "name": "_prev", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1523:10:1", + "scope": 430, + "src": "1523:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7418,10 +7418,10 @@ "typeString": "uint256" }, "typeName": { - "id": 214, + "id": 334, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1523:4:1", + "src": "1523:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7432,11 +7432,11 @@ }, { "constant": false, - "id": 217, + "id": 337, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1539:10:1", + "scope": 430, + "src": "1539:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7444,10 +7444,10 @@ "typeString": "uint256" }, "typeName": { - "id": 216, + "id": 336, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1539:4:1", + "src": "1539:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7458,11 +7458,11 @@ }, { "constant": false, - "id": 219, + "id": 339, "name": "_next", "nodeType": "VariableDeclaration", - "scope": 310, - "src": "1555:10:1", + "scope": 430, + "src": "1555:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7470,10 +7470,10 @@ "typeString": "uint256" }, "typeName": { - "id": 218, + "id": 338, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1555:4:1", + "src": "1555:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7483,31 +7483,31 @@ "visibility": "internal" } ], - "src": "1494:75:1" + "src": "1494:75:3" }, "payable": false, "returnParameters": { - "id": 221, + "id": 341, "nodeType": "ParameterList", "parameters": [], - "src": "1579:0:1" + "src": "1579:0:3" }, - "scope": 365, - "src": "1479:517:1", + "scope": 485, + "src": "1479:517:3", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 363, + "id": 483, "nodeType": "Block", - "src": "2054:230:1", + "src": "2054:230:3", "statements": [ { "condition": { "argumentTypes": null, - "id": 321, + "id": 441, "isConstant": false, "isLValue": false, "isPure": false, @@ -7515,31 +7515,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2064:22:1", + "src": "2064:22:3", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 318, + "id": 438, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2074:4:1", + "referencedDeclaration": 432, + "src": "2074:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 319, + "id": 439, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2080:5:1", + "referencedDeclaration": 434, + "src": "2080:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7549,7 +7549,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -7557,18 +7557,18 @@ "typeString": "uint256" } ], - "id": 317, + "id": 437, "name": "contains", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 153, - "src": "2065:8:1", + "referencedDeclaration": 273, + "src": "2065:8:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 320, + "id": 440, "isConstant": false, "isLValue": false, "isPure": false, @@ -7576,7 +7576,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2065:21:1", + "src": "2065:21:3", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7588,36 +7588,36 @@ } }, "falseBody": null, - "id": 324, + "id": 444, "nodeType": "IfStatement", - "src": "2060:49:1", + "src": "2060:49:3", "trueBody": { - "id": 323, + "id": 443, "nodeType": "Block", - "src": "2088:21:1", + "src": "2088:21:3", "statements": [ { "expression": null, - "functionReturnParameters": 316, - "id": 322, + "functionReturnParameters": 436, + "id": 442, "nodeType": "Return", - "src": "2096:7:1" + "src": "2096:7:3" } ] } }, { "assignments": [ - 326 + 446 ], "declarations": [ { "constant": false, - "id": 326, + "id": 446, "name": "next", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2115:9:1", + "scope": 484, + "src": "2115:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7625,10 +7625,10 @@ "typeString": "uint256" }, "typeName": { - "id": 325, + "id": 445, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2115:4:1", + "src": "2115:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7638,31 +7638,31 @@ "visibility": "internal" } ], - "id": 331, + "id": 451, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 328, + "id": 448, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2135:4:1", + "referencedDeclaration": 432, + "src": "2135:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 329, + "id": 449, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2141:5:1", + "referencedDeclaration": 434, + "src": "2141:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7672,7 +7672,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -7680,18 +7680,18 @@ "typeString": "uint256" } ], - "id": 327, + "id": 447, "name": "getNext", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "2127:7:1", + "referencedDeclaration": 289, + "src": "2127:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 330, + "id": 450, "isConstant": false, "isLValue": false, "isPure": false, @@ -7699,27 +7699,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2127:20:1", + "src": "2127:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2115:32:1" + "src": "2115:32:3" }, { "assignments": [ - 333 + 453 ], "declarations": [ { "constant": false, - "id": 333, + "id": 453, "name": "prev", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2153:9:1", + "scope": 484, + "src": "2153:9:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7727,10 +7727,10 @@ "typeString": "uint256" }, "typeName": { - "id": 332, + "id": 452, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2153:4:1", + "src": "2153:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7740,31 +7740,31 @@ "visibility": "internal" } ], - "id": 338, + "id": 458, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 335, + "id": 455, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2173:4:1", + "referencedDeclaration": 432, + "src": "2173:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, { "argumentTypes": null, - "id": 336, + "id": 456, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2179:5:1", + "referencedDeclaration": 434, + "src": "2179:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7774,7 +7774,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" }, { @@ -7782,18 +7782,18 @@ "typeString": "uint256" } ], - "id": 334, + "id": 454, "name": "getPrev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 185, - "src": "2165:7:1", + "referencedDeclaration": 305, + "src": "2165:7:3", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$", + "typeIdentifier": "t_function_internal_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 337, + "id": 457, "isConstant": false, "isLValue": false, "isPure": false, @@ -7801,19 +7801,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2165:20:1", + "src": "2165:20:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2153:32:1" + "src": "2153:32:3" }, { "expression": { "argumentTypes": null, - "id": 346, + "id": 466, "isConstant": false, "isLValue": false, "isPure": false, @@ -7826,40 +7826,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 339, + "id": 459, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2192:4:1", + "referencedDeclaration": 432, + "src": "2192:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 342, + "id": 462, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2192:8:1", + "referencedDeclaration": 198, + "src": "2192:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 343, + "id": 463, "indexExpression": { "argumentTypes": null, - "id": 341, + "id": 461, "name": "next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 326, - "src": "2201:4:1", + "referencedDeclaration": 446, + "src": "2201:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7870,21 +7870,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2192:14:1", + "src": "2192:14:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 344, + "id": 464, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "prev", "nodeType": "MemberAccess", - "referencedDeclaration": 73, - "src": "2192:19:1", + "referencedDeclaration": 193, + "src": "2192:19:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7894,31 +7894,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 345, + "id": 465, "name": "prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 333, - "src": "2214:4:1", + "referencedDeclaration": 453, + "src": "2214:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2192:26:1", + "src": "2192:26:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 347, + "id": 467, "nodeType": "ExpressionStatement", - "src": "2192:26:1" + "src": "2192:26:3" }, { "expression": { "argumentTypes": null, - "id": 355, + "id": 475, "isConstant": false, "isLValue": false, "isPure": false, @@ -7931,40 +7931,40 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 348, + "id": 468, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2224:4:1", + "referencedDeclaration": 432, + "src": "2224:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 351, + "id": 471, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2224:8:1", + "referencedDeclaration": 198, + "src": "2224:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 352, + "id": 472, "indexExpression": { "argumentTypes": null, - "id": 350, + "id": 470, "name": "prev", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 333, - "src": "2233:4:1", + "referencedDeclaration": 453, + "src": "2233:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7975,21 +7975,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2224:14:1", + "src": "2224:14:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, - "id": 353, + "id": 473, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "next", "nodeType": "MemberAccess", - "referencedDeclaration": 71, - "src": "2224:19:1", + "referencedDeclaration": 191, + "src": "2224:19:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7999,31 +7999,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 354, + "id": 474, "name": "next", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 326, - "src": "2246:4:1", + "referencedDeclaration": 446, + "src": "2246:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2224:26:1", + "src": "2224:26:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 356, + "id": 476, "nodeType": "ExpressionStatement", - "src": "2224:26:1" + "src": "2224:26:3" }, { "expression": { "argumentTypes": null, - "id": 361, + "id": 481, "isConstant": false, "isLValue": false, "isPure": false, @@ -8031,47 +8031,47 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "2257:22:1", + "src": "2257:22:3", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 357, + "id": 477, "name": "self", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "2264:4:1", + "referencedDeclaration": 432, + "src": "2264:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data storage pointer" } }, - "id": 358, + "id": 478, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "dll", "nodeType": "MemberAccess", - "referencedDeclaration": 78, - "src": "2264:8:1", + "referencedDeclaration": 198, + "src": "2264:8:3", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$74_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Node_$194_storage_$", "typeString": "mapping(uint256 => struct DLL.Node storage ref)" } }, - "id": 360, + "id": 480, "indexExpression": { "argumentTypes": null, - "id": 359, + "id": 479, "name": "_curr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 314, - "src": "2273:5:1", + "referencedDeclaration": 434, + "src": "2273:5:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8082,9 +8082,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2264:15:1", + "src": "2264:15:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Node_$74_storage", + "typeIdentifier": "t_struct$_Node_$194_storage", "typeString": "struct DLL.Node storage ref" } }, @@ -8093,14 +8093,14 @@ "typeString": "tuple()" } }, - "id": 362, + "id": 482, "nodeType": "ExpressionStatement", - "src": "2257:22:1" + "src": "2257:22:3" } ] }, "documentation": null, - "id": 364, + "id": 484, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -8108,31 +8108,31 @@ "name": "remove", "nodeType": "FunctionDefinition", "parameters": { - "id": 315, + "id": 435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 312, + "id": 432, "name": "self", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2016:17:1", + "scope": 484, + "src": "2016:17:3", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" }, "typeName": { "contractScope": null, - "id": 311, + "id": 431, "name": "Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "2016:4:1", + "referencedDeclaration": 199, + "src": "2016:4:3", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } }, @@ -8141,11 +8141,11 @@ }, { "constant": false, - "id": 314, + "id": 434, "name": "_curr", "nodeType": "VariableDeclaration", - "scope": 364, - "src": "2035:10:1", + "scope": 484, + "src": "2035:10:3", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8153,10 +8153,10 @@ "typeString": "uint256" }, "typeName": { - "id": 313, + "id": 433, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2035:4:1", + "src": "2035:4:3", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8166,27 +8166,27 @@ "visibility": "internal" } ], - "src": "2015:31:1" + "src": "2015:31:3" }, "payable": false, "returnParameters": { - "id": 316, + "id": 436, "nodeType": "ParameterList", "parameters": [], - "src": "2054:0:1" + "src": "2054:0:3" }, - "scope": 365, - "src": "2000:284:1", + "scope": 485, + "src": "2000:284:3", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 366, - "src": "26:2260:1" + "scope": 486, + "src": "26:2260:3" } ], - "src": "0:2287:1" + "src": "0:2287:3" }, "compiler": { "name": "solc", @@ -8194,5 +8194,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.348Z" + "updatedAt": "2018-06-26T02:58:22.317Z" } \ No newline at end of file diff --git a/build/contracts/ERC20.json b/build/contracts/ERC20.json index a784115..bf5446b 100644 --- a/build/contracts/ERC20.json +++ b/build/contracts/ERC20.json @@ -180,35 +180,35 @@ "sourceMap": "", "deployedSourceMap": "", "source": "pragma solidity 0.4.24;\n\nimport \"./ERC20Basic.sol\";\n\n\n/**\n * @title ERC20 interface\n * @dev see https://github.com/ethereum/EIPs/issues/20\n */\ncontract ERC20 is ERC20Basic {\n function allowance(address owner, address spender)\n public view returns (uint256);\n\n function transferFrom(address from, address to, uint256 value)\n public returns (bool);\n\n function approve(address spender, uint256 value) public returns (bool);\n event Approval(\n address indexed owner,\n address indexed spender,\n uint256 value\n );\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "sourcePath": "/home/bharath/computable/contracts/ERC20.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "exportedSymbols": { "ERC20": [ - 408 + 528 ] }, - "id": 409, + "id": 529, "nodeType": "SourceUnit", "nodes": [ { - "id": 367, + "id": 487, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:2" + "src": "0:23:4" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "file": "./ERC20Basic.sol", - "id": 368, + "id": 488, "nodeType": "ImportDirective", - "scope": 409, - "sourceUnit": 441, - "src": "25:26:2", + "scope": 529, + "sourceUnit": 561, + "src": "25:26:4", "symbolAliases": [], "unitAlias": "" }, @@ -218,31 +218,31 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 369, + "id": 489, "name": "ERC20Basic", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 440, - "src": "161:10:2", + "referencedDeclaration": 560, + "src": "161:10:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20Basic_$440", + "typeIdentifier": "t_contract$_ERC20Basic_$560", "typeString": "contract ERC20Basic" } }, - "id": 370, + "id": 490, "nodeType": "InheritanceSpecifier", - "src": "161:10:2" + "src": "161:10:4" } ], "contractDependencies": [ - 440 + 560 ], "contractKind": "contract", "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20", "fullyImplemented": false, - "id": 408, + "id": 528, "linearizedBaseContracts": [ - 408, - 440 + 528, + 560 ], "name": "ERC20", "nodeType": "ContractDefinition", @@ -250,7 +250,7 @@ { "body": null, "documentation": null, - "id": 379, + "id": 499, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -258,16 +258,16 @@ "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 375, + "id": 495, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 372, + "id": 492, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "195:13:2", + "scope": 499, + "src": "195:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -275,10 +275,10 @@ "typeString": "address" }, "typeName": { - "id": 371, + "id": 491, "name": "address", "nodeType": "ElementaryTypeName", - "src": "195:7:2", + "src": "195:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -289,11 +289,11 @@ }, { "constant": false, - "id": 374, + "id": 494, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "210:15:2", + "scope": 499, + "src": "210:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -301,10 +301,10 @@ "typeString": "address" }, "typeName": { - "id": 373, + "id": 493, "name": "address", "nodeType": "ElementaryTypeName", - "src": "210:7:2", + "src": "210:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -314,20 +314,20 @@ "visibility": "internal" } ], - "src": "194:32:2" + "src": "194:32:4" }, "payable": false, "returnParameters": { - "id": 378, + "id": 498, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 377, + "id": 497, "name": "", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "252:7:2", + "scope": 499, + "src": "252:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -335,10 +335,10 @@ "typeString": "uint256" }, "typeName": { - "id": 376, + "id": 496, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "252:7:2", + "src": "252:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -348,10 +348,10 @@ "visibility": "internal" } ], - "src": "251:9:2" + "src": "251:9:4" }, - "scope": 408, - "src": "176:85:2", + "scope": 528, + "src": "176:85:4", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -359,7 +359,7 @@ { "body": null, "documentation": null, - "id": 390, + "id": 510, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -367,16 +367,16 @@ "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 386, + "id": 506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 381, + "id": 501, "name": "from", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "287:12:2", + "scope": 510, + "src": "287:12:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -384,10 +384,10 @@ "typeString": "address" }, "typeName": { - "id": 380, + "id": 500, "name": "address", "nodeType": "ElementaryTypeName", - "src": "287:7:2", + "src": "287:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -398,11 +398,11 @@ }, { "constant": false, - "id": 383, + "id": 503, "name": "to", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "301:10:2", + "scope": 510, + "src": "301:10:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -410,10 +410,10 @@ "typeString": "address" }, "typeName": { - "id": 382, + "id": 502, "name": "address", "nodeType": "ElementaryTypeName", - "src": "301:7:2", + "src": "301:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -424,11 +424,11 @@ }, { "constant": false, - "id": 385, + "id": 505, "name": "value", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "313:13:2", + "scope": 510, + "src": "313:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -436,10 +436,10 @@ "typeString": "uint256" }, "typeName": { - "id": 384, + "id": 504, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "313:7:2", + "src": "313:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -449,20 +449,20 @@ "visibility": "internal" } ], - "src": "286:41:2" + "src": "286:41:4" }, "payable": false, "returnParameters": { - "id": 389, + "id": 509, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 388, + "id": 508, "name": "", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "348:4:2", + "scope": 510, + "src": "348:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -470,10 +470,10 @@ "typeString": "bool" }, "typeName": { - "id": 387, + "id": 507, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "348:4:2", + "src": "348:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -483,10 +483,10 @@ "visibility": "internal" } ], - "src": "347:6:2" + "src": "347:6:4" }, - "scope": 408, - "src": "265:89:2", + "scope": 528, + "src": "265:89:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -494,7 +494,7 @@ { "body": null, "documentation": null, - "id": 399, + "id": 519, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -502,16 +502,16 @@ "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 395, + "id": 515, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 392, + "id": 512, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "375:15:2", + "scope": 519, + "src": "375:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -519,10 +519,10 @@ "typeString": "address" }, "typeName": { - "id": 391, + "id": 511, "name": "address", "nodeType": "ElementaryTypeName", - "src": "375:7:2", + "src": "375:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -533,11 +533,11 @@ }, { "constant": false, - "id": 394, + "id": 514, "name": "value", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "392:13:2", + "scope": 519, + "src": "392:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -545,10 +545,10 @@ "typeString": "uint256" }, "typeName": { - "id": 393, + "id": 513, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "392:7:2", + "src": "392:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -558,20 +558,20 @@ "visibility": "internal" } ], - "src": "374:32:2" + "src": "374:32:4" }, "payable": false, "returnParameters": { - "id": 398, + "id": 518, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 397, + "id": 517, "name": "", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "423:4:2", + "scope": 519, + "src": "423:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -579,10 +579,10 @@ "typeString": "bool" }, "typeName": { - "id": 396, + "id": 516, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "423:4:2", + "src": "423:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -592,10 +592,10 @@ "visibility": "internal" } ], - "src": "422:6:2" + "src": "422:6:4" }, - "scope": 408, - "src": "358:71:2", + "scope": 528, + "src": "358:71:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -603,21 +603,21 @@ { "anonymous": false, "documentation": null, - "id": 407, + "id": 527, "name": "Approval", "nodeType": "EventDefinition", "parameters": { - "id": 406, + "id": 526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 401, + "id": 521, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "452:21:2", + "scope": 527, + "src": "452:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -625,10 +625,10 @@ "typeString": "address" }, "typeName": { - "id": 400, + "id": 520, "name": "address", "nodeType": "ElementaryTypeName", - "src": "452:7:2", + "src": "452:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -639,12 +639,12 @@ }, { "constant": false, - "id": 403, + "id": 523, "indexed": true, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "479:23:2", + "scope": 527, + "src": "479:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -652,10 +652,10 @@ "typeString": "address" }, "typeName": { - "id": 402, + "id": 522, "name": "address", "nodeType": "ElementaryTypeName", - "src": "479:7:2", + "src": "479:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -666,12 +666,12 @@ }, { "constant": false, - "id": 405, + "id": 525, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "508:13:2", + "scope": 527, + "src": "508:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -679,10 +679,10 @@ "typeString": "uint256" }, "typeName": { - "id": 404, + "id": 524, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "508:7:2", + "src": "508:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -692,45 +692,45 @@ "visibility": "internal" } ], - "src": "446:79:2" + "src": "446:79:4" }, - "src": "432:94:2" + "src": "432:94:4" } ], - "scope": 409, - "src": "143:385:2" + "scope": 529, + "src": "143:385:4" } ], - "src": "0:529:2" + "src": "0:529:4" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "exportedSymbols": { "ERC20": [ - 408 + 528 ] }, - "id": 409, + "id": 529, "nodeType": "SourceUnit", "nodes": [ { - "id": 367, + "id": 487, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:2" + "src": "0:23:4" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "file": "./ERC20Basic.sol", - "id": 368, + "id": 488, "nodeType": "ImportDirective", - "scope": 409, - "sourceUnit": 441, - "src": "25:26:2", + "scope": 529, + "sourceUnit": 561, + "src": "25:26:4", "symbolAliases": [], "unitAlias": "" }, @@ -740,31 +740,31 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 369, + "id": 489, "name": "ERC20Basic", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 440, - "src": "161:10:2", + "referencedDeclaration": 560, + "src": "161:10:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20Basic_$440", + "typeIdentifier": "t_contract$_ERC20Basic_$560", "typeString": "contract ERC20Basic" } }, - "id": 370, + "id": 490, "nodeType": "InheritanceSpecifier", - "src": "161:10:2" + "src": "161:10:4" } ], "contractDependencies": [ - 440 + 560 ], "contractKind": "contract", "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20", "fullyImplemented": false, - "id": 408, + "id": 528, "linearizedBaseContracts": [ - 408, - 440 + 528, + 560 ], "name": "ERC20", "nodeType": "ContractDefinition", @@ -772,7 +772,7 @@ { "body": null, "documentation": null, - "id": 379, + "id": 499, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -780,16 +780,16 @@ "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 375, + "id": 495, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 372, + "id": 492, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "195:13:2", + "scope": 499, + "src": "195:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -797,10 +797,10 @@ "typeString": "address" }, "typeName": { - "id": 371, + "id": 491, "name": "address", "nodeType": "ElementaryTypeName", - "src": "195:7:2", + "src": "195:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -811,11 +811,11 @@ }, { "constant": false, - "id": 374, + "id": 494, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "210:15:2", + "scope": 499, + "src": "210:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -823,10 +823,10 @@ "typeString": "address" }, "typeName": { - "id": 373, + "id": 493, "name": "address", "nodeType": "ElementaryTypeName", - "src": "210:7:2", + "src": "210:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -836,20 +836,20 @@ "visibility": "internal" } ], - "src": "194:32:2" + "src": "194:32:4" }, "payable": false, "returnParameters": { - "id": 378, + "id": 498, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 377, + "id": 497, "name": "", "nodeType": "VariableDeclaration", - "scope": 379, - "src": "252:7:2", + "scope": 499, + "src": "252:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -857,10 +857,10 @@ "typeString": "uint256" }, "typeName": { - "id": 376, + "id": 496, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "252:7:2", + "src": "252:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -870,10 +870,10 @@ "visibility": "internal" } ], - "src": "251:9:2" + "src": "251:9:4" }, - "scope": 408, - "src": "176:85:2", + "scope": 528, + "src": "176:85:4", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -881,7 +881,7 @@ { "body": null, "documentation": null, - "id": 390, + "id": 510, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -889,16 +889,16 @@ "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 386, + "id": 506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 381, + "id": 501, "name": "from", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "287:12:2", + "scope": 510, + "src": "287:12:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -906,10 +906,10 @@ "typeString": "address" }, "typeName": { - "id": 380, + "id": 500, "name": "address", "nodeType": "ElementaryTypeName", - "src": "287:7:2", + "src": "287:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -920,11 +920,11 @@ }, { "constant": false, - "id": 383, + "id": 503, "name": "to", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "301:10:2", + "scope": 510, + "src": "301:10:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -932,10 +932,10 @@ "typeString": "address" }, "typeName": { - "id": 382, + "id": 502, "name": "address", "nodeType": "ElementaryTypeName", - "src": "301:7:2", + "src": "301:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -946,11 +946,11 @@ }, { "constant": false, - "id": 385, + "id": 505, "name": "value", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "313:13:2", + "scope": 510, + "src": "313:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -958,10 +958,10 @@ "typeString": "uint256" }, "typeName": { - "id": 384, + "id": 504, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "313:7:2", + "src": "313:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -971,20 +971,20 @@ "visibility": "internal" } ], - "src": "286:41:2" + "src": "286:41:4" }, "payable": false, "returnParameters": { - "id": 389, + "id": 509, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 388, + "id": 508, "name": "", "nodeType": "VariableDeclaration", - "scope": 390, - "src": "348:4:2", + "scope": 510, + "src": "348:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -992,10 +992,10 @@ "typeString": "bool" }, "typeName": { - "id": 387, + "id": 507, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "348:4:2", + "src": "348:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1005,10 +1005,10 @@ "visibility": "internal" } ], - "src": "347:6:2" + "src": "347:6:4" }, - "scope": 408, - "src": "265:89:2", + "scope": 528, + "src": "265:89:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1016,7 +1016,7 @@ { "body": null, "documentation": null, - "id": 399, + "id": 519, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -1024,16 +1024,16 @@ "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 395, + "id": 515, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 392, + "id": 512, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "375:15:2", + "scope": 519, + "src": "375:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1041,10 +1041,10 @@ "typeString": "address" }, "typeName": { - "id": 391, + "id": 511, "name": "address", "nodeType": "ElementaryTypeName", - "src": "375:7:2", + "src": "375:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1055,11 +1055,11 @@ }, { "constant": false, - "id": 394, + "id": 514, "name": "value", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "392:13:2", + "scope": 519, + "src": "392:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1067,10 +1067,10 @@ "typeString": "uint256" }, "typeName": { - "id": 393, + "id": 513, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "392:7:2", + "src": "392:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1080,20 +1080,20 @@ "visibility": "internal" } ], - "src": "374:32:2" + "src": "374:32:4" }, "payable": false, "returnParameters": { - "id": 398, + "id": 518, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 397, + "id": 517, "name": "", "nodeType": "VariableDeclaration", - "scope": 399, - "src": "423:4:2", + "scope": 519, + "src": "423:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1101,10 +1101,10 @@ "typeString": "bool" }, "typeName": { - "id": 396, + "id": 516, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "423:4:2", + "src": "423:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1114,10 +1114,10 @@ "visibility": "internal" } ], - "src": "422:6:2" + "src": "422:6:4" }, - "scope": 408, - "src": "358:71:2", + "scope": 528, + "src": "358:71:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1125,21 +1125,21 @@ { "anonymous": false, "documentation": null, - "id": 407, + "id": 527, "name": "Approval", "nodeType": "EventDefinition", "parameters": { - "id": 406, + "id": 526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 401, + "id": 521, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "452:21:2", + "scope": 527, + "src": "452:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1147,10 +1147,10 @@ "typeString": "address" }, "typeName": { - "id": 400, + "id": 520, "name": "address", "nodeType": "ElementaryTypeName", - "src": "452:7:2", + "src": "452:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1161,12 +1161,12 @@ }, { "constant": false, - "id": 403, + "id": 523, "indexed": true, "name": "spender", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "479:23:2", + "scope": 527, + "src": "479:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1174,10 +1174,10 @@ "typeString": "address" }, "typeName": { - "id": 402, + "id": 522, "name": "address", "nodeType": "ElementaryTypeName", - "src": "479:7:2", + "src": "479:7:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1188,12 +1188,12 @@ }, { "constant": false, - "id": 405, + "id": 525, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 407, - "src": "508:13:2", + "scope": 527, + "src": "508:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1201,10 +1201,10 @@ "typeString": "uint256" }, "typeName": { - "id": 404, + "id": 524, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "508:7:2", + "src": "508:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1214,16 +1214,16 @@ "visibility": "internal" } ], - "src": "446:79:2" + "src": "446:79:4" }, - "src": "432:94:2" + "src": "432:94:4" } ], - "scope": 409, - "src": "143:385:2" + "scope": 529, + "src": "143:385:4" } ], - "src": "0:529:2" + "src": "0:529:4" }, "compiler": { "name": "solc", @@ -1231,5 +1231,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.346Z" + "updatedAt": "2018-06-26T02:58:22.315Z" } \ No newline at end of file diff --git a/build/contracts/ERC20Basic.json b/build/contracts/ERC20Basic.json index 377d0df..d31b574 100644 --- a/build/contracts/ERC20Basic.json +++ b/build/contracts/ERC20Basic.json @@ -85,26 +85,26 @@ "sourceMap": "", "deployedSourceMap": "", "source": "pragma solidity 0.4.24;\n\n\n/**\n * @title ERC20Basic\n * @dev Simpler version of ERC20 interface\n * See https://github.com/ethereum/EIPs/issues/179\n */\ncontract ERC20Basic {\n function totalSupply() public view returns (uint256);\n function balanceOf(address who) public view returns (uint256);\n function transfer(address to, uint256 value) public returns (bool);\n event Transfer(address indexed from, address indexed to, uint256 value);\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "sourcePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "exportedSymbols": { "ERC20Basic": [ - 440 + 560 ] }, - "id": 441, + "id": 561, "nodeType": "SourceUnit", "nodes": [ { - "id": 410, + "id": 530, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:3" + "src": "0:23:5" }, { "baseContracts": [], @@ -112,9 +112,9 @@ "contractKind": "contract", "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179", "fullyImplemented": false, - "id": 440, + "id": 560, "linearizedBaseContracts": [ - 440 + 560 ], "name": "ERC20Basic", "nodeType": "ContractDefinition", @@ -122,7 +122,7 @@ { "body": null, "documentation": null, - "id": 415, + "id": 535, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -130,23 +130,23 @@ "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 411, + "id": 531, "nodeType": "ParameterList", "parameters": [], - "src": "193:2:3" + "src": "193:2:5" }, "payable": false, "returnParameters": { - "id": 414, + "id": 534, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 413, + "id": 533, "name": "", "nodeType": "VariableDeclaration", - "scope": 415, - "src": "217:7:3", + "scope": 535, + "src": "217:7:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -154,10 +154,10 @@ "typeString": "uint256" }, "typeName": { - "id": 412, + "id": 532, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "217:7:3", + "src": "217:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -167,10 +167,10 @@ "visibility": "internal" } ], - "src": "216:9:3" + "src": "216:9:5" }, - "scope": 440, - "src": "173:53:3", + "scope": 560, + "src": "173:53:5", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -178,7 +178,7 @@ { "body": null, "documentation": null, - "id": 422, + "id": 542, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -186,16 +186,16 @@ "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 418, + "id": 538, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 417, + "id": 537, "name": "who", "nodeType": "VariableDeclaration", - "scope": 422, - "src": "248:11:3", + "scope": 542, + "src": "248:11:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -203,10 +203,10 @@ "typeString": "address" }, "typeName": { - "id": 416, + "id": 536, "name": "address", "nodeType": "ElementaryTypeName", - "src": "248:7:3", + "src": "248:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -216,20 +216,20 @@ "visibility": "internal" } ], - "src": "247:13:3" + "src": "247:13:5" }, "payable": false, "returnParameters": { - "id": 421, + "id": 541, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 420, + "id": 540, "name": "", "nodeType": "VariableDeclaration", - "scope": 422, - "src": "282:7:3", + "scope": 542, + "src": "282:7:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -237,10 +237,10 @@ "typeString": "uint256" }, "typeName": { - "id": 419, + "id": 539, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "282:7:3", + "src": "282:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -250,10 +250,10 @@ "visibility": "internal" } ], - "src": "281:9:3" + "src": "281:9:5" }, - "scope": 440, - "src": "229:62:3", + "scope": 560, + "src": "229:62:5", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -261,7 +261,7 @@ { "body": null, "documentation": null, - "id": 431, + "id": 551, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -269,16 +269,16 @@ "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 427, + "id": 547, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 424, + "id": 544, "name": "to", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "312:10:3", + "scope": 551, + "src": "312:10:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -286,10 +286,10 @@ "typeString": "address" }, "typeName": { - "id": 423, + "id": 543, "name": "address", "nodeType": "ElementaryTypeName", - "src": "312:7:3", + "src": "312:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -300,11 +300,11 @@ }, { "constant": false, - "id": 426, + "id": 546, "name": "value", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "324:13:3", + "scope": 551, + "src": "324:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -312,10 +312,10 @@ "typeString": "uint256" }, "typeName": { - "id": 425, + "id": 545, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "324:7:3", + "src": "324:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -325,20 +325,20 @@ "visibility": "internal" } ], - "src": "311:27:3" + "src": "311:27:5" }, "payable": false, "returnParameters": { - "id": 430, + "id": 550, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 429, + "id": 549, "name": "", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "355:4:3", + "scope": 551, + "src": "355:4:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -346,10 +346,10 @@ "typeString": "bool" }, "typeName": { - "id": 428, + "id": 548, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "355:4:3", + "src": "355:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -359,10 +359,10 @@ "visibility": "internal" } ], - "src": "354:6:3" + "src": "354:6:5" }, - "scope": 440, - "src": "294:67:3", + "scope": 560, + "src": "294:67:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -370,21 +370,21 @@ { "anonymous": false, "documentation": null, - "id": 439, + "id": 559, "name": "Transfer", "nodeType": "EventDefinition", "parameters": { - "id": 438, + "id": 558, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 433, + "id": 553, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "379:20:3", + "scope": 559, + "src": "379:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -392,10 +392,10 @@ "typeString": "address" }, "typeName": { - "id": 432, + "id": 552, "name": "address", "nodeType": "ElementaryTypeName", - "src": "379:7:3", + "src": "379:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -406,12 +406,12 @@ }, { "constant": false, - "id": 435, + "id": 555, "indexed": true, "name": "to", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "401:18:3", + "scope": 559, + "src": "401:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -419,10 +419,10 @@ "typeString": "address" }, "typeName": { - "id": 434, + "id": 554, "name": "address", "nodeType": "ElementaryTypeName", - "src": "401:7:3", + "src": "401:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -433,12 +433,12 @@ }, { "constant": false, - "id": 437, + "id": 557, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "421:13:3", + "scope": 559, + "src": "421:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -446,10 +446,10 @@ "typeString": "uint256" }, "typeName": { - "id": 436, + "id": 556, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "421:7:3", + "src": "421:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -459,36 +459,36 @@ "visibility": "internal" } ], - "src": "378:57:3" + "src": "378:57:5" }, - "src": "364:72:3" + "src": "364:72:5" } ], - "scope": 441, - "src": "149:289:3" + "scope": 561, + "src": "149:289:5" } ], - "src": "0:439:3" + "src": "0:439:5" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20Basic.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20Basic.sol", "exportedSymbols": { "ERC20Basic": [ - 440 + 560 ] }, - "id": 441, + "id": 561, "nodeType": "SourceUnit", "nodes": [ { - "id": 410, + "id": 530, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:3" + "src": "0:23:5" }, { "baseContracts": [], @@ -496,9 +496,9 @@ "contractKind": "contract", "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179", "fullyImplemented": false, - "id": 440, + "id": 560, "linearizedBaseContracts": [ - 440 + 560 ], "name": "ERC20Basic", "nodeType": "ContractDefinition", @@ -506,7 +506,7 @@ { "body": null, "documentation": null, - "id": 415, + "id": 535, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -514,23 +514,23 @@ "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 411, + "id": 531, "nodeType": "ParameterList", "parameters": [], - "src": "193:2:3" + "src": "193:2:5" }, "payable": false, "returnParameters": { - "id": 414, + "id": 534, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 413, + "id": 533, "name": "", "nodeType": "VariableDeclaration", - "scope": 415, - "src": "217:7:3", + "scope": 535, + "src": "217:7:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -538,10 +538,10 @@ "typeString": "uint256" }, "typeName": { - "id": 412, + "id": 532, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "217:7:3", + "src": "217:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -551,10 +551,10 @@ "visibility": "internal" } ], - "src": "216:9:3" + "src": "216:9:5" }, - "scope": 440, - "src": "173:53:3", + "scope": 560, + "src": "173:53:5", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -562,7 +562,7 @@ { "body": null, "documentation": null, - "id": 422, + "id": 542, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -570,16 +570,16 @@ "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 418, + "id": 538, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 417, + "id": 537, "name": "who", "nodeType": "VariableDeclaration", - "scope": 422, - "src": "248:11:3", + "scope": 542, + "src": "248:11:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -587,10 +587,10 @@ "typeString": "address" }, "typeName": { - "id": 416, + "id": 536, "name": "address", "nodeType": "ElementaryTypeName", - "src": "248:7:3", + "src": "248:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -600,20 +600,20 @@ "visibility": "internal" } ], - "src": "247:13:3" + "src": "247:13:5" }, "payable": false, "returnParameters": { - "id": 421, + "id": 541, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 420, + "id": 540, "name": "", "nodeType": "VariableDeclaration", - "scope": 422, - "src": "282:7:3", + "scope": 542, + "src": "282:7:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -621,10 +621,10 @@ "typeString": "uint256" }, "typeName": { - "id": 419, + "id": 539, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "282:7:3", + "src": "282:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -634,10 +634,10 @@ "visibility": "internal" } ], - "src": "281:9:3" + "src": "281:9:5" }, - "scope": 440, - "src": "229:62:3", + "scope": 560, + "src": "229:62:5", "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -645,7 +645,7 @@ { "body": null, "documentation": null, - "id": 431, + "id": 551, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -653,16 +653,16 @@ "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 427, + "id": 547, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 424, + "id": 544, "name": "to", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "312:10:3", + "scope": 551, + "src": "312:10:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -670,10 +670,10 @@ "typeString": "address" }, "typeName": { - "id": 423, + "id": 543, "name": "address", "nodeType": "ElementaryTypeName", - "src": "312:7:3", + "src": "312:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -684,11 +684,11 @@ }, { "constant": false, - "id": 426, + "id": 546, "name": "value", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "324:13:3", + "scope": 551, + "src": "324:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -696,10 +696,10 @@ "typeString": "uint256" }, "typeName": { - "id": 425, + "id": 545, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "324:7:3", + "src": "324:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -709,20 +709,20 @@ "visibility": "internal" } ], - "src": "311:27:3" + "src": "311:27:5" }, "payable": false, "returnParameters": { - "id": 430, + "id": 550, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 429, + "id": 549, "name": "", "nodeType": "VariableDeclaration", - "scope": 431, - "src": "355:4:3", + "scope": 551, + "src": "355:4:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -730,10 +730,10 @@ "typeString": "bool" }, "typeName": { - "id": 428, + "id": 548, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "355:4:3", + "src": "355:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -743,10 +743,10 @@ "visibility": "internal" } ], - "src": "354:6:3" + "src": "354:6:5" }, - "scope": 440, - "src": "294:67:3", + "scope": 560, + "src": "294:67:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -754,21 +754,21 @@ { "anonymous": false, "documentation": null, - "id": 439, + "id": 559, "name": "Transfer", "nodeType": "EventDefinition", "parameters": { - "id": 438, + "id": 558, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 433, + "id": 553, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "379:20:3", + "scope": 559, + "src": "379:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -776,10 +776,10 @@ "typeString": "address" }, "typeName": { - "id": 432, + "id": 552, "name": "address", "nodeType": "ElementaryTypeName", - "src": "379:7:3", + "src": "379:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -790,12 +790,12 @@ }, { "constant": false, - "id": 435, + "id": 555, "indexed": true, "name": "to", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "401:18:3", + "scope": 559, + "src": "401:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -803,10 +803,10 @@ "typeString": "address" }, "typeName": { - "id": 434, + "id": 554, "name": "address", "nodeType": "ElementaryTypeName", - "src": "401:7:3", + "src": "401:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -817,12 +817,12 @@ }, { "constant": false, - "id": 437, + "id": 557, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 439, - "src": "421:13:3", + "scope": 559, + "src": "421:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -830,10 +830,10 @@ "typeString": "uint256" }, "typeName": { - "id": 436, + "id": 556, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "421:7:3", + "src": "421:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -843,16 +843,16 @@ "visibility": "internal" } ], - "src": "378:57:3" + "src": "378:57:5" }, - "src": "364:72:3" + "src": "364:72:5" } ], - "scope": 441, - "src": "149:289:3" + "scope": 561, + "src": "149:289:5" } ], - "src": "0:439:3" + "src": "0:439:5" }, "compiler": { "name": "solc", @@ -860,5 +860,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.347Z" + "updatedAt": "2018-06-26T02:58:22.315Z" } \ No newline at end of file diff --git a/build/contracts/PLCRVoting.json b/build/contracts/PLCRVoting.json index 4068e39..c52297d 100644 --- a/build/contracts/PLCRVoting.json +++ b/build/contracts/PLCRVoting.json @@ -739,73 +739,73 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b506040516020806129508339810180604052810190808051906020019092919050505080600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008081905550506128c58061008b6000396000f30060806040526004361061016a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063053e71a61461016f5780632173a10f146101b05780632c052031146101db57806332ed3d60146102465780633b9302941461029b578063427fa1d2146102f2578063441c77c014610349578063494031831461038e5780636148fed5146103d35780636b2d95d4146104305780636cbf9c5e146104875780637f97e836146104d6578063819b02931461053b57806388d21ff3146105b457806397508f36146105f95780639760356014610624578063a1103f3714610651578063a25236fe146106ba578063a4439dc5146106e7578063aa7ca4641461072c578063b11d8bb814610791578063b43bd069146107d2578063d13820921461083d578063d901402b1461089e578063d9548e5314610907578063e7b1d43c1461094c578063ee68483014610979578063fc0c546a146109be575b600080fd5b34801561017b57600080fd5b5061019a60048036038101908080359060200190929190505050610a15565b6040518082815260200191505060405180910390f35b3480156101bc57600080fd5b506101c5610a76565b6040518082815260200191505060405180910390f35b3480156101e757600080fd5b50610230600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050610a7b565b6040518082815260200191505060405180910390f35b34801561025257600080fd5b50610285600480360381019080803590602001909291908035906020019092919080359060200190929190505050610cba565b6040518082815260200191505060405180910390f35b3480156102a757600080fd5b506102dc600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610dd7565b6040518082815260200191505060405180910390f35b3480156102fe57600080fd5b50610333600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610def565b6040518082815260200191505060405180910390f35b34801561035557600080fd5b5061037460048036038101908080359060200190929190505050610ee7565b604051808215151515815260200191505060405180910390f35b34801561039a57600080fd5b506103b960048036038101908080359060200190929190505050610f36565b604051808215151515815260200191505060405180910390f35b3480156103df57600080fd5b506103fe60048036038101908080359060200190929190505050610fc9565b604051808681526020018581526020018481526020018381526020018281526020019550505050505060405180910390f35b34801561043c57600080fd5b50610471600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610fff565b6040518082815260200191505060405180910390f35b34801561049357600080fd5b506104d4600480360381019080803590602001909291908035600019169060200190929190803590602001909291908035906020019092919050505061101a565b005b3480156104e257600080fd5b50610521600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506116f3565b604051808215151515815260200191505060405180910390f35b34801561054757600080fd5b5061059a6004803603810190808035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611772565b604051808215151515815260200191505060405180910390f35b3480156105c057600080fd5b506105df600480360381019080803590602001909291905050506117b6565b604051808215151515815260200191505060405180910390f35b34801561060557600080fd5b5061060e6117d1565b6040518082815260200191505060405180910390f35b34801561063057600080fd5b5061064f600480360381019080803590602001909291905050506117d7565b005b34801561065d57600080fd5b5061069c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a0c565b60405180826000191660001916815260200191505060405180910390f35b3480156106c657600080fd5b506106e560048036038101908080359060200190929190505050611adb565b005b3480156106f357600080fd5b5061071260048036038101908080359060200190929190505050611dbe565b604051808215151515815260200191505060405180910390f35b34801561073857600080fd5b50610777600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611dfb565b604051808215151515815260200191505060405180910390f35b34801561079d57600080fd5b506107d0600480360381019080803590602001909291908035906020019092919080359060200190929190505050611e7a565b005b3480156107de57600080fd5b50610827600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291908035906020019092919050505061223c565b6040518082815260200191505060405180910390f35b34801561084957600080fd5b50610888600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506123a2565b6040518082815260200191505060405180910390f35b3480156108aa57600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506124a7565b60405180826000191660001916815260200191505060405180910390f35b34801561091357600080fd5b50610932600480360381019080803590602001909291905050506125af565b604051808215151515815260200191505060405180910390f35b34801561095857600080fd5b50610977600480360381019080803590602001909291905050506125bb565b005b34801561098557600080fd5b506109a4600480360381019080803590602001909291905050506127d2565b604051808215151515815260200191505060405180910390f35b3480156109ca57600080fd5b506109d361280e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6000610a20826127d2565b1515610a2b57600080fd5b610a3482610f36565b15610a575760016000838152602001908152602001600020600301549050610a71565b600160008381526020019081526020016000206004015490505b919050565b600081565b6000806000610a8986610def565b9150610a9586836123a2565b90505b600082141515610cad57610aac86836123a2565b90508481111515610bb85783821415610bb057600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610b7257600080fd5b505af4158015610b86573d6000803e3d6000fd5b505050506040513d6020811015610b9c57600080fd5b810190808051906020019092919050505091505b819250610cb1565b600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610c6b57600080fd5b505af4158015610c7f573d6000803e3d6000fd5b505050506040513d6020811015610c9557600080fd5b81019080805190602001909291905050509150610a98565b8192505b50509392505050565b6000806000600160005401600081905550610cde854261283490919063ffffffff16565b9150610cf3848361283490919063ffffffff16565b905060a060405190810160405280838152602001828152602001878152602001600081526020016000815250600160008054815260200190815260200160002060008201518160000155602082015181600101556040820151816002015560608201518160030155608082015181600401559050503373ffffffffffffffffffffffffffffffffffffffff166000547f404f1f1c229d9eb2a949e7584da6ffde9d059ef2169f487ca815434cce0640d088858560405180848152602001838152602001828152602001935050505060405180910390a3600054925050509392505050565b60026020528060005260406000206000915090505481565b6000600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a909160006040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610ea557600080fd5b505af4158015610eb9573d6000803e3d6000fd5b505050506040513d6020811015610ecf57600080fd5b81019080805190602001909291905050509050919050565b6000610ef2826117b6565b1515610efd57600080fd5b610f1c60016000848152602001908152602001600020600101546125af565b158015610f2f5750610f2d82611dbe565b155b9050919050565b6000610f40612869565b610f49836127d2565b1515610f5457600080fd5b6001600084815260200190815260200160002060a060405190810160405290816000820154815260200160018201548152602001600282015481526020016003820154815260200160048201548152505090508060800151816060015101816040015102816060015160640211915050919050565b60016020528060005260406000206000915090508060000154908060010154908060020154908060030154908060040154905085565b60006110138261100e84610def565b6123a2565b9050919050565b60008061102686611dbe565b151561103157600080fd5b83600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561107f57600080fd5b6000861415151561108f57600080fd5b60008314806111885750600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561114c57600080fd5b505af4158015611160573d6000803e3d6000fd5b505050506040513d602081101561117657600080fd5b81019080805190602001909291905050505b151561119357600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561124657600080fd5b505af415801561125a573d6000803e3d6000fd5b505050506040513d602081101561127057600080fd5b81019080805190602001909291905050509150858214611290578161137f565b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091886040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561134357600080fd5b505af4158015611357573d6000803e3d6000fd5b505050506040513d602081101561136d57600080fd5b81019080805190602001909291905050505b915061138d83833387611772565b151561139857600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________639735c51b90918589866040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184815260200183815260200182815260200194505050505060006040518083038186803b15801561145b57600080fd5b505af415801561146f573d6000803e3d6000fd5b5050505061147d3387611a0c565b9050600473__AttributeStore________________________63977aa031909183876040518463ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180848152602001836000191660001916815260200180602001838152602001828103825260098152602001807f6e756d546f6b656e73000000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561153e57600080fd5b505af4158015611552573d6000803e3d6000fd5b50505050600473__AttributeStore________________________63977aa03190918388600190046040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018360001916600019168152602001806020018381526020018281038252600a8152602001807f636f6d6d6974486173680000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561161957600080fd5b505af415801561162d573d6000803e3d6000fd5b50505050600180600088815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16867fea7979e4280d7e6bffc1c7d83a1ac99f16d02ecc14465ce41016226783b663d7866040518082815260200191505060405180910390a3505050505050565b60006116fe826117b6565b151561170957600080fd5b6001600083815260200190815260200160002060050160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600061178185886123a2565b841015915061179085876123a2565b8411158061179e5750600086145b90508180156117aa5750805b92505050949350505050565b60008082141580156117ca57506000548211155b9050919050565b60005481565b6117f660016000838152602001908152602001600020600101546125af565b151561180157600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b1580156118b457600080fd5b505af41580156118c8573d6000803e3d6000fd5b505050506040513d60208110156118de57600080fd5b810190808051906020019092919050505015156118fa57600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156119ad57600080fd5b505af41580156119c1573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff16817f402507661c8c8cb90e0a796450b8bdd28b6c516f05279c0cd29e84c344e1699a60405160405180910390a350565b60008282604051602001808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611aa65780518252602082019150602081019050602083039250611a81565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905092915050565b80600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231336040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015611b9957600080fd5b505af1158015611bad573d6000803e3d6000fd5b505050506040513d6020811015611bc357600080fd5b810190808051906020019092919050505010151515611be157600080fd5b80600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330846040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611d2757600080fd5b505af1158015611d3b573d6000803e3d6000fd5b505050506040513d6020811015611d5157600080fd5b81019080805190602001909291905050501515611d6d57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ff7aaf024511d9982df8cd0d437c71c30106e6848cd1ba3d288d7a9c0e276aeda826040518082815260200191505060405180910390a250565b6000611dc9826117b6565b1515611dd457600080fd5b611df360016000848152602001908152602001600020600001546125af565b159050919050565b6000611e06826117b6565b1515611e1157600080fd5b6001600083815260200190815260200160002060060160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000611e8584610ee7565b1515611e9057600080fd5b6001600085815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611efc57600080fd5b6001600085815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611f6957600080fd5b611f7333856124a7565b60001916838360405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611fd45780518252602082019150602081019050602083039250611faf565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151561201157600080fd5b61201b33856123a2565b9050600183141561204f57806001600086815260200190815260200160002060030160008282540192505081905550612074565b8060016000868152602001908152602001600020600401600082825401925050819055505b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091866040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b15801561212757600080fd5b505af415801561213b573d6000803e3d6000fd5b50505050600180600086815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff1683857ff42c78852433ace4bdcb44f6e80c8daae529e2d999c88cf6bf8f77b1e2890fdd84600160008a815260200190815260200160002060030154600160008b81526020019081526020016000206004015460405180848152602001838152602001828152602001935050505060405180910390a450505050565b60008060008061224b866127d2565b151561225657600080fd5b6001600087815260200190815260200160002060060160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156122c257600080fd5b6122cb86610f36565b6122d65760006122d9565b60015b60ff169250828560405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561233b5780518252602082019150602081019050602083039250612316565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020915061237487876124a7565b90508060001916826000191614151561238c57600080fd5b61239687876123a2565b93505050509392505050565b6000600473__AttributeStore________________________6350389f5c90916123cc8686611a0c565b6040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180838152602001826000191660001916815260200180602001828103825260098152602001807f6e756d546f6b656e730000000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561246457600080fd5b505af4158015612478573d6000803e3d6000fd5b505050506040513d602081101561248e57600080fd5b8101908080519060200190929190505050905092915050565b6000600473__AttributeStore________________________6350389f5c90916124d18686611a0c565b6040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018260001916600019168152602001806020018281038252600a8152602001807f636f6d6d69744861736800000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561256957600080fd5b505af415801561257d573d6000803e3d6000fd5b505050506040513d602081101561259357600080fd5b8101908080519060200190929190505050600102905092915050565b60008142119050919050565b60006126176125c933610fff565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461285090919063ffffffff16565b905081811015151561262857600080fd5b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561273a57600080fd5b505af115801561274e573d6000803e3d6000fd5b505050506040513d602081101561276457600080fd5b8101908080519060200190929190505050151561278057600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ffaeb7dbb9992397d26ea1944efd40c80b40f702faf69b46c67ad10aba68ccb79836040518082815260200191505060405180910390a25050565b60006127dd826117b6565b15156127e857600080fd5b61280760016000848152602001908152602001600020600101546125af565b9050919050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000818301905082811015151561284757fe5b80905092915050565b600082821115151561285e57fe5b818303905092915050565b60a060405190810160405280600081526020016000815260200160008152602001600081526020016000815250905600a165627a7a723058208178b061e78479d2c5031eadfe1d4ed75a02b24df302d6d886ba602fc5600e510029", - "deployedBytecode": "0x60806040526004361061016a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063053e71a61461016f5780632173a10f146101b05780632c052031146101db57806332ed3d60146102465780633b9302941461029b578063427fa1d2146102f2578063441c77c014610349578063494031831461038e5780636148fed5146103d35780636b2d95d4146104305780636cbf9c5e146104875780637f97e836146104d6578063819b02931461053b57806388d21ff3146105b457806397508f36146105f95780639760356014610624578063a1103f3714610651578063a25236fe146106ba578063a4439dc5146106e7578063aa7ca4641461072c578063b11d8bb814610791578063b43bd069146107d2578063d13820921461083d578063d901402b1461089e578063d9548e5314610907578063e7b1d43c1461094c578063ee68483014610979578063fc0c546a146109be575b600080fd5b34801561017b57600080fd5b5061019a60048036038101908080359060200190929190505050610a15565b6040518082815260200191505060405180910390f35b3480156101bc57600080fd5b506101c5610a76565b6040518082815260200191505060405180910390f35b3480156101e757600080fd5b50610230600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050610a7b565b6040518082815260200191505060405180910390f35b34801561025257600080fd5b50610285600480360381019080803590602001909291908035906020019092919080359060200190929190505050610cba565b6040518082815260200191505060405180910390f35b3480156102a757600080fd5b506102dc600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610dd7565b6040518082815260200191505060405180910390f35b3480156102fe57600080fd5b50610333600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610def565b6040518082815260200191505060405180910390f35b34801561035557600080fd5b5061037460048036038101908080359060200190929190505050610ee7565b604051808215151515815260200191505060405180910390f35b34801561039a57600080fd5b506103b960048036038101908080359060200190929190505050610f36565b604051808215151515815260200191505060405180910390f35b3480156103df57600080fd5b506103fe60048036038101908080359060200190929190505050610fc9565b604051808681526020018581526020018481526020018381526020018281526020019550505050505060405180910390f35b34801561043c57600080fd5b50610471600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610fff565b6040518082815260200191505060405180910390f35b34801561049357600080fd5b506104d4600480360381019080803590602001909291908035600019169060200190929190803590602001909291908035906020019092919050505061101a565b005b3480156104e257600080fd5b50610521600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506116f3565b604051808215151515815260200191505060405180910390f35b34801561054757600080fd5b5061059a6004803603810190808035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611772565b604051808215151515815260200191505060405180910390f35b3480156105c057600080fd5b506105df600480360381019080803590602001909291905050506117b6565b604051808215151515815260200191505060405180910390f35b34801561060557600080fd5b5061060e6117d1565b6040518082815260200191505060405180910390f35b34801561063057600080fd5b5061064f600480360381019080803590602001909291905050506117d7565b005b34801561065d57600080fd5b5061069c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a0c565b60405180826000191660001916815260200191505060405180910390f35b3480156106c657600080fd5b506106e560048036038101908080359060200190929190505050611adb565b005b3480156106f357600080fd5b5061071260048036038101908080359060200190929190505050611dbe565b604051808215151515815260200191505060405180910390f35b34801561073857600080fd5b50610777600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611dfb565b604051808215151515815260200191505060405180910390f35b34801561079d57600080fd5b506107d0600480360381019080803590602001909291908035906020019092919080359060200190929190505050611e7a565b005b3480156107de57600080fd5b50610827600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291908035906020019092919050505061223c565b6040518082815260200191505060405180910390f35b34801561084957600080fd5b50610888600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506123a2565b6040518082815260200191505060405180910390f35b3480156108aa57600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506124a7565b60405180826000191660001916815260200191505060405180910390f35b34801561091357600080fd5b50610932600480360381019080803590602001909291905050506125af565b604051808215151515815260200191505060405180910390f35b34801561095857600080fd5b50610977600480360381019080803590602001909291905050506125bb565b005b34801561098557600080fd5b506109a4600480360381019080803590602001909291905050506127d2565b604051808215151515815260200191505060405180910390f35b3480156109ca57600080fd5b506109d361280e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6000610a20826127d2565b1515610a2b57600080fd5b610a3482610f36565b15610a575760016000838152602001908152602001600020600301549050610a71565b600160008381526020019081526020016000206004015490505b919050565b600081565b6000806000610a8986610def565b9150610a9586836123a2565b90505b600082141515610cad57610aac86836123a2565b90508481111515610bb85783821415610bb057600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610b7257600080fd5b505af4158015610b86573d6000803e3d6000fd5b505050506040513d6020811015610b9c57600080fd5b810190808051906020019092919050505091505b819250610cb1565b600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610c6b57600080fd5b505af4158015610c7f573d6000803e3d6000fd5b505050506040513d6020811015610c9557600080fd5b81019080805190602001909291905050509150610a98565b8192505b50509392505050565b6000806000600160005401600081905550610cde854261283490919063ffffffff16565b9150610cf3848361283490919063ffffffff16565b905060a060405190810160405280838152602001828152602001878152602001600081526020016000815250600160008054815260200190815260200160002060008201518160000155602082015181600101556040820151816002015560608201518160030155608082015181600401559050503373ffffffffffffffffffffffffffffffffffffffff166000547f404f1f1c229d9eb2a949e7584da6ffde9d059ef2169f487ca815434cce0640d088858560405180848152602001838152602001828152602001935050505060405180910390a3600054925050509392505050565b60026020528060005260406000206000915090505481565b6000600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a909160006040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610ea557600080fd5b505af4158015610eb9573d6000803e3d6000fd5b505050506040513d6020811015610ecf57600080fd5b81019080805190602001909291905050509050919050565b6000610ef2826117b6565b1515610efd57600080fd5b610f1c60016000848152602001908152602001600020600101546125af565b158015610f2f5750610f2d82611dbe565b155b9050919050565b6000610f40612869565b610f49836127d2565b1515610f5457600080fd5b6001600084815260200190815260200160002060a060405190810160405290816000820154815260200160018201548152602001600282015481526020016003820154815260200160048201548152505090508060800151816060015101816040015102816060015160640211915050919050565b60016020528060005260406000206000915090508060000154908060010154908060020154908060030154908060040154905085565b60006110138261100e84610def565b6123a2565b9050919050565b60008061102686611dbe565b151561103157600080fd5b83600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561107f57600080fd5b6000861415151561108f57600080fd5b60008314806111885750600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561114c57600080fd5b505af4158015611160573d6000803e3d6000fd5b505050506040513d602081101561117657600080fd5b81019080805190602001909291905050505b151561119357600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561124657600080fd5b505af415801561125a573d6000803e3d6000fd5b505050506040513d602081101561127057600080fd5b81019080805190602001909291905050509150858214611290578161137f565b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091886040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561134357600080fd5b505af4158015611357573d6000803e3d6000fd5b505050506040513d602081101561136d57600080fd5b81019080805190602001909291905050505b915061138d83833387611772565b151561139857600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________639735c51b90918589866040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184815260200183815260200182815260200194505050505060006040518083038186803b15801561145b57600080fd5b505af415801561146f573d6000803e3d6000fd5b5050505061147d3387611a0c565b9050600473__AttributeStore________________________63977aa031909183876040518463ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180848152602001836000191660001916815260200180602001838152602001828103825260098152602001807f6e756d546f6b656e73000000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561153e57600080fd5b505af4158015611552573d6000803e3d6000fd5b50505050600473__AttributeStore________________________63977aa03190918388600190046040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018360001916600019168152602001806020018381526020018281038252600a8152602001807f636f6d6d6974486173680000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561161957600080fd5b505af415801561162d573d6000803e3d6000fd5b50505050600180600088815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16867fea7979e4280d7e6bffc1c7d83a1ac99f16d02ecc14465ce41016226783b663d7866040518082815260200191505060405180910390a3505050505050565b60006116fe826117b6565b151561170957600080fd5b6001600083815260200190815260200160002060050160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600061178185886123a2565b841015915061179085876123a2565b8411158061179e5750600086145b90508180156117aa5750805b92505050949350505050565b60008082141580156117ca57506000548211155b9050919050565b60005481565b6117f660016000838152602001908152602001600020600101546125af565b151561180157600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b1580156118b457600080fd5b505af41580156118c8573d6000803e3d6000fd5b505050506040513d60208110156118de57600080fd5b810190808051906020019092919050505015156118fa57600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156119ad57600080fd5b505af41580156119c1573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff16817f402507661c8c8cb90e0a796450b8bdd28b6c516f05279c0cd29e84c344e1699a60405160405180910390a350565b60008282604051602001808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611aa65780518252602082019150602081019050602083039250611a81565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905092915050565b80600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231336040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015611b9957600080fd5b505af1158015611bad573d6000803e3d6000fd5b505050506040513d6020811015611bc357600080fd5b810190808051906020019092919050505010151515611be157600080fd5b80600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330846040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611d2757600080fd5b505af1158015611d3b573d6000803e3d6000fd5b505050506040513d6020811015611d5157600080fd5b81019080805190602001909291905050501515611d6d57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ff7aaf024511d9982df8cd0d437c71c30106e6848cd1ba3d288d7a9c0e276aeda826040518082815260200191505060405180910390a250565b6000611dc9826117b6565b1515611dd457600080fd5b611df360016000848152602001908152602001600020600001546125af565b159050919050565b6000611e06826117b6565b1515611e1157600080fd5b6001600083815260200190815260200160002060060160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000611e8584610ee7565b1515611e9057600080fd5b6001600085815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611efc57600080fd5b6001600085815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611f6957600080fd5b611f7333856124a7565b60001916838360405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611fd45780518252602082019150602081019050602083039250611faf565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151561201157600080fd5b61201b33856123a2565b9050600183141561204f57806001600086815260200190815260200160002060030160008282540192505081905550612074565b8060016000868152602001908152602001600020600401600082825401925050819055505b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091866040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b15801561212757600080fd5b505af415801561213b573d6000803e3d6000fd5b50505050600180600086815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff1683857ff42c78852433ace4bdcb44f6e80c8daae529e2d999c88cf6bf8f77b1e2890fdd84600160008a815260200190815260200160002060030154600160008b81526020019081526020016000206004015460405180848152602001838152602001828152602001935050505060405180910390a450505050565b60008060008061224b866127d2565b151561225657600080fd5b6001600087815260200190815260200160002060060160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156122c257600080fd5b6122cb86610f36565b6122d65760006122d9565b60015b60ff169250828560405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561233b5780518252602082019150602081019050602083039250612316565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020915061237487876124a7565b90508060001916826000191614151561238c57600080fd5b61239687876123a2565b93505050509392505050565b6000600473__AttributeStore________________________6350389f5c90916123cc8686611a0c565b6040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180838152602001826000191660001916815260200180602001828103825260098152602001807f6e756d546f6b656e730000000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561246457600080fd5b505af4158015612478573d6000803e3d6000fd5b505050506040513d602081101561248e57600080fd5b8101908080519060200190929190505050905092915050565b6000600473__AttributeStore________________________6350389f5c90916124d18686611a0c565b6040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018260001916600019168152602001806020018281038252600a8152602001807f636f6d6d69744861736800000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561256957600080fd5b505af415801561257d573d6000803e3d6000fd5b505050506040513d602081101561259357600080fd5b8101908080519060200190929190505050600102905092915050565b60008142119050919050565b60006126176125c933610fff565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461285090919063ffffffff16565b905081811015151561262857600080fd5b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561273a57600080fd5b505af115801561274e573d6000803e3d6000fd5b505050506040513d602081101561276457600080fd5b8101908080519060200190929190505050151561278057600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ffaeb7dbb9992397d26ea1944efd40c80b40f702faf69b46c67ad10aba68ccb79836040518082815260200191505060405180910390a25050565b60006127dd826117b6565b15156127e857600080fd5b61280760016000848152602001908152602001600020600101546125af565b9050919050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000818301905082811015151561284757fe5b80905092915050565b600082821115151561285e57fe5b818303905092915050565b60a060405190810160405280600081526020016000815260200160008152602001600081526020016000815250905600a165627a7a723058208178b061e78479d2c5031eadfe1d4ed75a02b24df302d6d886ba602fc5600e510029", - "sourceMap": "252:17051:4:-;;;2286:111;8:9:-1;5:2;;;30:1;27;20:12;5:2;2286:111:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2345:10;2331:5;;:25;;;;;;;;;;;;;;;;;;1728:1;2362:9;:30;;;;2286:111;252:17051;;;;;;", - "deployedSourceMap": "252:17051:4:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10565:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10565:258:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1686:43;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1686:43:4;;;;;;;;;;;;;;;;;;;;;;;15433:1074;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15433:1074:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9217:605;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9217:605:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1829:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1829:48:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14317:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14317:114:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11835:203;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11835:203:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10029:238;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10029:238:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1759:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1759:36:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14608:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14608:137:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4534:1213;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4534:1213:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12280:173;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12280:173:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6235:399;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6235:399:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13049:124;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13049:124:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1733:21;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1733:21:4;;;;;;;;;;;;;;;;;;;;;;;3727:244;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3727:244:4;;;;;;;;;;;;;;;;;;;;;;;;;;17158:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;17158:143:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2742:282;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2742:282:4;;;;;;;;;;;;;;;;;;;;;;;;;;11445:171;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11445:171:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12693:172;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12693:172:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6982:1135;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6982:1135:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8331:467;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8331:467:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13954:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13954:165:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13516:180;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13516:180:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16807:131;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16807:131:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3222:353;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3222:353:4;;;;;;;;;;;;;;;;;;;;;;;;;;10997:160;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10997:160:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1995:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1995:18:4;;;;;;;;;;;;;;;;;;;;;;;;;;;10565:258;10648:14;10678:18;10688:7;10678:9;:18::i;:::-;10670:27;;;;;;;;10708:17;10717:7;10708:8;:17::i;:::-;10704:114;;;10740:7;:16;10748:7;10740:16;;;;;;;;;;;:25;;;10733:32;;;;10704:114;10789:7;:16;10797:7;10789:16;;;;;;;;;;;:29;;;10782:36;;10565:258;;;;:::o;1686:43::-;1728:1;1686:43;:::o;15433:1074::-;15539:13;15637:11;15676:17;15651:19;15663:6;15651:11;:19::i;:::-;15637:33;;15696:28;15709:6;15717;15696:12;:28::i;:::-;15676:48;;15802:587;15819:1;15809:6;:11;;15802:587;;;15899:28;15912:6;15920;15899:12;:28::i;:::-;15884:43;;15955:10;15939:12;:26;;15935:312;;;16021:7;16011:6;:17;16007:173;;;16139:6;:14;16146:6;16139:14;;;;;;;;;;;;;;;:22;;;;16162:6;16139:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16139:30:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16139:30:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16139:30:4;;;;;;;;;;;;;;;;16130:39;;16007:173;16231:6;16224:13;;;;15935:312;16352:6;:14;16359:6;16352:14;;;;;;;;;;;;;;;:22;;;;16375:6;16352:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16352:30:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16352:30:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16352:30:4;;;;;;;;;;;;;;;;16343:39;;15802:587;;;16496:6;16489:13;;15433:1074;;;;;;;;:::o;9217:605::-;9314:11;9365:18;9428;9357:1;9345:9;;:13;9333:9;:25;;;;9386:36;9406:15;9386;:19;;:36;;;;:::i;:::-;9365:57;;9449:34;9467:15;9449:13;:17;;:34;;;;:::i;:::-;9428:55;;9511:157;;;;;;;;;9570:13;9511:157;;;;9606:13;9511:157;;;;9536:11;9511:157;;;;9637:1;9511:157;;;;9660:1;9511:157;;;9490:7;:18;9498:9;;9490:18;;;;;;;;;;;:178;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9778:10;9680:114;;9761:9;;9680:114;9700:11;9719:13;9740;9680:114;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9808:9;;9801:16;;9217:605;;;;;;;:::o;1829:48::-;;;;;;;;;;;;;;;;;:::o;14317:114::-;14375:11;14401:6;:14;14408:6;14401:14;;;;;;;;;;;;;;;:22;;;;14424:1;14401:25;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14401:25:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14401:25:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14401:25:4;;;;;;;;;;;;;;;;14394:32;;14317:114;;;:::o;11835:203::-;11898:11;11925:19;11936:7;11925:10;:19::i;:::-;11917:28;;;;;;;;11960:41;11970:7;:16;11978:7;11970:16;;;;;;;;;;;:30;;;11960:9;:41::i;:::-;11959:42;:74;;;;;12006:27;12025:7;12006:18;:27::i;:::-;12005:28;11959:74;11952:81;;11835:203;;;:::o;10029:238::-;10082:11;10135:16;;:::i;:::-;10109:18;10119:7;10109:9;:18::i;:::-;10101:27;;;;;;;;10154:7;:16;10162:7;10154:16;;;;;;;;;;;10135:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10243:4;:17;;;10227:4;:13;;;:33;10208:4;:15;;;:53;10190:4;:13;;;10184:3;:19;10183:79;10176:86;;10029:238;;;;:::o;1759:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;14608:137::-;14670:14;14699:41;14712:6;14720:19;14732:6;14720:11;:19::i;:::-;14699:12;:41::i;:::-;14692:48;;14608:137;;;:::o;4534:1213::-;5046:15;5469:12;4669:27;4688:7;4669:18;:27::i;:::-;4661:36;;;;;;;;4743:10;4711:16;:28;4728:10;4711:28;;;;;;;;;;;;;;;;:42;;4703:51;;;;;;;;4813:1;4802:7;:12;;4794:21;;;;;;;;4993:1;4978:11;:16;:60;;;;4998:6;:18;5005:10;4998:18;;;;;;;;;;;;;;;:27;;;;5026:11;4998:40;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4998:40:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4998:40:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4998:40:4;;;;;;;;;;;;;;;;4978:60;4970:69;;;;;;;;5064:6;:18;5071:10;5064:18;;;;;;;;;;;;;;;:26;;;;5091:11;5064:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5064:39:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5064:39:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5064:39:4;;;;;;;;;;;;;;;;5046:57;;5206:7;5192:10;:21;5191:74;;5255:10;5191:74;;;5217:6;:18;5224:10;5217:18;;;;;;;;;;;;;;;:26;;;;5244:7;5217:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5217:35:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5217:35:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5217:35:4;;;;;;;;;;;;;;;;5191:74;5178:87;;5287:103;5310:11;5331:10;5352;5372;5287:13;:103::i;:::-;5272:124;;;;;;;;5403:6;:18;5410:10;5403:18;;;;;;;;;;;;;;;:25;;;;5429:11;5442:7;5451:10;5403:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5403:59:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5403:59:4;;;;5484:29;5493:10;5505:7;5484:8;:29::i;:::-;5469:44;;5520:5;:18;;;;5539:4;5558:10;5520:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5520:49:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5520:49:4;;;;5575:5;:18;;;;5594:4;5619:11;5614:17;;;5575:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5575:57:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5575:57:4;;;;5680:4;5639:7;:16;5647:7;5639:16;;;;;;;;;;;:26;;:38;5666:10;5639:38;;;;;;;;;;;;;;;;:45;;;;;;;;;;;;;;;;;;5731:10;5695:47;;5710:7;5695:47;5719:10;5695:47;;;;;;;;;;;;;;;;;;4534:1213;;;;;;:::o;12280:173::-;12350:14;12380:19;12391:7;12380:10;:19::i;:::-;12372:28;;;;;;;;12414:7;:16;12422:7;12414:16;;;;;;;;;;;:26;;:34;12441:6;12414:34;;;;;;;;;;;;;;;;;;;;;;;;;12407:41;;12280:173;;;;:::o;6235:399::-;6360:10;6380:14;6516;6412:29;6425:6;6433:7;6412:12;:29::i;:::-;6398:10;:43;;6380:62;;6548:29;6561:6;6569:7;6548:12;:29::i;:::-;6534:10;:43;;:59;;;;6592:1;6581:7;:12;6534:59;6516:78;;6607:9;:22;;;;;6620:9;6607:22;6600:29;;6235:399;;;;;;;;:::o;13049:124::-;13104:11;13142:1;13131:7;:12;;:36;;;;;13158:9;;13147:7;:20;;13131:36;13123:45;;13049:124;;;:::o;1733:21::-;;;;:::o;3727:244::-;3786:41;3796:7;:16;3804:7;3796:16;;;;;;;;;;;:30;;;3786:9;:41::i;:::-;3778:50;;;;;;;;3842:6;:18;3849:10;3842:18;;;;;;;;;;;;;;;:27;;;;3870:7;3842:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3842:36:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3842:36:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3842:36:4;;;;;;;;;;;;;;;;3834:45;;;;;;;;3886:6;:18;3893:10;3886:18;;;;;;;;;;;;;;;:25;;;;3912:7;3886:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3886:34:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3886:34:4;;;;3955:10;3931:35;;3946:7;3931:35;;;;;;;;;;3727:244;:::o;17158:143::-;17226:12;17280:5;17287:7;17263:32;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17263:32:4;;;17253:43;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17253:43:4;;;;;;;;;;;;;;;;17246:50;;17158:143;;;;:::o;2742:282::-;2842:10;2811:5;;;;;;;;;;;:15;;;2827:10;2811:27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2811:27:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2811:27:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2811:27:4;;;;;;;;;;;;;;;;:41;;2803:50;;;;;;;;2891:10;2859:16;:28;2876:10;2859:28;;;;;;;;;;;;;;;;:42;;;;;;;;;;;2915:5;;;;;;;;;;;:18;;;2934:10;2946:4;2952:10;2915:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2915:48:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2915:48:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2915:48:4;;;;;;;;;;;;;;;;2907:57;;;;;;;;3008:10;2975:44;;;2996:10;2975:44;;;;;;;;;;;;;;;;;;2742:282;:::o;11445:171::-;11508:11;11535:19;11546:7;11535:10;:19::i;:::-;11527:28;;;;;;;;11570:41;11580:7;:16;11588:7;11580:16;;;;;;;;;;;:30;;;11570:9;:41::i;:::-;11569:42;11562:49;;11445:171;;;:::o;12693:172::-;12763:13;12792:19;12803:7;12792:10;:19::i;:::-;12784:28;;;;;;;;12826:7;:16;12834:7;12826:16;;;;;;;;;;;:26;;:34;12853:6;12826:34;;;;;;;;;;;;;;;;;;;;;;;;;12819:41;;12693:172;;;;:::o;6982:1135::-;7563:14;7114:27;7133:7;7114:18;:27::i;:::-;7106:36;;;;;;;;7156:7;:16;7164:7;7156:16;;;;;;;;;;;:26;;:38;7183:10;7156:38;;;;;;;;;;;;;;;;;;;;;;;;;7148:47;;;;;;;;7287:7;:16;7295:7;7287:16;;;;;;;;;;;:26;;:38;7314:10;7287:38;;;;;;;;;;;;;;;;;;;;;;;;;7286:39;7278:48;;;;;;;;7460:34;7474:10;7486:7;7460:13;:34::i;:::-;7409:85;;;7436:11;7449:5;7419:36;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;7419:36:4;;;7409:47;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;7409:47:4;;;;;;;;;;;;;;;;:85;;;;7401:94;;;;;;;;7580:33;7593:10;7605:7;7580:12;:33::i;:::-;7563:50;;7639:1;7624:11;:16;7620:183;;;7724:9;7695:7;:16;7703:7;7695:16;;;;;;;;;;;:25;;;:38;;;;;;;;;;;7620:183;;;7787:9;7754:7;:16;7762:7;7754:16;;;;;;;;;;;:29;;;:42;;;;;;;;;;;7620:183;7809:6;:18;7816:10;7809:18;;;;;;;;;;;;;;;:25;;;;7835:7;7809:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7809:34:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7809:34:4;;;;7944:4;7903:7;:16;7911:7;7903:16;;;;;;;;;;;:26;;:38;7930:10;7903:38;;;;;;;;;;;;;;;;:45;;;;;;;;;;;;;;;;;;8096:10;7960:152;;8083:11;7981:7;7960:152;7996:9;8013:7;:16;8021:7;8013:16;;;;;;;;;;;:25;;;8046:7;:16;8054:7;8046:16;;;;;;;;;;;:29;;;7960:152;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6982:1135;;;;:::o;8331:467::-;8423:17;8531:18;8583;8659;8456;8466:7;8456:9;:18::i;:::-;8448:27;;;;;;;;8489:7;:16;8497:7;8489:16;;;;;;;;;;;:26;;:34;8516:6;8489:34;;;;;;;;;;;;;;;;;;;;;;;;;8481:43;;;;;;;;8552:17;8561:7;8552:8;:17::i;:::-;:25;;8576:1;8552:25;;;8572:1;8552:25;8531:46;;;;8631:13;8646:5;8614:38;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;8614:38:4;;;8604:49;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;8604:49:4;;;;;;;;;;;;;;;;8583:70;;8680:30;8694:6;8702:7;8680:13;:30::i;:::-;8659:51;;8739:10;8725:24;;;:10;:24;;;;8717:33;;;;;;;;8764:29;8777:6;8785:7;8764:12;:29::i;:::-;8757:36;;8331:467;;;;;;;;:::o;13954:165::-;14027:14;14056:5;:18;;;;14075:25;14084:6;14092:7;14075:8;:25::i;:::-;14056:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14056:58:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14056:58:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14056:58:4;;;;;;;;;;;;;;;;14049:65;;13954:165;;;;:::o;13516:180::-;13590:18;13631:5;:18;;;;13650:25;13659:6;13667:7;13650:8;:25::i;:::-;13631:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13631:59:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13631:59:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13631:59:4;;;;;;;;;;;;;;;;13623:68;;13616:75;;13516:180;;;;:::o;16807:131::-;16870:12;16916:16;16898:15;:34;16890:43;;16807:131;;;:::o;3222:353::-;3284:20;3307:61;3340:27;3356:10;3340:15;:27::i;:::-;3307:16;:28;3324:10;3307:28;;;;;;;;;;;;;;;;:32;;:61;;;;:::i;:::-;3284:84;;3401:10;3382:15;:29;;3374:38;;;;;;;;3450:10;3418:16;:28;3435:10;3418:28;;;;;;;;;;;;;;;;:42;;;;;;;;;;;3474:5;;;;;;;;;;;:14;;;3489:10;3501;3474:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3474:38:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3474:38:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3474:38:4;;;;;;;;;;;;;;;;3466:47;;;;;;;;3559:10;3524:46;;;3547:10;3524:46;;;;;;;;;;;;;;;;;;3222:353;;:::o;10997:160::-;11051:10;11077:19;11088:7;11077:10;:19::i;:::-;11069:28;;;;;;;;11111:41;11121:7;:16;11129:7;11121:16;;;;;;;;;;;:30;;;11111:9;:41::i;:::-;11104:48;;10997:160;;;:::o;1995:18::-;;;;;;;;;;;;;:::o;1213:123:7:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;1041:110::-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;252:17051:4:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o", - "source": "pragma solidity 0.4.24;\n\nimport \"./ERC20.sol\";\nimport \"./DLL.sol\";\nimport \"./AttributeStore.sol\";\nimport \"./SafeMath.sol\";\n\n\n/**\n@title Partial-Lock-Commit-Reveal Voting scheme with ERC20 tokens\n@author Team: Aspyn Palatnick, Cem Ozer, Yorke Rhodes\n*/\ncontract PLCRVoting {\n\n // ============\n // EVENTS:\n // ============\n\n event _VoteCommitted(uint indexed pollID, uint numTokens, address indexed voter);\n event _VoteRevealed(uint indexed pollID, uint numTokens, uint votesFor, uint votesAgainst, uint indexed choice, address indexed voter);\n event _PollCreated(uint voteQuorum, uint commitEndDate, uint revealEndDate, uint indexed pollID, address indexed creator);\n event _VotingRightsGranted(uint numTokens, address indexed voter);\n event _VotingRightsWithdrawn(uint numTokens, address indexed voter);\n event _TokensRescued(uint indexed pollID, address indexed voter);\n\n // ============\n // DATA STRUCTURES:\n // ============\n\n using AttributeStore for AttributeStore.Data;\n using DLL for DLL.Data;\n using SafeMath for uint;\n\n struct Poll {\n uint commitEndDate; /// expiration date of commit period for poll\n uint revealEndDate; /// expiration date of reveal period for poll\n uint voteQuorum; /// number of votes required for a proposal to pass\n uint votesFor; /// tally of votes supporting proposal\n uint votesAgainst; /// tally of votes countering proposal\n mapping(address => bool) didCommit; /// indicates whether an address committed a vote for this poll\n mapping(address => bool) didReveal; /// indicates whether an address revealed a vote for this poll\n }\n\n // ============\n // STATE VARIABLES:\n // ============\n\n uint constant public INITIAL_POLL_NONCE = 0;\n uint public pollNonce;\n\n mapping(uint => Poll) public pollMap; // maps pollID to Poll struct\n mapping(address => uint) public voteTokenBalance; // maps user's address to voteToken balance\n\n mapping(address => DLL.Data) dllMap;\n AttributeStore.Data store;\n\n ERC20 public token;\n\n // ============\n // CONSTRUCTOR:\n // ============\n\n /**\n @dev Initializes voteQuorum, commitDuration, revealDuration, and pollNonce in addition to token contract and trusted mapping\n @param _tokenAddr The address where the ERC20 token contract is deployed\n */\n constructor(address _tokenAddr) public {\n token = ERC20(_tokenAddr);\n pollNonce = INITIAL_POLL_NONCE;\n }\n\n // ================\n // TOKEN INTERFACE:\n // ================\n\n /**\n @notice Loads _numTokens ERC20 tokens into the voting contract for one-to-one voting rights\n @dev Assumes that msg.sender has approved voting contract to spend on their behalf\n @param _numTokens The number of votingTokens desired in exchange for ERC20 tokens\n */\n function requestVotingRights(uint _numTokens) external {\n require(token.balanceOf(msg.sender) >= _numTokens);\n voteTokenBalance[msg.sender] += _numTokens;\n require(token.transferFrom(msg.sender, this, _numTokens));\n emit _VotingRightsGranted(_numTokens, msg.sender);\n }\n\n /**\n @notice Withdraw _numTokens ERC20 tokens from the voting contract, revoking these voting rights\n @param _numTokens The number of ERC20 tokens desired in exchange for voting rights\n */\n function withdrawVotingRights(uint _numTokens) external {\n uint availableTokens = voteTokenBalance[msg.sender].sub(getLockedTokens(msg.sender));\n require(availableTokens >= _numTokens);\n voteTokenBalance[msg.sender] -= _numTokens;\n require(token.transfer(msg.sender, _numTokens));\n emit _VotingRightsWithdrawn(_numTokens, msg.sender);\n }\n\n /**\n @dev Unlocks tokens locked in unrevealed vote where poll has ended\n @param _pollID Integer identifier associated with the target poll\n */\n function rescueTokens(uint _pollID) external {\n require(isExpired(pollMap[_pollID].revealEndDate));\n require(dllMap[msg.sender].contains(_pollID));\n\n dllMap[msg.sender].remove(_pollID);\n emit _TokensRescued(_pollID, msg.sender);\n }\n\n // =================\n // VOTING INTERFACE:\n // =================\n\n /**\n @notice Commits vote using hash of choice and secret salt to conceal vote until reveal\n @param _pollID Integer identifier associated with target poll\n @param _secretHash Commit keccak256 hash of voter's choice and salt (tightly packed in this order)\n @param _numTokens The number of tokens to be committed towards the target poll\n @param _prevPollID The ID of the poll that the user has voted the maximum number of tokens in which is still less than or equal to numTokens\n */\n function commitVote(\n uint _pollID,\n bytes32 _secretHash,\n uint _numTokens,\n uint _prevPollID\n ) external\n {\n require(commitPeriodActive(_pollID));\n require(voteTokenBalance[msg.sender] >= _numTokens); // prevent user from overspending\n require(_pollID != 0); // prevent user from committing to zero node placeholder\n\n // Check if _prevPollID exists in the user's DLL or if _prevPollID is 0\n require(_prevPollID == 0 || dllMap[msg.sender].contains(_prevPollID));\n\n uint nextPollID = dllMap[msg.sender].getNext(_prevPollID);\n\n // if nextPollID is equal to _pollID, _pollID is being updated,\n nextPollID = (nextPollID == _pollID) ? dllMap[msg.sender].getNext(_pollID) : nextPollID;\n\n require(\n validPosition(\n _prevPollID,\n nextPollID, \n msg.sender,\n _numTokens\n )\n );\n\n dllMap[msg.sender].insert(_prevPollID, _pollID, nextPollID);\n\n bytes32 UUID = attrUUID(msg.sender, _pollID);\n\n store.setAttribute(UUID, \"numTokens\", _numTokens);\n store.setAttribute(UUID, \"commitHash\", uint(_secretHash));\n\n pollMap[_pollID].didCommit[msg.sender] = true;\n emit _VoteCommitted(_pollID, _numTokens, msg.sender);\n }\n\n /**\n @dev Compares previous and next poll's committed tokens for sorting purposes\n @param _prevID Integer identifier associated with previous poll in sorted order\n @param _nextID Integer identifier associated with next poll in sorted order\n @param _voter Address of user to check DLL position for\n @param _numTokens The number of tokens to be committed towards the poll (used for sorting)\n @return valid Boolean indication of if the specified position maintains the sort\n */\n function validPosition(\n uint _prevID,\n uint _nextID,\n address _voter,\n uint _numTokens\n ) public view returns (bool valid)\n {\n bool prevValid = (_numTokens >= getNumTokens(_voter, _prevID));\n // if next is zero node, _numTokens does not need to be greater\n bool nextValid = (_numTokens <= getNumTokens(_voter, _nextID) || _nextID == 0);\n return prevValid && nextValid;\n }\n\n /**\n @notice Reveals vote with choice and secret salt used in generating commitHash to attribute committed tokens\n @param _pollID Integer identifier associated with target poll\n @param _voteOption Vote choice used to generate commitHash for associated poll\n @param _salt Secret number used to generate commitHash for associated poll\n */\n function revealVote(uint _pollID, uint _voteOption, uint _salt) external {\n // Make sure the reveal period is active\n require(revealPeriodActive(_pollID));\n require(pollMap[_pollID].didCommit[msg.sender]); // make sure user has committed a vote for this poll\n require(!pollMap[_pollID].didReveal[msg.sender]); // prevent user from revealing multiple times\n require(keccak256(abi.encodePacked(_voteOption, _salt)) == getCommitHash(msg.sender, _pollID)); // compare resultant hash from inputs to original commitHash\n\n uint numTokens = getNumTokens(msg.sender, _pollID);\n\n if (_voteOption == 1) {// apply numTokens to appropriate poll choice\n pollMap[_pollID].votesFor += numTokens;\n } else {\n pollMap[_pollID].votesAgainst += numTokens;\n }\n\n dllMap[msg.sender].remove(_pollID); // remove the node referring to this vote upon reveal\n pollMap[_pollID].didReveal[msg.sender] = true;\n\n emit _VoteRevealed(\n _pollID,\n numTokens,\n pollMap[_pollID].votesFor,\n pollMap[_pollID].votesAgainst,\n _voteOption, msg.sender\n );\n }\n\n /**\n @param _pollID Integer identifier associated with target poll\n @param _salt Arbitrarily chosen integer used to generate secretHash\n @return correctVotes Number of tokens voted for winning option\n */\n function getNumPassingTokens(address _voter, uint _pollID, uint _salt) public view returns (uint correctVotes) {\n require(pollEnded(_pollID));\n require(pollMap[_pollID].didReveal[_voter]);\n\n uint winningChoice = isPassed(_pollID) ? 1 : 0;\n bytes32 winnerHash = keccak256(abi.encodePacked(winningChoice, _salt));\n bytes32 commitHash = getCommitHash(_voter, _pollID);\n\n require(winnerHash == commitHash);\n\n return getNumTokens(_voter, _pollID);\n }\n\n // ==================\n // POLLING INTERFACE:\n // ==================\n\n /**\n @dev Initiates a poll with canonical configured parameters at pollID emitted by PollCreated event\n @param _voteQuorum Type of majority (out of 100) that is necessary for poll to be successful\n @param _commitDuration Length of desired commit period in seconds\n @param _revealDuration Length of desired reveal period in seconds\n */\n function startPoll(uint _voteQuorum, uint _commitDuration, uint _revealDuration) public returns (uint pollID) {\n pollNonce = pollNonce + 1;\n\n uint commitEndDate = block.timestamp.add(_commitDuration);\n uint revealEndDate = commitEndDate.add(_revealDuration);\n\n pollMap[pollNonce] = Poll({\n voteQuorum: _voteQuorum,\n commitEndDate: commitEndDate,\n revealEndDate: revealEndDate,\n votesFor: 0,\n votesAgainst: 0\n });\n\n emit _PollCreated(\n _voteQuorum,\n commitEndDate,\n revealEndDate,\n pollNonce,\n msg.sender\n );\n\n return pollNonce;\n }\n\n /**\n @notice Determines if proposal has passed\n @dev Check if votesFor out of totalVotes exceeds votesQuorum (requires pollEnded)\n @param _pollID Integer identifier associated with target poll\n */\n function isPassed(uint _pollID) view public returns (bool passed) {\n require(pollEnded(_pollID));\n\n Poll memory poll = pollMap[_pollID];\n return (100 * poll.votesFor) > (poll.voteQuorum * (poll.votesFor + poll.votesAgainst));\n }\n\n // ----------------\n // POLLING HELPERS:\n // ----------------\n\n /**\n @dev Gets the total winning votes for reward distribution purposes\n @param _pollID Integer identifier associated with target poll\n @return Total number of votes committed to the winning option for specified poll\n */\n function getTotalNumberOfTokensForWinningOption(uint _pollID) view public returns (uint numTokens) {\n require(pollEnded(_pollID));\n\n if (isPassed(_pollID))\n return pollMap[_pollID].votesFor;\n else\n return pollMap[_pollID].votesAgainst;\n }\n\n /**\n @notice Determines if poll is over\n @dev Checks isExpired for specified poll's revealEndDate\n @return Boolean indication of whether polling period is over\n */\n function pollEnded(uint _pollID) view public returns (bool ended) {\n require(pollExists(_pollID));\n\n return isExpired(pollMap[_pollID].revealEndDate);\n }\n\n /**\n @notice Checks if the commit period is still active for the specified poll\n @dev Checks isExpired for the specified poll's commitEndDate\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of isCommitPeriodActive for target poll\n */\n function commitPeriodActive(uint _pollID) view public returns (bool active) {\n require(pollExists(_pollID));\n\n return !isExpired(pollMap[_pollID].commitEndDate);\n }\n\n /**\n @notice Checks if the reveal period is still active for the specified poll\n @dev Checks isExpired for the specified poll's revealEndDate\n @param _pollID Integer identifier associated with target poll\n */\n function revealPeriodActive(uint _pollID) view public returns (bool active) {\n require(pollExists(_pollID));\n\n return !isExpired(pollMap[_pollID].revealEndDate) && !commitPeriodActive(_pollID);\n }\n\n /**\n @dev Checks if user has committed for specified poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of whether user has committed\n */\n function didCommit(address _voter, uint _pollID) view public returns (bool committed) {\n require(pollExists(_pollID));\n\n return pollMap[_pollID].didCommit[_voter];\n }\n\n /**\n @dev Checks if user has revealed for specified poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of whether user has revealed\n */\n function didReveal(address _voter, uint _pollID) view public returns (bool revealed) {\n require(pollExists(_pollID));\n\n return pollMap[_pollID].didReveal[_voter];\n }\n\n /**\n @dev Checks if a poll exists\n @param _pollID The pollID whose existance is to be evaluated.\n @return Boolean Indicates whether a poll exists for the provided pollID\n */\n function pollExists(uint _pollID) view public returns (bool exists) {\n return (_pollID != 0 && _pollID <= pollNonce);\n }\n\n // ---------------------------\n // DOUBLE-LINKED-LIST HELPERS:\n // ---------------------------\n\n /**\n @dev Gets the bytes32 commitHash property of target poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Bytes32 hash property attached to target poll\n */\n function getCommitHash(address _voter, uint _pollID) view public returns (bytes32 commitHash) {\n return bytes32(store.getAttribute(attrUUID(_voter, _pollID), \"commitHash\"));\n }\n\n /**\n @dev Wrapper for getAttribute with attrName=\"numTokens\"\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Number of tokens committed to poll in sorted poll-linked-list\n */\n function getNumTokens(address _voter, uint _pollID) view public returns (uint numTokens) {\n return store.getAttribute(attrUUID(_voter, _pollID), \"numTokens\");\n }\n\n /**\n @dev Gets top element of sorted poll-linked-list\n @param _voter Address of user to check against\n @return Integer identifier to poll with maximum number of tokens committed to it\n */\n function getLastNode(address _voter) view public returns (uint pollID) {\n return dllMap[_voter].getPrev(0);\n }\n\n /**\n @dev Gets the numTokens property of getLastNode\n @param _voter Address of user to check against\n @return Maximum number of tokens committed in poll specified\n */\n function getLockedTokens(address _voter) view public returns (uint numTokens) {\n return getNumTokens(_voter, getLastNode(_voter));\n }\n\n /*\n @dev Takes the last node in the user's DLL and iterates backwards through the list searching\n for a node with a value less than or equal to the provided _numTokens value. When such a node\n is found, if the provided _pollID matches the found nodeID, this operation is an in-place\n update. In that case, return the previous node of the node being updated. Otherwise return the\n first node that was found with a value less than or equal to the provided _numTokens.\n @param _voter The voter whose DLL will be searched\n @param _numTokens The value for the numTokens attribute in the node to be inserted\n @return the node which the propoded node should be inserted after\n */\n function getInsertPointForNumTokens(address _voter, uint _numTokens, uint _pollID)\n view public returns (uint prevNode)\n {\n // Get the last node in the list and the number of tokens in that node\n uint nodeID = getLastNode(_voter);\n uint tokensInNode = getNumTokens(_voter, nodeID);\n\n // Iterate backwards through the list until reaching the root node\n while (nodeID != 0) {\n // Get the number of tokens in the current node\n tokensInNode = getNumTokens(_voter, nodeID);\n if (tokensInNode <= _numTokens) { // We found the insert point!\n if (nodeID == _pollID) {\n // This is an in-place update. Return the prev node of the node being updated\n nodeID = dllMap[_voter].getPrev(nodeID);\n }\n // Return the insert point\n return nodeID; \n }\n // We did not find the insert point. Continue iterating backwards through the list\n nodeID = dllMap[_voter].getPrev(nodeID);\n }\n\n // The list is empty, or a smaller value than anything else in the list is being inserted\n return nodeID;\n }\n\n // ----------------\n // GENERAL HELPERS:\n // ----------------\n\n /**\n @dev Checks if an expiration date has been reached\n @param _terminationDate Integer timestamp of date to compare current timestamp with\n @return expired Boolean indication of whether the terminationDate has passed\n */\n function isExpired(uint _terminationDate) view public returns (bool expired) {\n return (block.timestamp > _terminationDate);\n }\n\n /**\n @dev Generates an identifier which associates a user and a poll together\n @param _pollID Integer identifier associated with target poll\n @return UUID Hash which is deterministic from _user and _pollID\n */\n function attrUUID(address _user, uint _pollID) public pure returns (bytes32 UUID) {\n return keccak256(abi.encodePacked(_user, _pollID));\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "bytecode": "0x608060405234801561001057600080fd5b50604051602080612a968339810180604052810190808051906020019092919050505080600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555050612a0b8061008b6000396000f30060806040526004361061016a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063053e71a61461016f5780632173a10f146101b05780632c052031146101db57806332ed3d60146102465780633b9302941461029b578063427fa1d2146102f2578063441c77c014610349578063494031831461038e5780636148fed5146103d35780636b2d95d4146104305780636cbf9c5e146104875780637f97e836146104d6578063819b02931461053b57806388d21ff3146105b457806397508f36146105f95780639760356014610624578063a1103f3714610651578063a25236fe146106ba578063a4439dc5146106e7578063aa7ca4641461072c578063b11d8bb814610791578063b43bd069146107d2578063d13820921461083d578063d901402b1461089e578063d9548e5314610907578063e7b1d43c1461094c578063ee68483014610979578063fc0c546a146109be575b600080fd5b34801561017b57600080fd5b5061019a60048036038101908080359060200190929190505050610a15565b6040518082815260200191505060405180910390f35b3480156101bc57600080fd5b506101c5610a76565b6040518082815260200191505060405180910390f35b3480156101e757600080fd5b50610230600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050610a7b565b6040518082815260200191505060405180910390f35b34801561025257600080fd5b50610285600480360381019080803590602001909291908035906020019092919080359060200190929190505050610cba565b6040518082815260200191505060405180910390f35b3480156102a757600080fd5b506102dc600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610de7565b6040518082815260200191505060405180910390f35b3480156102fe57600080fd5b50610333600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610dff565b6040518082815260200191505060405180910390f35b34801561035557600080fd5b5061037460048036038101908080359060200190929190505050610ef7565b604051808215151515815260200191505060405180910390f35b34801561039a57600080fd5b506103b960048036038101908080359060200190929190505050610f46565b604051808215151515815260200191505060405180910390f35b3480156103df57600080fd5b506103fe60048036038101908080359060200190929190505050611009565b604051808681526020018581526020018481526020018381526020018281526020019550505050505060405180910390f35b34801561043c57600080fd5b50610471600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061103f565b6040518082815260200191505060405180910390f35b34801561049357600080fd5b506104d4600480360381019080803590602001909291908035600019169060200190929190803590602001909291908035906020019092919050505061105a565b005b3480156104e257600080fd5b50610521600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611733565b604051808215151515815260200191505060405180910390f35b34801561054757600080fd5b5061059a6004803603810190808035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506117b2565b604051808215151515815260200191505060405180910390f35b3480156105c057600080fd5b506105df600480360381019080803590602001909291905050506117f6565b604051808215151515815260200191505060405180910390f35b34801561060557600080fd5b5061060e611811565b6040518082815260200191505060405180910390f35b34801561063057600080fd5b5061064f60048036038101908080359060200190929190505050611817565b005b34801561065d57600080fd5b5061069c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a4c565b60405180826000191660001916815260200191505060405180910390f35b3480156106c657600080fd5b506106e560048036038101908080359060200190929190505050611b1b565b005b3480156106f357600080fd5b5061071260048036038101908080359060200190929190505050611e46565b604051808215151515815260200191505060405180910390f35b34801561073857600080fd5b50610777600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611e83565b604051808215151515815260200191505060405180910390f35b34801561079d57600080fd5b506107d0600480360381019080803590602001909291908035906020019092919080359060200190929190505050611f02565b005b3480156107de57600080fd5b50610827600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612302565b6040518082815260200191505060405180910390f35b34801561084957600080fd5b50610888600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050612468565b6040518082815260200191505060405180910390f35b3480156108aa57600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061256d565b60405180826000191660001916815260200191505060405180910390f35b34801561091357600080fd5b5061093260048036038101908080359060200190929190505050612675565b604051808215151515815260200191505060405180910390f35b34801561095857600080fd5b5061097760048036038101908080359060200190929190505050612681565b005b34801561098557600080fd5b506109a4600480360381019080803590602001909291905050506128e0565b604051808215151515815260200191505060405180910390f35b3480156109ca57600080fd5b506109d361291c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6000610a20826128e0565b1515610a2b57600080fd5b610a3482610f46565b15610a575760016000838152602001908152602001600020600301549050610a71565b600160008381526020019081526020016000206004015490505b919050565b600081565b6000806000610a8986610dff565b9150610a958683612468565b90505b600082141515610cad57610aac8683612468565b90508481111515610bb85783821415610bb057600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610b7257600080fd5b505af4158015610b86573d6000803e3d6000fd5b505050506040513d6020811015610b9c57600080fd5b810190808051906020019092919050505091505b819250610cb1565b600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610c6b57600080fd5b505af4158015610c7f573d6000803e3d6000fd5b505050506040513d6020811015610c9557600080fd5b81019080805190602001909291905050509150610a98565b8192505b50509392505050565b6000806000610cd5600160005461294290919063ffffffff16565b600081905550610cee854261294290919063ffffffff16565b9150610d03848361294290919063ffffffff16565b905060a060405190810160405280838152602001828152602001878152602001600081526020016000815250600160008054815260200190815260200160002060008201518160000155602082015181600101556040820151816002015560608201518160030155608082015181600401559050503373ffffffffffffffffffffffffffffffffffffffff166000547f404f1f1c229d9eb2a949e7584da6ffde9d059ef2169f487ca815434cce0640d088858560405180848152602001838152602001828152602001935050505060405180910390a3600054925050509392505050565b60026020528060005260406000206000915090505481565b6000600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a909160006040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610eb557600080fd5b505af4158015610ec9573d6000803e3d6000fd5b505050506040513d6020811015610edf57600080fd5b81019080805190602001909291905050509050919050565b6000610f02826117f6565b1515610f0d57600080fd5b610f2c6001600084815260200190815260200160002060010154612675565b158015610f3f5750610f3d82611e46565b155b9050919050565b6000610f506129af565b610f59836128e0565b1515610f6457600080fd5b6001600084815260200190815260200160002060a06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382015481526020016004820154815250509050610fe8610fd58260800151836060015161294290919063ffffffff16565b826040015161295e90919063ffffffff16565b6110006064836060015161295e90919063ffffffff16565b11915050919050565b60016020528060005260406000206000915090508060000154908060010154908060020154908060030154908060040154905085565b60006110538261104e84610dff565b612468565b9050919050565b60008061106686611e46565b151561107157600080fd5b83600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156110bf57600080fd5b600086141515156110cf57600080fd5b60008314806111c85750600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561118c57600080fd5b505af41580156111a0573d6000803e3d6000fd5b505050506040513d60208110156111b657600080fd5b81019080805190602001909291905050505b15156111d357600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561128657600080fd5b505af415801561129a573d6000803e3d6000fd5b505050506040513d60208110156112b057600080fd5b810190808051906020019092919050505091508582146112d057816113bf565b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091886040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561138357600080fd5b505af4158015611397573d6000803e3d6000fd5b505050506040513d60208110156113ad57600080fd5b81019080805190602001909291905050505b91506113cd838333876117b2565b15156113d857600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________639735c51b90918589866040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184815260200183815260200182815260200194505050505060006040518083038186803b15801561149b57600080fd5b505af41580156114af573d6000803e3d6000fd5b505050506114bd3387611a4c565b9050600473__AttributeStore________________________63977aa031909183876040518463ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180848152602001836000191660001916815260200180602001838152602001828103825260098152602001807f6e756d546f6b656e73000000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561157e57600080fd5b505af4158015611592573d6000803e3d6000fd5b50505050600473__AttributeStore________________________63977aa03190918388600190046040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018360001916600019168152602001806020018381526020018281038252600a8152602001807f636f6d6d6974486173680000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561165957600080fd5b505af415801561166d573d6000803e3d6000fd5b50505050600180600088815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16867fea7979e4280d7e6bffc1c7d83a1ac99f16d02ecc14465ce41016226783b663d7866040518082815260200191505060405180910390a3505050505050565b600061173e826117f6565b151561174957600080fd5b6001600083815260200190815260200160002060050160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b60008060006117c18588612468565b84101591506117d08587612468565b841115806117de5750600086145b90508180156117ea5750805b92505050949350505050565b600080821415801561180a57506000548211155b9050919050565b60005481565b6118366001600083815260200190815260200160002060010154612675565b151561184157600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b1580156118f457600080fd5b505af4158015611908573d6000803e3d6000fd5b505050506040513d602081101561191e57600080fd5b8101908080519060200190929190505050151561193a57600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156119ed57600080fd5b505af4158015611a01573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff16817f402507661c8c8cb90e0a796450b8bdd28b6c516f05279c0cd29e84c344e1699a60405160405180910390a350565b60008282604051602001808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611ae65780518252602082019150602081019050602083039250611ac1565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905092915050565b80600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231336040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015611bd957600080fd5b505af1158015611bed573d6000803e3d6000fd5b505050506040513d6020811015611c0357600080fd5b810190808051906020019092919050505010151515611c2157600080fd5b611c7381600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461294290919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330846040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611daf57600080fd5b505af1158015611dc3573d6000803e3d6000fd5b505050506040513d6020811015611dd957600080fd5b81019080805190602001909291905050501515611df557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ff7aaf024511d9982df8cd0d437c71c30106e6848cd1ba3d288d7a9c0e276aeda826040518082815260200191505060405180910390a250565b6000611e51826117f6565b1515611e5c57600080fd5b611e7b6001600084815260200190815260200160002060000154612675565b159050919050565b6000611e8e826117f6565b1515611e9957600080fd5b6001600083815260200190815260200160002060060160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000611f0d84610ef7565b1515611f1857600080fd5b6001600085815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611f8457600080fd5b6001600085815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611ff157600080fd5b611ffb338561256d565b60001916838360405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561205c5780518252602082019150602081019050602083039250612037565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151561209957600080fd5b6120a33385612468565b905060018314156120f6576120d781600160008781526020019081526020016000206003015461294290919063ffffffff16565b600160008681526020019081526020016000206003018190555061213a565b61211f81600160008781526020019081526020016000206004015461294290919063ffffffff16565b60016000868152602001908152602001600020600401819055505b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091866040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156121ed57600080fd5b505af4158015612201573d6000803e3d6000fd5b50505050600180600086815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff1683857ff42c78852433ace4bdcb44f6e80c8daae529e2d999c88cf6bf8f77b1e2890fdd84600160008a815260200190815260200160002060030154600160008b81526020019081526020016000206004015460405180848152602001838152602001828152602001935050505060405180910390a450505050565b600080600080612311866128e0565b151561231c57600080fd5b6001600087815260200190815260200160002060060160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151561238857600080fd5b61239186610f46565b61239c57600061239f565b60015b60ff169250828560405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561240157805182526020820191506020810190506020830392506123dc565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020915061243a878761256d565b90508060001916826000191614151561245257600080fd5b61245c8787612468565b93505050509392505050565b6000600473__AttributeStore________________________6350389f5c90916124928686611a4c565b6040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180838152602001826000191660001916815260200180602001828103825260098152602001807f6e756d546f6b656e730000000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561252a57600080fd5b505af415801561253e573d6000803e3d6000fd5b505050506040513d602081101561255457600080fd5b8101908080519060200190929190505050905092915050565b6000600473__AttributeStore________________________6350389f5c90916125978686611a4c565b6040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018260001916600019168152602001806020018281038252600a8152602001807f636f6d6d69744861736800000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561262f57600080fd5b505af4158015612643573d6000803e3d6000fd5b505050506040513d602081101561265957600080fd5b8101908080519060200190929190505050600102905092915050565b60008142119050919050565b60006126dd61268f3361103f565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461299690919063ffffffff16565b90508181101515156126ee57600080fd5b61274082600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461299690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561284857600080fd5b505af115801561285c573d6000803e3d6000fd5b505050506040513d602081101561287257600080fd5b8101908080519060200190929190505050151561288e57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ffaeb7dbb9992397d26ea1944efd40c80b40f702faf69b46c67ad10aba68ccb79836040518082815260200191505060405180910390a25050565b60006128eb826117f6565b15156128f657600080fd5b6129156001600084815260200190815260200160002060010154612675565b9050919050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000818301905082811015151561295557fe5b80905092915050565b6000808314156129715760009050612990565b818302905081838281151561298257fe5b0414151561298c57fe5b8090505b92915050565b60008282111515156129a457fe5b818303905092915050565b60a060405190810160405280600081526020016000815260200160008152602001600081526020016000815250905600a165627a7a72305820a152c82a1b5f7dc5e7b81695dfaacb87b38cef76fc0319d53621bd28fc6c9ac00029", + "deployedBytecode": "0x60806040526004361061016a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063053e71a61461016f5780632173a10f146101b05780632c052031146101db57806332ed3d60146102465780633b9302941461029b578063427fa1d2146102f2578063441c77c014610349578063494031831461038e5780636148fed5146103d35780636b2d95d4146104305780636cbf9c5e146104875780637f97e836146104d6578063819b02931461053b57806388d21ff3146105b457806397508f36146105f95780639760356014610624578063a1103f3714610651578063a25236fe146106ba578063a4439dc5146106e7578063aa7ca4641461072c578063b11d8bb814610791578063b43bd069146107d2578063d13820921461083d578063d901402b1461089e578063d9548e5314610907578063e7b1d43c1461094c578063ee68483014610979578063fc0c546a146109be575b600080fd5b34801561017b57600080fd5b5061019a60048036038101908080359060200190929190505050610a15565b6040518082815260200191505060405180910390f35b3480156101bc57600080fd5b506101c5610a76565b6040518082815260200191505060405180910390f35b3480156101e757600080fd5b50610230600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050610a7b565b6040518082815260200191505060405180910390f35b34801561025257600080fd5b50610285600480360381019080803590602001909291908035906020019092919080359060200190929190505050610cba565b6040518082815260200191505060405180910390f35b3480156102a757600080fd5b506102dc600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610de7565b6040518082815260200191505060405180910390f35b3480156102fe57600080fd5b50610333600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610dff565b6040518082815260200191505060405180910390f35b34801561035557600080fd5b5061037460048036038101908080359060200190929190505050610ef7565b604051808215151515815260200191505060405180910390f35b34801561039a57600080fd5b506103b960048036038101908080359060200190929190505050610f46565b604051808215151515815260200191505060405180910390f35b3480156103df57600080fd5b506103fe60048036038101908080359060200190929190505050611009565b604051808681526020018581526020018481526020018381526020018281526020019550505050505060405180910390f35b34801561043c57600080fd5b50610471600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061103f565b6040518082815260200191505060405180910390f35b34801561049357600080fd5b506104d4600480360381019080803590602001909291908035600019169060200190929190803590602001909291908035906020019092919050505061105a565b005b3480156104e257600080fd5b50610521600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611733565b604051808215151515815260200191505060405180910390f35b34801561054757600080fd5b5061059a6004803603810190808035906020019092919080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506117b2565b604051808215151515815260200191505060405180910390f35b3480156105c057600080fd5b506105df600480360381019080803590602001909291905050506117f6565b604051808215151515815260200191505060405180910390f35b34801561060557600080fd5b5061060e611811565b6040518082815260200191505060405180910390f35b34801561063057600080fd5b5061064f60048036038101908080359060200190929190505050611817565b005b34801561065d57600080fd5b5061069c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a4c565b60405180826000191660001916815260200191505060405180910390f35b3480156106c657600080fd5b506106e560048036038101908080359060200190929190505050611b1b565b005b3480156106f357600080fd5b5061071260048036038101908080359060200190929190505050611e46565b604051808215151515815260200191505060405180910390f35b34801561073857600080fd5b50610777600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611e83565b604051808215151515815260200191505060405180910390f35b34801561079d57600080fd5b506107d0600480360381019080803590602001909291908035906020019092919080359060200190929190505050611f02565b005b3480156107de57600080fd5b50610827600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612302565b6040518082815260200191505060405180910390f35b34801561084957600080fd5b50610888600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050612468565b6040518082815260200191505060405180910390f35b3480156108aa57600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061256d565b60405180826000191660001916815260200191505060405180910390f35b34801561091357600080fd5b5061093260048036038101908080359060200190929190505050612675565b604051808215151515815260200191505060405180910390f35b34801561095857600080fd5b5061097760048036038101908080359060200190929190505050612681565b005b34801561098557600080fd5b506109a4600480360381019080803590602001909291905050506128e0565b604051808215151515815260200191505060405180910390f35b3480156109ca57600080fd5b506109d361291c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6000610a20826128e0565b1515610a2b57600080fd5b610a3482610f46565b15610a575760016000838152602001908152602001600020600301549050610a71565b600160008381526020019081526020016000206004015490505b919050565b600081565b6000806000610a8986610dff565b9150610a958683612468565b90505b600082141515610cad57610aac8683612468565b90508481111515610bb85783821415610bb057600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610b7257600080fd5b505af4158015610b86573d6000803e3d6000fd5b505050506040513d6020811015610b9c57600080fd5b810190808051906020019092919050505091505b819250610cb1565b600360008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a9091846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610c6b57600080fd5b505af4158015610c7f573d6000803e3d6000fd5b505050506040513d6020811015610c9557600080fd5b81019080805190602001909291905050509150610a98565b8192505b50509392505050565b6000806000610cd5600160005461294290919063ffffffff16565b600081905550610cee854261294290919063ffffffff16565b9150610d03848361294290919063ffffffff16565b905060a060405190810160405280838152602001828152602001878152602001600081526020016000815250600160008054815260200190815260200160002060008201518160000155602082015181600101556040820151816002015560608201518160030155608082015181600401559050503373ffffffffffffffffffffffffffffffffffffffff166000547f404f1f1c229d9eb2a949e7584da6ffde9d059ef2169f487ca815434cce0640d088858560405180848152602001838152602001828152602001935050505060405180910390a3600054925050509392505050565b60026020528060005260406000206000915090505481565b6000600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6330fe0a0a909160006040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b158015610eb557600080fd5b505af4158015610ec9573d6000803e3d6000fd5b505050506040513d6020811015610edf57600080fd5b81019080805190602001909291905050509050919050565b6000610f02826117f6565b1515610f0d57600080fd5b610f2c6001600084815260200190815260200160002060010154612675565b158015610f3f5750610f3d82611e46565b155b9050919050565b6000610f506129af565b610f59836128e0565b1515610f6457600080fd5b6001600084815260200190815260200160002060a06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382015481526020016004820154815250509050610fe8610fd58260800151836060015161294290919063ffffffff16565b826040015161295e90919063ffffffff16565b6110006064836060015161295e90919063ffffffff16565b11915050919050565b60016020528060005260406000206000915090508060000154908060010154908060020154908060030154908060040154905085565b60006110538261104e84610dff565b612468565b9050919050565b60008061106686611e46565b151561107157600080fd5b83600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156110bf57600080fd5b600086141515156110cf57600080fd5b60008314806111c85750600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561118c57600080fd5b505af41580156111a0573d6000803e3d6000fd5b505050506040513d60208110156111b657600080fd5b81019080805190602001909291905050505b15156111d357600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561128657600080fd5b505af415801561129a573d6000803e3d6000fd5b505050506040513d60208110156112b057600080fd5b810190808051906020019092919050505091508582146112d057816113bf565b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________6307d29ac99091886040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b15801561138357600080fd5b505af4158015611397573d6000803e3d6000fd5b505050506040513d60208110156113ad57600080fd5b81019080805190602001909291905050505b91506113cd838333876117b2565b15156113d857600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________639735c51b90918589866040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184815260200183815260200182815260200194505050505060006040518083038186803b15801561149b57600080fd5b505af41580156114af573d6000803e3d6000fd5b505050506114bd3387611a4c565b9050600473__AttributeStore________________________63977aa031909183876040518463ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180848152602001836000191660001916815260200180602001838152602001828103825260098152602001807f6e756d546f6b656e73000000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561157e57600080fd5b505af4158015611592573d6000803e3d6000fd5b50505050600473__AttributeStore________________________63977aa03190918388600190046040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018360001916600019168152602001806020018381526020018281038252600a8152602001807f636f6d6d6974486173680000000000000000000000000000000000000000000081525060200194505050505060006040518083038186803b15801561165957600080fd5b505af415801561166d573d6000803e3d6000fd5b50505050600180600088815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16867fea7979e4280d7e6bffc1c7d83a1ac99f16d02ecc14465ce41016226783b663d7866040518082815260200191505060405180910390a3505050505050565b600061173e826117f6565b151561174957600080fd5b6001600083815260200190815260200160002060050160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b60008060006117c18588612468565b84101591506117d08587612468565b841115806117de5750600086145b90508180156117ea5750805b92505050949350505050565b600080821415801561180a57506000548211155b9050919050565b60005481565b6118366001600083815260200190815260200160002060010154612675565b151561184157600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________63366a5ba29091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060206040518083038186803b1580156118f457600080fd5b505af4158015611908573d6000803e3d6000fd5b505050506040513d602081101561191e57600080fd5b8101908080519060200190929190505050151561193a57600080fd5b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156119ed57600080fd5b505af4158015611a01573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff16817f402507661c8c8cb90e0a796450b8bdd28b6c516f05279c0cd29e84c344e1699a60405160405180910390a350565b60008282604051602001808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401828152602001925050506040516020818303038152906040526040518082805190602001908083835b602083101515611ae65780518252602082019150602081019050602083039250611ac1565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905092915050565b80600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231336040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015611bd957600080fd5b505af1158015611bed573d6000803e3d6000fd5b505050506040513d6020811015611c0357600080fd5b810190808051906020019092919050505010151515611c2157600080fd5b611c7381600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461294290919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330846040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611daf57600080fd5b505af1158015611dc3573d6000803e3d6000fd5b505050506040513d6020811015611dd957600080fd5b81019080805190602001909291905050501515611df557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ff7aaf024511d9982df8cd0d437c71c30106e6848cd1ba3d288d7a9c0e276aeda826040518082815260200191505060405180910390a250565b6000611e51826117f6565b1515611e5c57600080fd5b611e7b6001600084815260200190815260200160002060000154612675565b159050919050565b6000611e8e826117f6565b1515611e9957600080fd5b6001600083815260200190815260200160002060060160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000611f0d84610ef7565b1515611f1857600080fd5b6001600085815260200190815260200160002060050160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611f8457600080fd5b6001600085815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611ff157600080fd5b611ffb338561256d565b60001916838360405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561205c5780518252602082019150602081019050602083039250612037565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151561209957600080fd5b6120a33385612468565b905060018314156120f6576120d781600160008781526020019081526020016000206003015461294290919063ffffffff16565b600160008681526020019081526020016000206003018190555061213a565b61211f81600160008781526020019081526020016000206004015461294290919063ffffffff16565b60016000868152602001908152602001600020600401819055505b600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002073__DLL___________________________________636d900ed09091866040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018281526020019250505060006040518083038186803b1580156121ed57600080fd5b505af4158015612201573d6000803e3d6000fd5b50505050600180600086815260200190815260200160002060060160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff1683857ff42c78852433ace4bdcb44f6e80c8daae529e2d999c88cf6bf8f77b1e2890fdd84600160008a815260200190815260200160002060030154600160008b81526020019081526020016000206004015460405180848152602001838152602001828152602001935050505060405180910390a450505050565b600080600080612311866128e0565b151561231c57600080fd5b6001600087815260200190815260200160002060060160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151561238857600080fd5b61239186610f46565b61239c57600061239f565b60015b60ff169250828560405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561240157805182526020820191506020810190506020830392506123dc565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020915061243a878761256d565b90508060001916826000191614151561245257600080fd5b61245c8787612468565b93505050509392505050565b6000600473__AttributeStore________________________6350389f5c90916124928686611a4c565b6040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180838152602001826000191660001916815260200180602001828103825260098152602001807f6e756d546f6b656e730000000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561252a57600080fd5b505af415801561253e573d6000803e3d6000fd5b505050506040513d602081101561255457600080fd5b8101908080519060200190929190505050905092915050565b6000600473__AttributeStore________________________6350389f5c90916125978686611a4c565b6040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808381526020018260001916600019168152602001806020018281038252600a8152602001807f636f6d6d69744861736800000000000000000000000000000000000000000000815250602001935050505060206040518083038186803b15801561262f57600080fd5b505af4158015612643573d6000803e3d6000fd5b505050506040513d602081101561265957600080fd5b8101908080519060200190929190505050600102905092915050565b60008142119050919050565b60006126dd61268f3361103f565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461299690919063ffffffff16565b90508181101515156126ee57600080fd5b61274082600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461299690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561284857600080fd5b505af115801561285c573d6000803e3d6000fd5b505050506040513d602081101561287257600080fd5b8101908080519060200190929190505050151561288e57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167ffaeb7dbb9992397d26ea1944efd40c80b40f702faf69b46c67ad10aba68ccb79836040518082815260200191505060405180910390a25050565b60006128eb826117f6565b15156128f657600080fd5b6129156001600084815260200190815260200160002060010154612675565b9050919050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000818301905082811015151561295557fe5b80905092915050565b6000808314156129715760009050612990565b818302905081838281151561298257fe5b0414151561298c57fe5b8090505b92915050565b60008282111515156129a457fe5b818303905092915050565b60a060405190810160405280600081526020016000815260200160008152602001600081526020016000815250905600a165627a7a72305820a152c82a1b5f7dc5e7b81695dfaacb87b38cef76fc0319d53621bd28fc6c9ac00029", + "sourceMap": "252:17191:6:-;;;2286:111;8:9:-1;5:2;;;30:1;27;20:12;5:2;2286:111:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2345:10;2331:5;;:25;;;;;;;;;;;;;;;;;;1728:1;2362:9;:30;;;;2286:111;252:17191;;;;;;", + "deployedSourceMap": "252:17191:6:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10705:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10705:258:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1686:43;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1686:43:6;;;;;;;;;;;;;;;;;;;;;;;15573:1074;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15573:1074:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9347:608;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9347:608:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1829:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1829:48:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14457:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14457:114:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11975:203;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11975:203:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10162:245;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10162:245:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1759:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1759:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14748:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14748:137:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4600:1213;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4600:1213:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12420:173;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12420:173:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6301:399;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6301:399:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13189:124;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13189:124:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1733:21;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1733:21:6;;;;;;;;;;;;;;;;;;;;;;;3793:244;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3793:244:6;;;;;;;;;;;;;;;;;;;;;;;;;;17298:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;17298:143:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2742:315;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2742:315:6;;;;;;;;;;;;;;;;;;;;;;;;;;11585:171;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11585:171:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12833:172;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12833:172:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7048:1199;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7048:1199:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8461:467;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8461:467:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14094:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14094:165:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13656:180;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13656:180:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16947:131;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16947:131:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3255:386;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3255:386:6;;;;;;;;;;;;;;;;;;;;;;;;;;11137:160;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11137:160:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1995:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1995:18:6;;;;;;;;;;;;;;;;;;;;;;;;;;;10705:258;10788:14;10818:18;10828:7;10818:9;:18::i;:::-;10810:27;;;;;;;;10848:17;10857:7;10848:8;:17::i;:::-;10844:114;;;10880:7;:16;10888:7;10880:16;;;;;;;;;;;:25;;;10873:32;;;;10844:114;10929:7;:16;10937:7;10929:16;;;;;;;;;;;:29;;;10922:36;;10705:258;;;;:::o;1686:43::-;1728:1;1686:43;:::o;15573:1074::-;15679:13;15777:11;15816:17;15791:19;15803:6;15791:11;:19::i;:::-;15777:33;;15836:28;15849:6;15857;15836:12;:28::i;:::-;15816:48;;15942:587;15959:1;15949:6;:11;;15942:587;;;16039:28;16052:6;16060;16039:12;:28::i;:::-;16024:43;;16095:10;16079:12;:26;;16075:312;;;16161:7;16151:6;:17;16147:173;;;16279:6;:14;16286:6;16279:14;;;;;;;;;;;;;;;:22;;;;16302:6;16279:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16279:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16279:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16279:30:6;;;;;;;;;;;;;;;;16270:39;;16147:173;16371:6;16364:13;;;;16075:312;16492:6;:14;16499:6;16492:14;;;;;;;;;;;;;;;:22;;;;16515:6;16492:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16492:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16492:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16492:30:6;;;;;;;;;;;;;;;;16483:39;;15942:587;;;16636:6;16629:13;;15573:1074;;;;;;;;:::o;9347:608::-;9444:11;9498:18;9561;9475:16;9489:1;9475:9;;:13;;:16;;;;:::i;:::-;9463:9;:28;;;;9519:36;9539:15;9519;:19;;:36;;;;:::i;:::-;9498:57;;9582:34;9600:15;9582:13;:17;;:34;;;;:::i;:::-;9561:55;;9644:157;;;;;;;;;9703:13;9644:157;;;;9739:13;9644:157;;;;9669:11;9644:157;;;;9770:1;9644:157;;;;9793:1;9644:157;;;9623:7;:18;9631:9;;9623:18;;;;;;;;;;;:178;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9911:10;9813:114;;9894:9;;9813:114;9833:11;9852:13;9873;9813:114;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9941:9;;9934:16;;9347:608;;;;;;;:::o;1829:48::-;;;;;;;;;;;;;;;;;:::o;14457:114::-;14515:11;14541:6;:14;14548:6;14541:14;;;;;;;;;;;;;;;:22;;;;14564:1;14541:25;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14541:25:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14541:25:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14541:25:6;;;;;;;;;;;;;;;;14534:32;;14457:114;;;:::o;11975:203::-;12038:11;12065:19;12076:7;12065:10;:19::i;:::-;12057:28;;;;;;;;12100:41;12110:7;:16;12118:7;12110:16;;;;;;;;;;;:30;;;12100:9;:41::i;:::-;12099:42;:74;;;;;12146:27;12165:7;12146:18;:27::i;:::-;12145:28;12099:74;12092:81;;11975:203;;;:::o;10162:245::-;10215:11;10268:16;;:::i;:::-;10242:18;10252:7;10242:9;:18::i;:::-;10234:27;;;;;;;;10287:7;:16;10295:7;10287:16;;;;;;;;;;;10268:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10344:57;10364:36;10382:4;:17;;;10364:4;:13;;;:17;;:36;;;;:::i;:::-;10344:4;:15;;;:19;;:57;;;;:::i;:::-;10317:22;10335:3;10317:4;:13;;;:17;;:22;;;;:::i;:::-;10316:86;10309:93;;10162:245;;;;:::o;1759:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;14748:137::-;14810:14;14839:41;14852:6;14860:19;14872:6;14860:11;:19::i;:::-;14839:12;:41::i;:::-;14832:48;;14748:137;;;:::o;4600:1213::-;5112:15;5535:12;4735:27;4754:7;4735:18;:27::i;:::-;4727:36;;;;;;;;4809:10;4777:16;:28;4794:10;4777:28;;;;;;;;;;;;;;;;:42;;4769:51;;;;;;;;4879:1;4868:7;:12;;4860:21;;;;;;;;5059:1;5044:11;:16;:60;;;;5064:6;:18;5071:10;5064:18;;;;;;;;;;;;;;;:27;;;;5092:11;5064:40;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5064:40:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5064:40:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5064:40:6;;;;;;;;;;;;;;;;5044:60;5036:69;;;;;;;;5130:6;:18;5137:10;5130:18;;;;;;;;;;;;;;;:26;;;;5157:11;5130:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5130:39:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5130:39:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5130:39:6;;;;;;;;;;;;;;;;5112:57;;5272:7;5258:10;:21;5257:74;;5321:10;5257:74;;;5283:6;:18;5290:10;5283:18;;;;;;;;;;;;;;;:26;;;;5310:7;5283:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5283:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5283:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5283:35:6;;;;;;;;;;;;;;;;5257:74;5244:87;;5353:103;5376:11;5397:10;5418;5438;5353:13;:103::i;:::-;5338:124;;;;;;;;5469:6;:18;5476:10;5469:18;;;;;;;;;;;;;;;:25;;;;5495:11;5508:7;5517:10;5469:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5469:59:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5469:59:6;;;;5550:29;5559:10;5571:7;5550:8;:29::i;:::-;5535:44;;5586:5;:18;;;;5605:4;5624:10;5586:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5586:49:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5586:49:6;;;;5641:5;:18;;;;5660:4;5685:11;5680:17;;;5641:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5641:57:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5641:57:6;;;;5746:4;5705:7;:16;5713:7;5705:16;;;;;;;;;;;:26;;:38;5732:10;5705:38;;;;;;;;;;;;;;;;:45;;;;;;;;;;;;;;;;;;5797:10;5761:47;;5776:7;5761:47;5785:10;5761:47;;;;;;;;;;;;;;;;;;4600:1213;;;;;;:::o;12420:173::-;12490:14;12520:19;12531:7;12520:10;:19::i;:::-;12512:28;;;;;;;;12554:7;:16;12562:7;12554:16;;;;;;;;;;;:26;;:34;12581:6;12554:34;;;;;;;;;;;;;;;;;;;;;;;;;12547:41;;12420:173;;;;:::o;6301:399::-;6426:10;6446:14;6582;6478:29;6491:6;6499:7;6478:12;:29::i;:::-;6464:10;:43;;6446:62;;6614:29;6627:6;6635:7;6614:12;:29::i;:::-;6600:10;:43;;:59;;;;6658:1;6647:7;:12;6600:59;6582:78;;6673:9;:22;;;;;6686:9;6673:22;6666:29;;6301:399;;;;;;;;:::o;13189:124::-;13244:11;13282:1;13271:7;:12;;:36;;;;;13298:9;;13287:7;:20;;13271:36;13263:45;;13189:124;;;:::o;1733:21::-;;;;:::o;3793:244::-;3852:41;3862:7;:16;3870:7;3862:16;;;;;;;;;;;:30;;;3852:9;:41::i;:::-;3844:50;;;;;;;;3908:6;:18;3915:10;3908:18;;;;;;;;;;;;;;;:27;;;;3936:7;3908:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3908:36:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3908:36:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3908:36:6;;;;;;;;;;;;;;;;3900:45;;;;;;;;3952:6;:18;3959:10;3952:18;;;;;;;;;;;;;;;:25;;;;3978:7;3952:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3952:34:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3952:34:6;;;;4021:10;3997:35;;4012:7;3997:35;;;;;;;;;;3793:244;:::o;17298:143::-;17366:12;17420:5;17427:7;17403:32;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17403:32:6;;;17393:43;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17393:43:6;;;;;;;;;;;;;;;;17386:50;;17298:143;;;;:::o;2742:315::-;2842:10;2811:5;;;;;;;;;;;:15;;;2827:10;2811:27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2811:27:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2811:27:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2811:27:6;;;;;;;;;;;;;;;;:41;;2803:50;;;;;;;;2890:44;2923:10;2890:16;:28;2907:10;2890:28;;;;;;;;;;;;;;;;:32;;:44;;;;:::i;:::-;2859:16;:28;2876:10;2859:28;;;;;;;;;;;;;;;:75;;;;2948:5;;;;;;;;;;;:18;;;2967:10;2979:4;2985:10;2948:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2948:48:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2948:48:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2948:48:6;;;;;;;;;;;;;;;;2940:57;;;;;;;;3041:10;3008:44;;;3029:10;3008:44;;;;;;;;;;;;;;;;;;2742:315;:::o;11585:171::-;11648:11;11675:19;11686:7;11675:10;:19::i;:::-;11667:28;;;;;;;;11710:41;11720:7;:16;11728:7;11720:16;;;;;;;;;;;:30;;;11710:9;:41::i;:::-;11709:42;11702:49;;11585:171;;;:::o;12833:172::-;12903:13;12932:19;12943:7;12932:10;:19::i;:::-;12924:28;;;;;;;;12966:7;:16;12974:7;12966:16;;;;;;;;;;;:26;;:34;12993:6;12966:34;;;;;;;;;;;;;;;;;;;;;;;;;12959:41;;12833:172;;;;:::o;7048:1199::-;7629:14;7180:27;7199:7;7180:18;:27::i;:::-;7172:36;;;;;;;;7222:7;:16;7230:7;7222:16;;;;;;;;;;;:26;;:38;7249:10;7222:38;;;;;;;;;;;;;;;;;;;;;;;;;7214:47;;;;;;;;7353:7;:16;7361:7;7353:16;;;;;;;;;;;:26;;:38;7380:10;7353:38;;;;;;;;;;;;;;;;;;;;;;;;;7352:39;7344:48;;;;;;;;7526:34;7540:10;7552:7;7526:13;:34::i;:::-;7475:85;;;7502:11;7515:5;7485:36;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;7485:36:6;;;7475:47;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;7475:47:6;;;;;;;;;;;;;;;;:85;;;;7467:94;;;;;;;;7646:33;7659:10;7671:7;7646:12;:33::i;:::-;7629:50;;7705:1;7690:11;:16;7686:247;;;7789:40;7819:9;7789:7;:16;7797:7;7789:16;;;;;;;;;;;:25;;;:29;;:40;;;;:::i;:::-;7761:7;:16;7769:7;7761:16;;;;;;;;;;;:25;;:68;;;;7686:247;;;7882:44;7916:9;7882:7;:16;7890:7;7882:16;;;;;;;;;;;:29;;;:33;;:44;;;;:::i;:::-;7850:7;:16;7858:7;7850:16;;;;;;;;;;;:29;;:76;;;;7686:247;7939:6;:18;7946:10;7939:18;;;;;;;;;;;;;;;:25;;;;7965:7;7939:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7939:34:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7939:34:6;;;;8074:4;8033:7;:16;8041:7;8033:16;;;;;;;;;;;:26;;:38;8060:10;8033:38;;;;;;;;;;;;;;;;:45;;;;;;;;;;;;;;;;;;8226:10;8090:152;;8213:11;8111:7;8090:152;8126:9;8143:7;:16;8151:7;8143:16;;;;;;;;;;;:25;;;8176:7;:16;8184:7;8176:16;;;;;;;;;;;:29;;;8090:152;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7048:1199;;;;:::o;8461:467::-;8553:17;8661:18;8713;8789;8586;8596:7;8586:9;:18::i;:::-;8578:27;;;;;;;;8619:7;:16;8627:7;8619:16;;;;;;;;;;;:26;;:34;8646:6;8619:34;;;;;;;;;;;;;;;;;;;;;;;;;8611:43;;;;;;;;8682:17;8691:7;8682:8;:17::i;:::-;:25;;8706:1;8682:25;;;8702:1;8682:25;8661:46;;;;8761:13;8776:5;8744:38;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;8744:38:6;;;8734:49;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;8734:49:6;;;;;;;;;;;;;;;;8713:70;;8810:30;8824:6;8832:7;8810:13;:30::i;:::-;8789:51;;8869:10;8855:24;;;:10;:24;;;;8847:33;;;;;;;;8894:29;8907:6;8915:7;8894:12;:29::i;:::-;8887:36;;8461:467;;;;;;;;:::o;14094:165::-;14167:14;14196:5;:18;;;;14215:25;14224:6;14232:7;14215:8;:25::i;:::-;14196:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14196:58:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14196:58:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14196:58:6;;;;;;;;;;;;;;;;14189:65;;14094:165;;;;:::o;13656:180::-;13730:18;13771:5;:18;;;;13790:25;13799:6;13807:7;13790:8;:25::i;:::-;13771:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13771:59:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13771:59:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13771:59:6;;;;;;;;;;;;;;;;13763:68;;13756:75;;13656:180;;;;:::o;16947:131::-;17010:12;17056:16;17038:15;:34;17030:43;;16947:131;;;:::o;3255:386::-;3317:20;3340:61;3373:27;3389:10;3373:15;:27::i;:::-;3340:16;:28;3357:10;3340:28;;;;;;;;;;;;;;;;:32;;:61;;;;:::i;:::-;3317:84;;3434:10;3415:15;:29;;3407:38;;;;;;;;3482:44;3515:10;3482:16;:28;3499:10;3482:28;;;;;;;;;;;;;;;;:32;;:44;;;;:::i;:::-;3451:16;:28;3468:10;3451:28;;;;;;;;;;;;;;;:75;;;;3540:5;;;;;;;;;;;:14;;;3555:10;3567;3540:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3540:38:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3540:38:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3540:38:6;;;;;;;;;;;;;;;;3532:47;;;;;;;;3625:10;3590:46;;;3613:10;3590:46;;;;;;;;;;;;;;;;;;3255:386;;:::o;11137:160::-;11191:10;11217:19;11228:7;11217:10;:19::i;:::-;11209:28;;;;;;;;11251:41;11261:7;:16;11269:7;11261:16;;;;;;;;;;;:30;;;11251:9;:41::i;:::-;11244:48;;11137:160;;;:::o;1995:18::-;;;;;;;;;;;;;:::o;1213:123:9:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;202:373::-;260:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;531:1;527;:5;523:9;;554:1;549;545;:5;;;;;;;;:10;538:18;;;;;;569:1;562:8;;202:373;;;;;:::o;1041:110::-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;252:17191:6:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o", + "source": "pragma solidity 0.4.24;\n\nimport \"./ERC20.sol\";\nimport \"./DLL.sol\";\nimport \"./AttributeStore.sol\";\nimport \"./SafeMath.sol\";\n\n\n/**\n@title Partial-Lock-Commit-Reveal Voting scheme with ERC20 tokens\n@author Team: Aspyn Palatnick, Cem Ozer, Yorke Rhodes\n*/\ncontract PLCRVoting {\n\n // ============\n // EVENTS:\n // ============\n\n event _VoteCommitted(uint indexed pollID, uint numTokens, address indexed voter);\n event _VoteRevealed(uint indexed pollID, uint numTokens, uint votesFor, uint votesAgainst, uint indexed choice, address indexed voter);\n event _PollCreated(uint voteQuorum, uint commitEndDate, uint revealEndDate, uint indexed pollID, address indexed creator);\n event _VotingRightsGranted(uint numTokens, address indexed voter);\n event _VotingRightsWithdrawn(uint numTokens, address indexed voter);\n event _TokensRescued(uint indexed pollID, address indexed voter);\n\n // ============\n // DATA STRUCTURES:\n // ============\n\n using AttributeStore for AttributeStore.Data;\n using DLL for DLL.Data;\n using SafeMath for uint;\n\n struct Poll {\n uint commitEndDate; /// expiration date of commit period for poll\n uint revealEndDate; /// expiration date of reveal period for poll\n uint voteQuorum; /// number of votes required for a proposal to pass\n uint votesFor; /// tally of votes supporting proposal\n uint votesAgainst; /// tally of votes countering proposal\n mapping(address => bool) didCommit; /// indicates whether an address committed a vote for this poll\n mapping(address => bool) didReveal; /// indicates whether an address revealed a vote for this poll\n }\n\n // ============\n // STATE VARIABLES:\n // ============\n\n uint constant public INITIAL_POLL_NONCE = 0;\n uint public pollNonce;\n\n mapping(uint => Poll) public pollMap; // maps pollID to Poll struct\n mapping(address => uint) public voteTokenBalance; // maps user's address to voteToken balance\n\n mapping(address => DLL.Data) dllMap;\n AttributeStore.Data store;\n\n ERC20 public token;\n\n // ============\n // CONSTRUCTOR:\n // ============\n\n /**\n @dev Initializes voteQuorum, commitDuration, revealDuration, and pollNonce in addition to token contract and trusted mapping\n @param _tokenAddr The address where the ERC20 token contract is deployed\n */\n constructor(address _tokenAddr) public {\n token = ERC20(_tokenAddr);\n pollNonce = INITIAL_POLL_NONCE;\n }\n\n // ================\n // TOKEN INTERFACE:\n // ================\n\n /**\n @notice Loads _numTokens ERC20 tokens into the voting contract for one-to-one voting rights\n @dev Assumes that msg.sender has approved voting contract to spend on their behalf\n @param _numTokens The number of votingTokens desired in exchange for ERC20 tokens\n */\n function requestVotingRights(uint _numTokens) external {\n require(token.balanceOf(msg.sender) >= _numTokens);\n voteTokenBalance[msg.sender] = voteTokenBalance[msg.sender].add(_numTokens);\n require(token.transferFrom(msg.sender, this, _numTokens));\n emit _VotingRightsGranted(_numTokens, msg.sender);\n }\n\n /**\n @notice Withdraw _numTokens ERC20 tokens from the voting contract, revoking these voting rights\n @param _numTokens The number of ERC20 tokens desired in exchange for voting rights\n */\n function withdrawVotingRights(uint _numTokens) external {\n uint availableTokens = voteTokenBalance[msg.sender].sub(getLockedTokens(msg.sender));\n require(availableTokens >= _numTokens);\n voteTokenBalance[msg.sender] = voteTokenBalance[msg.sender].sub(_numTokens);\n require(token.transfer(msg.sender, _numTokens));\n emit _VotingRightsWithdrawn(_numTokens, msg.sender);\n }\n\n /**\n @dev Unlocks tokens locked in unrevealed vote where poll has ended\n @param _pollID Integer identifier associated with the target poll\n */\n function rescueTokens(uint _pollID) external {\n require(isExpired(pollMap[_pollID].revealEndDate));\n require(dllMap[msg.sender].contains(_pollID));\n\n dllMap[msg.sender].remove(_pollID);\n emit _TokensRescued(_pollID, msg.sender);\n }\n\n // =================\n // VOTING INTERFACE:\n // =================\n\n /**\n @notice Commits vote using hash of choice and secret salt to conceal vote until reveal\n @param _pollID Integer identifier associated with target poll\n @param _secretHash Commit keccak256 hash of voter's choice and salt (tightly packed in this order)\n @param _numTokens The number of tokens to be committed towards the target poll\n @param _prevPollID The ID of the poll that the user has voted the maximum number of tokens in which is still less than or equal to numTokens\n */\n function commitVote(\n uint _pollID,\n bytes32 _secretHash,\n uint _numTokens,\n uint _prevPollID\n ) external\n {\n require(commitPeriodActive(_pollID));\n require(voteTokenBalance[msg.sender] >= _numTokens); // prevent user from overspending\n require(_pollID != 0); // prevent user from committing to zero node placeholder\n\n // Check if _prevPollID exists in the user's DLL or if _prevPollID is 0\n require(_prevPollID == 0 || dllMap[msg.sender].contains(_prevPollID));\n\n uint nextPollID = dllMap[msg.sender].getNext(_prevPollID);\n\n // if nextPollID is equal to _pollID, _pollID is being updated,\n nextPollID = (nextPollID == _pollID) ? dllMap[msg.sender].getNext(_pollID) : nextPollID;\n\n require(\n validPosition(\n _prevPollID,\n nextPollID, \n msg.sender,\n _numTokens\n )\n );\n\n dllMap[msg.sender].insert(_prevPollID, _pollID, nextPollID);\n\n bytes32 UUID = attrUUID(msg.sender, _pollID);\n\n store.setAttribute(UUID, \"numTokens\", _numTokens);\n store.setAttribute(UUID, \"commitHash\", uint(_secretHash));\n\n pollMap[_pollID].didCommit[msg.sender] = true;\n emit _VoteCommitted(_pollID, _numTokens, msg.sender);\n }\n\n /**\n @dev Compares previous and next poll's committed tokens for sorting purposes\n @param _prevID Integer identifier associated with previous poll in sorted order\n @param _nextID Integer identifier associated with next poll in sorted order\n @param _voter Address of user to check DLL position for\n @param _numTokens The number of tokens to be committed towards the poll (used for sorting)\n @return valid Boolean indication of if the specified position maintains the sort\n */\n function validPosition(\n uint _prevID,\n uint _nextID,\n address _voter,\n uint _numTokens\n ) public view returns (bool valid)\n {\n bool prevValid = (_numTokens >= getNumTokens(_voter, _prevID));\n // if next is zero node, _numTokens does not need to be greater\n bool nextValid = (_numTokens <= getNumTokens(_voter, _nextID) || _nextID == 0);\n return prevValid && nextValid;\n }\n\n /**\n @notice Reveals vote with choice and secret salt used in generating commitHash to attribute committed tokens\n @param _pollID Integer identifier associated with target poll\n @param _voteOption Vote choice used to generate commitHash for associated poll\n @param _salt Secret number used to generate commitHash for associated poll\n */\n function revealVote(uint _pollID, uint _voteOption, uint _salt) external {\n // Make sure the reveal period is active\n require(revealPeriodActive(_pollID));\n require(pollMap[_pollID].didCommit[msg.sender]); // make sure user has committed a vote for this poll\n require(!pollMap[_pollID].didReveal[msg.sender]); // prevent user from revealing multiple times\n require(keccak256(abi.encodePacked(_voteOption, _salt)) == getCommitHash(msg.sender, _pollID)); // compare resultant hash from inputs to original commitHash\n\n uint numTokens = getNumTokens(msg.sender, _pollID);\n\n if (_voteOption == 1) {// apply numTokens to appropriate poll choice\n pollMap[_pollID].votesFor = pollMap[_pollID].votesFor.add(numTokens);\n } else {\n pollMap[_pollID].votesAgainst = pollMap[_pollID].votesAgainst.add(numTokens);\n }\n\n dllMap[msg.sender].remove(_pollID); // remove the node referring to this vote upon reveal\n pollMap[_pollID].didReveal[msg.sender] = true;\n\n emit _VoteRevealed(\n _pollID,\n numTokens,\n pollMap[_pollID].votesFor,\n pollMap[_pollID].votesAgainst,\n _voteOption, msg.sender\n );\n }\n\n /**\n @param _pollID Integer identifier associated with target poll\n @param _salt Arbitrarily chosen integer used to generate secretHash\n @return correctVotes Number of tokens voted for winning option\n */\n function getNumPassingTokens(address _voter, uint _pollID, uint _salt) public view returns (uint correctVotes) {\n require(pollEnded(_pollID));\n require(pollMap[_pollID].didReveal[_voter]);\n\n uint winningChoice = isPassed(_pollID) ? 1 : 0;\n bytes32 winnerHash = keccak256(abi.encodePacked(winningChoice, _salt));\n bytes32 commitHash = getCommitHash(_voter, _pollID);\n\n require(winnerHash == commitHash);\n\n return getNumTokens(_voter, _pollID);\n }\n\n // ==================\n // POLLING INTERFACE:\n // ==================\n\n /**\n @dev Initiates a poll with canonical configured parameters at pollID emitted by PollCreated event\n @param _voteQuorum Type of majority (out of 100) that is necessary for poll to be successful\n @param _commitDuration Length of desired commit period in seconds\n @param _revealDuration Length of desired reveal period in seconds\n */\n function startPoll(uint _voteQuorum, uint _commitDuration, uint _revealDuration) public returns (uint pollID) {\n pollNonce = pollNonce.add(1);\n\n uint commitEndDate = block.timestamp.add(_commitDuration);\n uint revealEndDate = commitEndDate.add(_revealDuration);\n\n pollMap[pollNonce] = Poll({\n voteQuorum: _voteQuorum,\n commitEndDate: commitEndDate,\n revealEndDate: revealEndDate,\n votesFor: 0,\n votesAgainst: 0\n });\n\n emit _PollCreated(\n _voteQuorum,\n commitEndDate,\n revealEndDate,\n pollNonce,\n msg.sender\n );\n\n return pollNonce;\n }\n\n /**\n @notice Determines if proposal has passed\n @dev Check if votesFor out of totalVotes exceeds votesQuorum (requires pollEnded)\n @param _pollID Integer identifier associated with target poll\n */\n function isPassed(uint _pollID) view public returns (bool passed) {\n require(pollEnded(_pollID));\n\n Poll memory poll = pollMap[_pollID];\n return (poll.votesFor.mul(100)) > (poll.voteQuorum.mul(poll.votesFor.add(poll.votesAgainst)));\n }\n\n // ----------------\n // POLLING HELPERS:\n // ----------------\n\n /**\n @dev Gets the total winning votes for reward distribution purposes\n @param _pollID Integer identifier associated with target poll\n @return Total number of votes committed to the winning option for specified poll\n */\n function getTotalNumberOfTokensForWinningOption(uint _pollID) view public returns (uint numTokens) {\n require(pollEnded(_pollID));\n\n if (isPassed(_pollID))\n return pollMap[_pollID].votesFor;\n else\n return pollMap[_pollID].votesAgainst;\n }\n\n /**\n @notice Determines if poll is over\n @dev Checks isExpired for specified poll's revealEndDate\n @return Boolean indication of whether polling period is over\n */\n function pollEnded(uint _pollID) view public returns (bool ended) {\n require(pollExists(_pollID));\n\n return isExpired(pollMap[_pollID].revealEndDate);\n }\n\n /**\n @notice Checks if the commit period is still active for the specified poll\n @dev Checks isExpired for the specified poll's commitEndDate\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of isCommitPeriodActive for target poll\n */\n function commitPeriodActive(uint _pollID) view public returns (bool active) {\n require(pollExists(_pollID));\n\n return !isExpired(pollMap[_pollID].commitEndDate);\n }\n\n /**\n @notice Checks if the reveal period is still active for the specified poll\n @dev Checks isExpired for the specified poll's revealEndDate\n @param _pollID Integer identifier associated with target poll\n */\n function revealPeriodActive(uint _pollID) view public returns (bool active) {\n require(pollExists(_pollID));\n\n return !isExpired(pollMap[_pollID].revealEndDate) && !commitPeriodActive(_pollID);\n }\n\n /**\n @dev Checks if user has committed for specified poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of whether user has committed\n */\n function didCommit(address _voter, uint _pollID) view public returns (bool committed) {\n require(pollExists(_pollID));\n\n return pollMap[_pollID].didCommit[_voter];\n }\n\n /**\n @dev Checks if user has revealed for specified poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Boolean indication of whether user has revealed\n */\n function didReveal(address _voter, uint _pollID) view public returns (bool revealed) {\n require(pollExists(_pollID));\n\n return pollMap[_pollID].didReveal[_voter];\n }\n\n /**\n @dev Checks if a poll exists\n @param _pollID The pollID whose existance is to be evaluated.\n @return Boolean Indicates whether a poll exists for the provided pollID\n */\n function pollExists(uint _pollID) view public returns (bool exists) {\n return (_pollID != 0 && _pollID <= pollNonce);\n }\n\n // ---------------------------\n // DOUBLE-LINKED-LIST HELPERS:\n // ---------------------------\n\n /**\n @dev Gets the bytes32 commitHash property of target poll\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Bytes32 hash property attached to target poll\n */\n function getCommitHash(address _voter, uint _pollID) view public returns (bytes32 commitHash) {\n return bytes32(store.getAttribute(attrUUID(_voter, _pollID), \"commitHash\"));\n }\n\n /**\n @dev Wrapper for getAttribute with attrName=\"numTokens\"\n @param _voter Address of user to check against\n @param _pollID Integer identifier associated with target poll\n @return Number of tokens committed to poll in sorted poll-linked-list\n */\n function getNumTokens(address _voter, uint _pollID) view public returns (uint numTokens) {\n return store.getAttribute(attrUUID(_voter, _pollID), \"numTokens\");\n }\n\n /**\n @dev Gets top element of sorted poll-linked-list\n @param _voter Address of user to check against\n @return Integer identifier to poll with maximum number of tokens committed to it\n */\n function getLastNode(address _voter) view public returns (uint pollID) {\n return dllMap[_voter].getPrev(0);\n }\n\n /**\n @dev Gets the numTokens property of getLastNode\n @param _voter Address of user to check against\n @return Maximum number of tokens committed in poll specified\n */\n function getLockedTokens(address _voter) view public returns (uint numTokens) {\n return getNumTokens(_voter, getLastNode(_voter));\n }\n\n /*\n @dev Takes the last node in the user's DLL and iterates backwards through the list searching\n for a node with a value less than or equal to the provided _numTokens value. When such a node\n is found, if the provided _pollID matches the found nodeID, this operation is an in-place\n update. In that case, return the previous node of the node being updated. Otherwise return the\n first node that was found with a value less than or equal to the provided _numTokens.\n @param _voter The voter whose DLL will be searched\n @param _numTokens The value for the numTokens attribute in the node to be inserted\n @return the node which the propoded node should be inserted after\n */\n function getInsertPointForNumTokens(address _voter, uint _numTokens, uint _pollID)\n view public returns (uint prevNode)\n {\n // Get the last node in the list and the number of tokens in that node\n uint nodeID = getLastNode(_voter);\n uint tokensInNode = getNumTokens(_voter, nodeID);\n\n // Iterate backwards through the list until reaching the root node\n while (nodeID != 0) {\n // Get the number of tokens in the current node\n tokensInNode = getNumTokens(_voter, nodeID);\n if (tokensInNode <= _numTokens) { // We found the insert point!\n if (nodeID == _pollID) {\n // This is an in-place update. Return the prev node of the node being updated\n nodeID = dllMap[_voter].getPrev(nodeID);\n }\n // Return the insert point\n return nodeID; \n }\n // We did not find the insert point. Continue iterating backwards through the list\n nodeID = dllMap[_voter].getPrev(nodeID);\n }\n\n // The list is empty, or a smaller value than anything else in the list is being inserted\n return nodeID;\n }\n\n // ----------------\n // GENERAL HELPERS:\n // ----------------\n\n /**\n @dev Checks if an expiration date has been reached\n @param _terminationDate Integer timestamp of date to compare current timestamp with\n @return expired Boolean indication of whether the terminationDate has passed\n */\n function isExpired(uint _terminationDate) view public returns (bool expired) {\n return (block.timestamp > _terminationDate);\n }\n\n /**\n @dev Generates an identifier which associates a user and a poll together\n @param _pollID Integer identifier associated with target poll\n @return UUID Hash which is deterministic from _user and _pollID\n */\n function attrUUID(address _user, uint _pollID) public pure returns (bytes32 UUID) {\n return keccak256(abi.encodePacked(_user, _pollID));\n }\n}\n", + "sourcePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "exportedSymbols": { "PLCRVoting": [ - 1471 + 1618 ] }, - "id": 1472, + "id": 1619, "nodeType": "SourceUnit", "nodes": [ { - "id": 442, + "id": 562, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:4" + "src": "0:23:6" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 443, + "id": 563, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 409, - "src": "25:21:4", + "scope": 1619, + "sourceUnit": 529, + "src": "25:21:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/DLL.sol", + "absolutePath": "/home/bharath/computable/contracts/DLL.sol", "file": "./DLL.sol", - "id": 444, + "id": 564, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 366, - "src": "47:19:4", + "scope": 1619, + "sourceUnit": 486, + "src": "47:19:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/AttributeStore.sol", + "absolutePath": "/home/bharath/computable/contracts/AttributeStore.sol", "file": "./AttributeStore.sol", - "id": 445, + "id": 565, "nodeType": "ImportDirective", - "scope": 1472, + "scope": 1619, "sourceUnit": 65, - "src": "67:30:4", + "src": "67:30:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 446, + "id": 566, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 3688, - "src": "98:24:4", + "scope": 1619, + "sourceUnit": 3892, + "src": "98:24:6", "symbolAliases": [], "unitAlias": "" }, @@ -815,9 +815,9 @@ "contractKind": "contract", "documentation": "@title Partial-Lock-Commit-Reveal Voting scheme with ERC20 tokens\n@author Team: Aspyn Palatnick, Cem Ozer, Yorke Rhodes", "fullyImplemented": true, - "id": 1471, + "id": 1618, "linearizedBaseContracts": [ - 1471 + 1618 ], "name": "PLCRVoting", "nodeType": "ContractDefinition", @@ -825,21 +825,21 @@ { "anonymous": false, "documentation": null, - "id": 454, + "id": 574, "name": "_VoteCommitted", "nodeType": "EventDefinition", "parameters": { - "id": 453, + "id": 573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 448, + "id": 568, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "348:19:4", + "scope": 574, + "src": "348:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -847,10 +847,10 @@ "typeString": "uint256" }, "typeName": { - "id": 447, + "id": 567, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "348:4:4", + "src": "348:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -861,12 +861,12 @@ }, { "constant": false, - "id": 450, + "id": 570, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "369:14:4", + "scope": 574, + "src": "369:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -874,10 +874,10 @@ "typeString": "uint256" }, "typeName": { - "id": 449, + "id": 569, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "369:4:4", + "src": "369:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -888,12 +888,12 @@ }, { "constant": false, - "id": 452, + "id": 572, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "385:21:4", + "scope": 574, + "src": "385:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -901,10 +901,10 @@ "typeString": "address" }, "typeName": { - "id": 451, + "id": 571, "name": "address", "nodeType": "ElementaryTypeName", - "src": "385:7:4", + "src": "385:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -914,28 +914,28 @@ "visibility": "internal" } ], - "src": "347:60:4" + "src": "347:60:6" }, - "src": "327:81:4" + "src": "327:81:6" }, { "anonymous": false, "documentation": null, - "id": 468, + "id": 588, "name": "_VoteRevealed", "nodeType": "EventDefinition", "parameters": { - "id": 467, + "id": 587, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 456, + "id": 576, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "431:19:4", + "scope": 588, + "src": "431:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -943,10 +943,10 @@ "typeString": "uint256" }, "typeName": { - "id": 455, + "id": 575, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "431:4:4", + "src": "431:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -957,12 +957,12 @@ }, { "constant": false, - "id": 458, + "id": 578, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "452:14:4", + "scope": 588, + "src": "452:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -970,10 +970,10 @@ "typeString": "uint256" }, "typeName": { - "id": 457, + "id": 577, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "452:4:4", + "src": "452:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -984,12 +984,12 @@ }, { "constant": false, - "id": 460, + "id": 580, "indexed": false, "name": "votesFor", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "468:13:4", + "scope": 588, + "src": "468:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -997,10 +997,10 @@ "typeString": "uint256" }, "typeName": { - "id": 459, + "id": 579, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "468:4:4", + "src": "468:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1011,12 +1011,12 @@ }, { "constant": false, - "id": 462, + "id": 582, "indexed": false, "name": "votesAgainst", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "483:17:4", + "scope": 588, + "src": "483:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1024,10 +1024,10 @@ "typeString": "uint256" }, "typeName": { - "id": 461, + "id": 581, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "483:4:4", + "src": "483:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1038,12 +1038,12 @@ }, { "constant": false, - "id": 464, + "id": 584, "indexed": true, "name": "choice", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "502:19:4", + "scope": 588, + "src": "502:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1051,10 +1051,10 @@ "typeString": "uint256" }, "typeName": { - "id": 463, + "id": 583, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "502:4:4", + "src": "502:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1065,12 +1065,12 @@ }, { "constant": false, - "id": 466, + "id": 586, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "523:21:4", + "scope": 588, + "src": "523:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1078,10 +1078,10 @@ "typeString": "address" }, "typeName": { - "id": 465, + "id": 585, "name": "address", "nodeType": "ElementaryTypeName", - "src": "523:7:4", + "src": "523:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1091,28 +1091,28 @@ "visibility": "internal" } ], - "src": "430:115:4" + "src": "430:115:6" }, - "src": "411:135:4" + "src": "411:135:6" }, { "anonymous": false, "documentation": null, - "id": 480, + "id": 600, "name": "_PollCreated", "nodeType": "EventDefinition", "parameters": { - "id": 479, + "id": 599, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 470, + "id": 590, "indexed": false, "name": "voteQuorum", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "568:15:4", + "scope": 600, + "src": "568:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1120,10 +1120,10 @@ "typeString": "uint256" }, "typeName": { - "id": 469, + "id": 589, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "568:4:4", + "src": "568:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1134,12 +1134,12 @@ }, { "constant": false, - "id": 472, + "id": 592, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "585:18:4", + "scope": 600, + "src": "585:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1147,10 +1147,10 @@ "typeString": "uint256" }, "typeName": { - "id": 471, + "id": 591, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "585:4:4", + "src": "585:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1161,12 +1161,12 @@ }, { "constant": false, - "id": 474, + "id": 594, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "605:18:4", + "scope": 600, + "src": "605:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1174,10 +1174,10 @@ "typeString": "uint256" }, "typeName": { - "id": 473, + "id": 593, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "605:4:4", + "src": "605:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1188,12 +1188,12 @@ }, { "constant": false, - "id": 476, + "id": 596, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "625:19:4", + "scope": 600, + "src": "625:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1201,10 +1201,10 @@ "typeString": "uint256" }, "typeName": { - "id": 475, + "id": 595, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "625:4:4", + "src": "625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1215,12 +1215,12 @@ }, { "constant": false, - "id": 478, + "id": 598, "indexed": true, "name": "creator", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "646:23:4", + "scope": 600, + "src": "646:23:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1228,10 +1228,10 @@ "typeString": "address" }, "typeName": { - "id": 477, + "id": 597, "name": "address", "nodeType": "ElementaryTypeName", - "src": "646:7:4", + "src": "646:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1241,28 +1241,28 @@ "visibility": "internal" } ], - "src": "567:103:4" + "src": "567:103:6" }, - "src": "549:122:4" + "src": "549:122:6" }, { "anonymous": false, "documentation": null, - "id": 486, + "id": 606, "name": "_VotingRightsGranted", "nodeType": "EventDefinition", "parameters": { - "id": 485, + "id": 605, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 482, + "id": 602, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 486, - "src": "701:14:4", + "scope": 606, + "src": "701:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1270,10 +1270,10 @@ "typeString": "uint256" }, "typeName": { - "id": 481, + "id": 601, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "701:4:4", + "src": "701:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1284,12 +1284,12 @@ }, { "constant": false, - "id": 484, + "id": 604, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 486, - "src": "717:21:4", + "scope": 606, + "src": "717:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1297,10 +1297,10 @@ "typeString": "address" }, "typeName": { - "id": 483, + "id": 603, "name": "address", "nodeType": "ElementaryTypeName", - "src": "717:7:4", + "src": "717:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1310,28 +1310,28 @@ "visibility": "internal" } ], - "src": "700:39:4" + "src": "700:39:6" }, - "src": "674:66:4" + "src": "674:66:6" }, { "anonymous": false, "documentation": null, - "id": 492, + "id": 612, "name": "_VotingRightsWithdrawn", "nodeType": "EventDefinition", "parameters": { - "id": 491, + "id": 611, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 488, + "id": 608, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 492, - "src": "772:14:4", + "scope": 612, + "src": "772:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1339,10 +1339,10 @@ "typeString": "uint256" }, "typeName": { - "id": 487, + "id": 607, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "772:4:4", + "src": "772:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1353,12 +1353,12 @@ }, { "constant": false, - "id": 490, + "id": 610, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 492, - "src": "788:21:4", + "scope": 612, + "src": "788:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1366,10 +1366,10 @@ "typeString": "address" }, "typeName": { - "id": 489, + "id": 609, "name": "address", "nodeType": "ElementaryTypeName", - "src": "788:7:4", + "src": "788:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1379,28 +1379,28 @@ "visibility": "internal" } ], - "src": "771:39:4" + "src": "771:39:6" }, - "src": "743:68:4" + "src": "743:68:6" }, { "anonymous": false, "documentation": null, - "id": 498, + "id": 618, "name": "_TokensRescued", "nodeType": "EventDefinition", "parameters": { - "id": 497, + "id": 617, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 494, + "id": 614, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 498, - "src": "835:19:4", + "scope": 618, + "src": "835:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1408,10 +1408,10 @@ "typeString": "uint256" }, "typeName": { - "id": 493, + "id": 613, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "835:4:4", + "src": "835:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1422,12 +1422,12 @@ }, { "constant": false, - "id": 496, + "id": 616, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 498, - "src": "856:21:4", + "scope": 618, + "src": "856:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1435,10 +1435,10 @@ "typeString": "address" }, "typeName": { - "id": 495, + "id": 615, "name": "address", "nodeType": "ElementaryTypeName", - "src": "856:7:4", + "src": "856:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1448,33 +1448,33 @@ "visibility": "internal" } ], - "src": "834:44:4" + "src": "834:44:6" }, - "src": "814:65:4" + "src": "814:65:6" }, { - "id": 501, + "id": 621, "libraryName": { "contractScope": null, - "id": 499, + "id": 619, "name": "AttributeStore", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 64, - "src": "948:14:4", + "src": "948:14:6", "typeDescriptions": { "typeIdentifier": "t_contract$_AttributeStore_$64", "typeString": "library AttributeStore" } }, "nodeType": "UsingForDirective", - "src": "942:45:4", + "src": "942:45:6", "typeName": { "contractScope": null, - "id": 500, + "id": 620, "name": "AttributeStore.Data", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 6, - "src": "967:19:4", + "src": "967:19:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage_ptr", "typeString": "struct AttributeStore.Data" @@ -1482,55 +1482,55 @@ } }, { - "id": 504, + "id": 624, "libraryName": { "contractScope": null, - "id": 502, + "id": 622, "name": "DLL", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 365, - "src": "996:3:4", + "referencedDeclaration": 485, + "src": "996:3:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_DLL_$365", + "typeIdentifier": "t_contract$_DLL_$485", "typeString": "library DLL" } }, "nodeType": "UsingForDirective", - "src": "990:23:4", + "src": "990:23:6", "typeName": { "contractScope": null, - "id": 503, + "id": 623, "name": "DLL.Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1004:8:4", + "referencedDeclaration": 199, + "src": "1004:8:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } } }, { - "id": 507, + "id": 627, "libraryName": { "contractScope": null, - "id": 505, + "id": 625, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "1022:8:4", + "referencedDeclaration": 3891, + "src": "1022:8:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "1016:24:4", + "src": "1016:24:6", "typeName": { - "id": 506, + "id": 626, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1035:4:4", + "src": "1035:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1539,15 +1539,15 @@ }, { "canonicalName": "PLCRVoting.Poll", - "id": 526, + "id": 646, "members": [ { "constant": false, - "id": 509, + "id": 629, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1062:18:4", + "scope": 646, + "src": "1062:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1555,10 +1555,10 @@ "typeString": "uint256" }, "typeName": { - "id": 508, + "id": 628, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1062:4:4", + "src": "1062:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1569,11 +1569,11 @@ }, { "constant": false, - "id": 511, + "id": 631, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1136:18:4", + "scope": 646, + "src": "1136:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1581,10 +1581,10 @@ "typeString": "uint256" }, "typeName": { - "id": 510, + "id": 630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1136:4:4", + "src": "1136:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1595,11 +1595,11 @@ }, { "constant": false, - "id": 513, + "id": 633, "name": "voteQuorum", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1210:15:4", + "scope": 646, + "src": "1210:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1607,10 +1607,10 @@ "typeString": "uint256" }, "typeName": { - "id": 512, + "id": 632, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1210:4:4", + "src": "1210:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1621,11 +1621,11 @@ }, { "constant": false, - "id": 515, + "id": 635, "name": "votesFor", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1286:13:4", + "scope": 646, + "src": "1286:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1633,10 +1633,10 @@ "typeString": "uint256" }, "typeName": { - "id": 514, + "id": 634, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1286:4:4", + "src": "1286:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1647,11 +1647,11 @@ }, { "constant": false, - "id": 517, + "id": 637, "name": "votesAgainst", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1347:17:4", + "scope": 646, + "src": "1347:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1659,10 +1659,10 @@ "typeString": "uint256" }, "typeName": { - "id": 516, + "id": 636, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1347:4:4", + "src": "1347:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1673,11 +1673,11 @@ }, { "constant": false, - "id": 521, + "id": 641, "name": "didCommit", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1414:34:4", + "scope": 646, + "src": "1414:34:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1685,28 +1685,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 520, + "id": 640, "keyType": { - "id": 518, + "id": 638, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1422:7:4", + "src": "1422:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1414:24:4", + "src": "1414:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 519, + "id": 639, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1433:4:4", + "src": "1433:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1718,11 +1718,11 @@ }, { "constant": false, - "id": 525, + "id": 645, "name": "didReveal", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1519:34:4", + "scope": 646, + "src": "1519:34:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1730,28 +1730,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 524, + "id": 644, "keyType": { - "id": 522, + "id": 642, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1527:7:4", + "src": "1527:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1519:24:4", + "src": "1519:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 523, + "id": 643, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1538:4:4", + "src": "1538:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1764,17 +1764,17 @@ ], "name": "Poll", "nodeType": "StructDefinition", - "scope": 1471, - "src": "1044:579:4", + "scope": 1618, + "src": "1044:579:6", "visibility": "public" }, { "constant": true, - "id": 529, + "id": 649, "name": "INITIAL_POLL_NONCE", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1686:43:4", + "scope": 1618, + "src": "1686:43:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1782,10 +1782,10 @@ "typeString": "uint256" }, "typeName": { - "id": 527, + "id": 647, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1686:4:4", + "src": "1686:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1794,14 +1794,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 528, + "id": 648, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1728:1:4", + "src": "1728:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1813,11 +1813,11 @@ }, { "constant": false, - "id": 531, + "id": 651, "name": "pollNonce", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1733:21:4", + "scope": 1618, + "src": "1733:21:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1825,10 +1825,10 @@ "typeString": "uint256" }, "typeName": { - "id": 530, + "id": 650, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1733:4:4", + "src": "1733:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1839,44 +1839,44 @@ }, { "constant": false, - "id": 535, + "id": 655, "name": "pollMap", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1759:36:4", + "scope": 1618, + "src": "1759:36:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll)" }, "typeName": { - "id": 534, + "id": 654, "keyType": { - "id": 532, + "id": 652, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1767:4:4", + "src": "1767:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "1759:21:4", + "src": "1759:21:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll)" }, "valueType": { "contractScope": null, - "id": 533, + "id": 653, "name": "Poll", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 526, - "src": "1775:4:4", + "referencedDeclaration": 646, + "src": "1775:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage_ptr", + "typeIdentifier": "t_struct$_Poll_$646_storage_ptr", "typeString": "struct PLCRVoting.Poll" } } @@ -1886,11 +1886,11 @@ }, { "constant": false, - "id": 539, + "id": 659, "name": "voteTokenBalance", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1829:48:4", + "scope": 1618, + "src": "1829:48:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1898,28 +1898,28 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 538, + "id": 658, "keyType": { - "id": 536, + "id": 656, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1837:7:4", + "src": "1837:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1829:24:4", + "src": "1829:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 537, + "id": 657, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1848:4:4", + "src": "1848:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1931,44 +1931,44 @@ }, { "constant": false, - "id": 543, + "id": 663, "name": "dllMap", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1926:35:4", + "scope": 1618, + "src": "1926:35:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data)" }, "typeName": { - "id": 542, + "id": 662, "keyType": { - "id": 540, + "id": 660, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1934:7:4", + "src": "1934:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1926:28:4", + "src": "1926:28:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data)" }, "valueType": { "contractScope": null, - "id": 541, + "id": 661, "name": "DLL.Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1945:8:4", + "referencedDeclaration": 199, + "src": "1945:8:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } } @@ -1978,11 +1978,11 @@ }, { "constant": false, - "id": 545, + "id": 665, "name": "store", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1965:25:4", + "scope": 1618, + "src": "1965:25:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1991,11 +1991,11 @@ }, "typeName": { "contractScope": null, - "id": 544, + "id": 664, "name": "AttributeStore.Data", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 6, - "src": "1965:19:4", + "src": "1965:19:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage_ptr", "typeString": "struct AttributeStore.Data" @@ -2006,26 +2006,26 @@ }, { "constant": false, - "id": 547, + "id": 667, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1995:18:4", + "scope": 1618, + "src": "1995:18:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 546, + "id": 666, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "1995:5:4", + "referencedDeclaration": 528, + "src": "1995:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2034,28 +2034,28 @@ }, { "body": { - "id": 562, + "id": 682, "nodeType": "Block", - "src": "2325:72:4", + "src": "2325:72:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 556, + "id": 676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 552, + "id": 672, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2331:5:4", + "referencedDeclaration": 667, + "src": "2331:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2066,12 +2066,12 @@ "arguments": [ { "argumentTypes": null, - "id": 554, + "id": 674, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 549, - "src": "2345:10:4", + "referencedDeclaration": 669, + "src": "2345:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2085,18 +2085,18 @@ "typeString": "address" } ], - "id": 553, + "id": 673, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "2339:5:4", + "referencedDeclaration": 528, + "src": "2339:5:6", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 555, + "id": 675, "isConstant": false, "isLValue": false, "isPure": false, @@ -2104,38 +2104,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2339:17:4", + "src": "2339:17:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "2331:25:4", + "src": "2331:25:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 557, + "id": 677, "nodeType": "ExpressionStatement", - "src": "2331:25:4" + "src": "2331:25:6" }, { "expression": { "argumentTypes": null, - "id": 560, + "id": 680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 558, + "id": 678, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "2362:9:4", + "referencedDeclaration": 651, + "src": "2362:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2145,31 +2145,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 559, + "id": 679, "name": "INITIAL_POLL_NONCE", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 529, - "src": "2374:18:4", + "referencedDeclaration": 649, + "src": "2374:18:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2362:30:4", + "src": "2362:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 561, + "id": 681, "nodeType": "ExpressionStatement", - "src": "2362:30:4" + "src": "2362:30:6" } ] }, "documentation": "@dev Initializes voteQuorum, commitDuration, revealDuration, and pollNonce in addition to token contract and trusted mapping\n@param _tokenAddr The address where the ERC20 token contract is deployed", - "id": 563, + "id": 683, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -2177,16 +2177,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 550, + "id": 670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 549, + "id": 669, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 563, - "src": "2298:18:4", + "scope": 683, + "src": "2298:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2194,10 +2194,10 @@ "typeString": "address" }, "typeName": { - "id": 548, + "id": 668, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2298:7:4", + "src": "2298:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2207,26 +2207,26 @@ "visibility": "internal" } ], - "src": "2297:20:4" + "src": "2297:20:6" }, "payable": false, "returnParameters": { - "id": 551, + "id": 671, "nodeType": "ParameterList", "parameters": [], - "src": "2325:0:4" + "src": "2325:0:6" }, - "scope": 1471, - "src": "2286:111:4", + "scope": 1618, + "src": "2286:111:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 601, + "id": 727, "nodeType": "Block", - "src": "2797:227:4", + "src": "2797:260:6", "statements": [ { "expression": { @@ -2238,7 +2238,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 575, + "id": 695, "isConstant": false, "isLValue": false, "isPure": false, @@ -2250,18 +2250,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 571, + "id": 691, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2827:3:4", + "referencedDeclaration": 4153, + "src": "2827:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 572, + "id": 692, "isConstant": false, "isLValue": false, "isPure": false, @@ -2269,7 +2269,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2827:10:4", + "src": "2827:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2285,32 +2285,32 @@ ], "expression": { "argumentTypes": null, - "id": 569, + "id": 689, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2811:5:4", + "referencedDeclaration": 667, + "src": "2811:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 570, + "id": 690, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 422, - "src": "2811:15:4", + "referencedDeclaration": 542, + "src": "2811:15:6", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 573, + "id": 693, "isConstant": false, "isLValue": false, "isPure": false, @@ -2318,7 +2318,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2811:27:4", + "src": "2811:27:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2328,18 +2328,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 574, + "id": 694, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2842:10:4", + "referencedDeclaration": 685, + "src": "2842:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2811:41:4", + "src": "2811:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2353,21 +2353,21 @@ "typeString": "bool" } ], - "id": 568, + "id": 688, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "2803:7:4", + "referencedDeclaration": 4156, + "src": "2803:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 576, + "id": 696, "isConstant": false, "isLValue": false, "isPure": false, @@ -2375,20 +2375,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2803:50:4", + "src": "2803:50:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 577, + "id": 697, "nodeType": "ExpressionStatement", - "src": "2803:50:4" + "src": "2803:50:6" }, { "expression": { "argumentTypes": null, - "id": 583, + "id": 709, "isConstant": false, "isLValue": false, "isPure": false, @@ -2397,34 +2397,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 578, + "id": 698, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "2859:16:4", + "referencedDeclaration": 659, + "src": "2859:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 581, + "id": 701, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 579, + "id": 699, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2876:3:4", + "referencedDeclaration": 4153, + "src": "2876:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 580, + "id": 700, "isConstant": false, "isLValue": false, "isPure": false, @@ -2432,7 +2432,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2876:10:4", + "src": "2876:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2443,36 +2443,131 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2859:28:4", + "src": "2859:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 582, - "name": "_numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2891:10:4", + "arguments": [ + { + "argumentTypes": null, + "id": 707, + "name": "_numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 685, + "src": "2923:10:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 702, + "name": "voteTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 659, + "src": "2890:16:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", + "typeString": "mapping(address => uint256)" + } + }, + "id": 705, + "indexExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 703, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 4153, + "src": "2907:3:6", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 704, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "2907:10:6", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "2890:28:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 706, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "2890:32:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 708, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2890:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2859:42:4", + "src": "2859:75:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 584, + "id": 710, "nodeType": "ExpressionStatement", - "src": "2859:42:4" + "src": "2859:75:6" }, { "expression": { @@ -2485,18 +2580,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 588, + "id": 714, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2934:3:4", + "referencedDeclaration": 4153, + "src": "2967:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 589, + "id": 715, "isConstant": false, "isLValue": false, "isPure": false, @@ -2504,7 +2599,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2934:10:4", + "src": "2967:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2512,25 +2607,25 @@ }, { "argumentTypes": null, - "id": 590, + "id": 716, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3725, - "src": "2946:4:4", + "referencedDeclaration": 4182, + "src": "2979:4:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, { "argumentTypes": null, - "id": 591, + "id": 717, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2952:10:4", + "referencedDeclaration": 685, + "src": "2985:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2544,7 +2639,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, { @@ -2554,32 +2649,32 @@ ], "expression": { "argumentTypes": null, - "id": 586, + "id": 712, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2915:5:4", + "referencedDeclaration": 667, + "src": "2948:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 587, + "id": 713, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "2915:18:4", + "referencedDeclaration": 510, + "src": "2948:18:6", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 592, + "id": 718, "isConstant": false, "isLValue": false, "isPure": false, @@ -2587,7 +2682,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2915:48:4", + "src": "2948:48:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2601,21 +2696,21 @@ "typeString": "bool" } ], - "id": 585, + "id": 711, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "2907:7:4", + "referencedDeclaration": 4156, + "src": "2940:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 593, + "id": 719, "isConstant": false, "isLValue": false, "isPure": false, @@ -2623,15 +2718,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2907:57:4", + "src": "2940:57:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 594, + "id": 720, "nodeType": "ExpressionStatement", - "src": "2907:57:4" + "src": "2940:57:6" }, { "eventCall": { @@ -2639,12 +2734,12 @@ "arguments": [ { "argumentTypes": null, - "id": 596, + "id": 722, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2996:10:4", + "referencedDeclaration": 685, + "src": "3029:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2654,18 +2749,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 597, + "id": 723, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3008:3:4", + "referencedDeclaration": 4153, + "src": "3041:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 598, + "id": 724, "isConstant": false, "isLValue": false, "isPure": false, @@ -2673,7 +2768,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3008:10:4", + "src": "3041:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2691,18 +2786,18 @@ "typeString": "address" } ], - "id": 595, + "id": 721, "name": "_VotingRightsGranted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 486, - "src": "2975:20:4", + "referencedDeclaration": 606, + "src": "3008:20:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 599, + "id": 725, "isConstant": false, "isLValue": false, "isPure": false, @@ -2710,20 +2805,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2975:44:4", + "src": "3008:44:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 600, + "id": 726, "nodeType": "EmitStatement", - "src": "2970:49:4" + "src": "3003:49:6" } ] }, "documentation": "@notice Loads _numTokens ERC20 tokens into the voting contract for one-to-one voting rights\n@dev Assumes that msg.sender has approved voting contract to spend on their behalf\n@param _numTokens The number of votingTokens desired in exchange for ERC20 tokens", - "id": 602, + "id": 728, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -2731,16 +2826,16 @@ "name": "requestVotingRights", "nodeType": "FunctionDefinition", "parameters": { - "id": 566, + "id": 686, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 565, + "id": 685, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 602, - "src": "2771:15:4", + "scope": 728, + "src": "2771:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2748,10 +2843,10 @@ "typeString": "uint256" }, "typeName": { - "id": 564, + "id": 684, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2771:4:4", + "src": "2771:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2761,39 +2856,39 @@ "visibility": "internal" } ], - "src": "2770:17:4" + "src": "2770:17:6" }, "payable": false, "returnParameters": { - "id": 567, + "id": 687, "nodeType": "ParameterList", "parameters": [], - "src": "2797:0:4" + "src": "2797:0:6" }, - "scope": 1471, - "src": "2742:282:4", + "scope": 1618, + "src": "2742:315:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 648, + "id": 780, "nodeType": "Block", - "src": "3278:297:4", + "src": "3311:330:6", "statements": [ { "assignments": [ - 608 + 734 ], "declarations": [ { "constant": false, - "id": 608, + "id": 734, "name": "availableTokens", "nodeType": "VariableDeclaration", - "scope": 649, - "src": "3284:20:4", + "scope": 781, + "src": "3317:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2801,10 +2896,10 @@ "typeString": "uint256" }, "typeName": { - "id": 607, + "id": 733, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3284:4:4", + "src": "3317:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2814,7 +2909,7 @@ "visibility": "internal" } ], - "id": 619, + "id": 745, "initialValue": { "argumentTypes": null, "arguments": [ @@ -2825,18 +2920,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 615, + "id": 741, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3356:3:4", + "referencedDeclaration": 4153, + "src": "3389:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 616, + "id": 742, "isConstant": false, "isLValue": false, "isPure": false, @@ -2844,7 +2939,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3356:10:4", + "src": "3389:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2858,18 +2953,18 @@ "typeString": "address" } ], - "id": 614, + "id": 740, "name": "getLockedTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1369, - "src": "3340:15:4", + "referencedDeclaration": 1516, + "src": "3373:15:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 617, + "id": 743, "isConstant": false, "isLValue": false, "isPure": false, @@ -2877,7 +2972,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3340:27:4", + "src": "3373:27:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2895,34 +2990,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 609, + "id": 735, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "3307:16:4", + "referencedDeclaration": 659, + "src": "3340:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 612, + "id": 738, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 610, + "id": 736, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3324:3:4", + "referencedDeclaration": 4153, + "src": "3357:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 611, + "id": 737, "isConstant": false, "isLValue": false, "isPure": false, @@ -2930,7 +3025,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3324:10:4", + "src": "3357:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2941,27 +3036,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3307:28:4", + "src": "3340:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 613, + "id": 739, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3662, - "src": "3307:32:4", + "referencedDeclaration": 3866, + "src": "3340:32:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 618, + "id": 744, "isConstant": false, "isLValue": false, "isPure": false, @@ -2969,14 +3064,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3307:61:4", + "src": "3340:61:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "3284:84:4" + "src": "3317:84:6" }, { "expression": { @@ -2988,19 +3083,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 623, + "id": 749, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 621, + "id": 747, "name": "availableTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 608, - "src": "3382:15:4", + "referencedDeclaration": 734, + "src": "3415:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3010,18 +3105,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 622, + "id": 748, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3401:10:4", + "referencedDeclaration": 730, + "src": "3434:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3382:29:4", + "src": "3415:29:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3035,21 +3130,21 @@ "typeString": "bool" } ], - "id": 620, + "id": 746, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3374:7:4", + "referencedDeclaration": 4156, + "src": "3407:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 624, + "id": 750, "isConstant": false, "isLValue": false, "isPure": false, @@ -3057,20 +3152,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3374:38:4", + "src": "3407:38:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 625, + "id": 751, "nodeType": "ExpressionStatement", - "src": "3374:38:4" + "src": "3407:38:6" }, { "expression": { "argumentTypes": null, - "id": 631, + "id": 763, "isConstant": false, "isLValue": false, "isPure": false, @@ -3079,34 +3174,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 626, + "id": 752, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "3418:16:4", + "referencedDeclaration": 659, + "src": "3451:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 629, + "id": 755, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 627, + "id": 753, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3435:3:4", + "referencedDeclaration": 4153, + "src": "3468:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 628, + "id": 754, "isConstant": false, "isLValue": false, "isPure": false, @@ -3114,7 +3209,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3435:10:4", + "src": "3468:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3125,36 +3220,131 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "3418:28:4", + "src": "3451:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 630, - "name": "_numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3450:10:4", + "arguments": [ + { + "argumentTypes": null, + "id": 761, + "name": "_numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 730, + "src": "3515:10:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 756, + "name": "voteTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 659, + "src": "3482:16:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", + "typeString": "mapping(address => uint256)" + } + }, + "id": 759, + "indexExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 757, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 4153, + "src": "3499:3:6", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 758, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "3499:10:6", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "3482:28:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 760, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "3482:32:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 762, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3482:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3418:42:4", + "src": "3451:75:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 632, + "id": 764, "nodeType": "ExpressionStatement", - "src": "3418:42:4" + "src": "3451:75:6" }, { "expression": { @@ -3167,18 +3357,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 636, + "id": 768, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3489:3:4", + "referencedDeclaration": 4153, + "src": "3555:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 637, + "id": 769, "isConstant": false, "isLValue": false, "isPure": false, @@ -3186,7 +3376,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3489:10:4", + "src": "3555:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3194,12 +3384,12 @@ }, { "argumentTypes": null, - "id": 638, + "id": 770, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3501:10:4", + "referencedDeclaration": 730, + "src": "3567:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3219,32 +3409,32 @@ ], "expression": { "argumentTypes": null, - "id": 634, + "id": 766, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "3474:5:4", + "referencedDeclaration": 667, + "src": "3540:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 635, + "id": 767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "3474:14:4", + "referencedDeclaration": 551, + "src": "3540:14:6", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 639, + "id": 771, "isConstant": false, "isLValue": false, "isPure": false, @@ -3252,7 +3442,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3474:38:4", + "src": "3540:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3266,21 +3456,21 @@ "typeString": "bool" } ], - "id": 633, + "id": 765, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3466:7:4", + "referencedDeclaration": 4156, + "src": "3532:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 640, + "id": 772, "isConstant": false, "isLValue": false, "isPure": false, @@ -3288,15 +3478,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3466:47:4", + "src": "3532:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 641, + "id": 773, "nodeType": "ExpressionStatement", - "src": "3466:47:4" + "src": "3532:47:6" }, { "eventCall": { @@ -3304,12 +3494,12 @@ "arguments": [ { "argumentTypes": null, - "id": 643, + "id": 775, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3547:10:4", + "referencedDeclaration": 730, + "src": "3613:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3319,18 +3509,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 644, + "id": 776, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3559:3:4", + "referencedDeclaration": 4153, + "src": "3625:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 645, + "id": 777, "isConstant": false, "isLValue": false, "isPure": false, @@ -3338,7 +3528,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3559:10:4", + "src": "3625:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3356,18 +3546,18 @@ "typeString": "address" } ], - "id": 642, + "id": 774, "name": "_VotingRightsWithdrawn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 492, - "src": "3524:22:4", + "referencedDeclaration": 612, + "src": "3590:22:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 646, + "id": 778, "isConstant": false, "isLValue": false, "isPure": false, @@ -3375,20 +3565,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3524:46:4", + "src": "3590:46:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 647, + "id": 779, "nodeType": "EmitStatement", - "src": "3519:51:4" + "src": "3585:51:6" } ] }, "documentation": "@notice Withdraw _numTokens ERC20 tokens from the voting contract, revoking these voting rights\n@param _numTokens The number of ERC20 tokens desired in exchange for voting rights", - "id": 649, + "id": 781, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3396,16 +3586,16 @@ "name": "withdrawVotingRights", "nodeType": "FunctionDefinition", "parameters": { - "id": 605, + "id": 731, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 604, + "id": 730, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 649, - "src": "3252:15:4", + "scope": 781, + "src": "3285:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3413,10 +3603,10 @@ "typeString": "uint256" }, "typeName": { - "id": 603, + "id": 729, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3252:4:4", + "src": "3285:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3426,26 +3616,26 @@ "visibility": "internal" } ], - "src": "3251:17:4" + "src": "3284:17:6" }, "payable": false, "returnParameters": { - "id": 606, + "id": 732, "nodeType": "ParameterList", "parameters": [], - "src": "3278:0:4" + "src": "3311:0:6" }, - "scope": 1471, - "src": "3222:353:4", + "scope": 1618, + "src": "3255:386:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 687, + "id": 819, "nodeType": "Block", - "src": "3772:199:4", + "src": "3838:199:6", "statements": [ { "expression": { @@ -3460,26 +3650,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 656, + "id": 788, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "3796:7:4", + "referencedDeclaration": 655, + "src": "3862:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 658, + "id": 790, "indexExpression": { "argumentTypes": null, - "id": 657, + "id": 789, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3804:7:4", + "referencedDeclaration": 783, + "src": "3870:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3490,21 +3680,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3796:16:4", + "src": "3862:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 659, + "id": 791, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "3796:30:4", + "referencedDeclaration": 631, + "src": "3862:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3518,18 +3708,18 @@ "typeString": "uint256" } ], - "id": 655, + "id": 787, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "3786:9:4", + "referencedDeclaration": 1599, + "src": "3852:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 660, + "id": 792, "isConstant": false, "isLValue": false, "isPure": false, @@ -3537,7 +3727,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3786:41:4", + "src": "3852:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3551,21 +3741,21 @@ "typeString": "bool" } ], - "id": 654, + "id": 786, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3778:7:4", + "referencedDeclaration": 4156, + "src": "3844:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 661, + "id": 793, "isConstant": false, "isLValue": false, "isPure": false, @@ -3573,15 +3763,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3778:50:4", + "src": "3844:50:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 662, + "id": 794, "nodeType": "ExpressionStatement", - "src": "3778:50:4" + "src": "3844:50:6" }, { "expression": { @@ -3592,12 +3782,12 @@ "arguments": [ { "argumentTypes": null, - "id": 669, + "id": 801, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3870:7:4", + "referencedDeclaration": 783, + "src": "3936:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3615,34 +3805,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 664, + "id": 796, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "3842:6:4", + "referencedDeclaration": 663, + "src": "3908:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 667, + "id": 799, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 665, + "id": 797, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3849:3:4", + "referencedDeclaration": 4153, + "src": "3915:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 666, + "id": 798, "isConstant": false, "isLValue": false, "isPure": false, @@ -3650,7 +3840,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3849:10:4", + "src": "3915:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3661,27 +3851,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3842:18:4", + "src": "3908:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 668, + "id": 800, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "contains", "nodeType": "MemberAccess", - "referencedDeclaration": 153, - "src": "3842:27:4", + "referencedDeclaration": 273, + "src": "3908:27:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 670, + "id": 802, "isConstant": false, "isLValue": false, "isPure": false, @@ -3689,7 +3879,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3842:36:4", + "src": "3908:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3703,21 +3893,21 @@ "typeString": "bool" } ], - "id": 663, + "id": 795, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3834:7:4", + "referencedDeclaration": 4156, + "src": "3900:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 671, + "id": 803, "isConstant": false, "isLValue": false, "isPure": false, @@ -3725,15 +3915,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3834:45:4", + "src": "3900:45:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 672, + "id": 804, "nodeType": "ExpressionStatement", - "src": "3834:45:4" + "src": "3900:45:6" }, { "expression": { @@ -3741,12 +3931,12 @@ "arguments": [ { "argumentTypes": null, - "id": 678, + "id": 810, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3912:7:4", + "referencedDeclaration": 783, + "src": "3978:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3764,34 +3954,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 673, + "id": 805, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "3886:6:4", + "referencedDeclaration": 663, + "src": "3952:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 676, + "id": 808, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 674, + "id": 806, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3893:3:4", + "referencedDeclaration": 4153, + "src": "3959:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 675, + "id": 807, "isConstant": false, "isLValue": false, "isPure": false, @@ -3799,7 +3989,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3893:10:4", + "src": "3959:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3810,27 +4000,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3886:18:4", + "src": "3952:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 677, + "id": 809, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "remove", "nodeType": "MemberAccess", - "referencedDeclaration": 364, - "src": "3886:25:4", + "referencedDeclaration": 484, + "src": "3952:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 679, + "id": 811, "isConstant": false, "isLValue": false, "isPure": false, @@ -3838,15 +4028,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3886:34:4", + "src": "3952:34:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 680, + "id": 812, "nodeType": "ExpressionStatement", - "src": "3886:34:4" + "src": "3952:34:6" }, { "eventCall": { @@ -3854,12 +4044,12 @@ "arguments": [ { "argumentTypes": null, - "id": 682, + "id": 814, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3946:7:4", + "referencedDeclaration": 783, + "src": "4012:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3869,18 +4059,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 683, + "id": 815, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3955:3:4", + "referencedDeclaration": 4153, + "src": "4021:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 684, + "id": 816, "isConstant": false, "isLValue": false, "isPure": false, @@ -3888,7 +4078,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3955:10:4", + "src": "4021:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3906,18 +4096,18 @@ "typeString": "address" } ], - "id": 681, + "id": 813, "name": "_TokensRescued", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 498, - "src": "3931:14:4", + "referencedDeclaration": 618, + "src": "3997:14:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 685, + "id": 817, "isConstant": false, "isLValue": false, "isPure": false, @@ -3925,20 +4115,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3931:35:4", + "src": "3997:35:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 686, + "id": 818, "nodeType": "EmitStatement", - "src": "3926:40:4" + "src": "3992:40:6" } ] }, "documentation": "@dev Unlocks tokens locked in unrevealed vote where poll has ended\n@param _pollID Integer identifier associated with the target poll", - "id": 688, + "id": 820, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3946,16 +4136,16 @@ "name": "rescueTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 652, + "id": 784, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 651, + "id": 783, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 688, - "src": "3749:12:4", + "scope": 820, + "src": "3815:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3963,10 +4153,10 @@ "typeString": "uint256" }, "typeName": { - "id": 650, + "id": 782, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3749:4:4", + "src": "3815:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3976,26 +4166,26 @@ "visibility": "internal" } ], - "src": "3748:14:4" + "src": "3814:14:6" }, "payable": false, "returnParameters": { - "id": 653, + "id": 785, "nodeType": "ParameterList", "parameters": [], - "src": "3772:0:4" + "src": "3838:0:6" }, - "scope": 1471, - "src": "3727:244:4", + "scope": 1618, + "src": "3793:244:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 823, + "id": 955, "nodeType": "Block", - "src": "4655:1092:4", + "src": "4721:1092:6", "statements": [ { "expression": { @@ -4006,12 +4196,12 @@ "arguments": [ { "argumentTypes": null, - "id": 701, + "id": 833, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "4688:7:4", + "referencedDeclaration": 822, + "src": "4754:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4025,18 +4215,18 @@ "typeString": "uint256" } ], - "id": 700, + "id": 832, "name": "commitPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1209, - "src": "4669:18:4", + "referencedDeclaration": 1356, + "src": "4735:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 702, + "id": 834, "isConstant": false, "isLValue": false, "isPure": false, @@ -4044,7 +4234,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4669:27:4", + "src": "4735:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4058,21 +4248,21 @@ "typeString": "bool" } ], - "id": 699, + "id": 831, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4661:7:4", + "referencedDeclaration": 4156, + "src": "4727:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 703, + "id": 835, "isConstant": false, "isLValue": false, "isPure": false, @@ -4080,15 +4270,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4661:36:4", + "src": "4727:36:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 704, + "id": 836, "nodeType": "ExpressionStatement", - "src": "4661:36:4" + "src": "4727:36:6" }, { "expression": { @@ -4100,7 +4290,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 711, + "id": 843, "isConstant": false, "isLValue": false, "isPure": false, @@ -4109,34 +4299,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 706, + "id": 838, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "4711:16:4", + "referencedDeclaration": 659, + "src": "4777:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 709, + "id": 841, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 707, + "id": 839, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4728:3:4", + "referencedDeclaration": 4153, + "src": "4794:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 708, + "id": 840, "isConstant": false, "isLValue": false, "isPure": false, @@ -4144,7 +4334,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4728:10:4", + "src": "4794:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4155,7 +4345,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4711:28:4", + "src": "4777:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4165,18 +4355,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 710, + "id": 842, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "4743:10:4", + "referencedDeclaration": 826, + "src": "4809:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4711:42:4", + "src": "4777:42:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4190,21 +4380,21 @@ "typeString": "bool" } ], - "id": 705, + "id": 837, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4703:7:4", + "referencedDeclaration": 4156, + "src": "4769:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 712, + "id": 844, "isConstant": false, "isLValue": false, "isPure": false, @@ -4212,15 +4402,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4703:51:4", + "src": "4769:51:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 713, + "id": 845, "nodeType": "ExpressionStatement", - "src": "4703:51:4" + "src": "4769:51:6" }, { "expression": { @@ -4232,19 +4422,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 717, + "id": 849, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 715, + "id": 847, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "4802:7:4", + "referencedDeclaration": 822, + "src": "4868:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4255,14 +4445,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 716, + "id": 848, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4813:1:4", + "src": "4879:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4270,7 +4460,7 @@ }, "value": "0" }, - "src": "4802:12:4", + "src": "4868:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4284,21 +4474,21 @@ "typeString": "bool" } ], - "id": 714, + "id": 846, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4794:7:4", + "referencedDeclaration": 4156, + "src": "4860:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 718, + "id": 850, "isConstant": false, "isLValue": false, "isPure": false, @@ -4306,15 +4496,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4794:21:4", + "src": "4860:21:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 719, + "id": 851, "nodeType": "ExpressionStatement", - "src": "4794:21:4" + "src": "4860:21:6" }, { "expression": { @@ -4326,7 +4516,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 731, + "id": 863, "isConstant": false, "isLValue": false, "isPure": false, @@ -4337,19 +4527,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 723, + "id": 855, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 721, + "id": 853, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "4978:11:4", + "referencedDeclaration": 828, + "src": "5044:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4360,14 +4550,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 722, + "id": 854, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4993:1:4", + "src": "5059:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4375,7 +4565,7 @@ }, "value": "0" }, - "src": "4978:16:4", + "src": "5044:16:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4388,12 +4578,12 @@ "arguments": [ { "argumentTypes": null, - "id": 729, + "id": 861, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5026:11:4", + "referencedDeclaration": 828, + "src": "5092:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4411,34 +4601,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 724, + "id": 856, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "4998:6:4", + "referencedDeclaration": 663, + "src": "5064:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 727, + "id": 859, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 725, + "id": 857, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5005:3:4", + "referencedDeclaration": 4153, + "src": "5071:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 726, + "id": 858, "isConstant": false, "isLValue": false, "isPure": false, @@ -4446,7 +4636,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5005:10:4", + "src": "5071:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4457,27 +4647,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4998:18:4", + "src": "5064:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 728, + "id": 860, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "contains", "nodeType": "MemberAccess", - "referencedDeclaration": 153, - "src": "4998:27:4", + "referencedDeclaration": 273, + "src": "5064:27:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 730, + "id": 862, "isConstant": false, "isLValue": false, "isPure": false, @@ -4485,13 +4675,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4998:40:4", + "src": "5064:40:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "4978:60:4", + "src": "5044:60:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4505,21 +4695,21 @@ "typeString": "bool" } ], - "id": 720, + "id": 852, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4970:7:4", + "referencedDeclaration": 4156, + "src": "5036:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 732, + "id": 864, "isConstant": false, "isLValue": false, "isPure": false, @@ -4527,28 +4717,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4970:69:4", + "src": "5036:69:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 733, + "id": 865, "nodeType": "ExpressionStatement", - "src": "4970:69:4" + "src": "5036:69:6" }, { "assignments": [ - 735 + 867 ], "declarations": [ { "constant": false, - "id": 735, + "id": 867, "name": "nextPollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "5046:15:4", + "scope": 956, + "src": "5112:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4556,10 +4746,10 @@ "typeString": "uint256" }, "typeName": { - "id": 734, + "id": 866, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5046:4:4", + "src": "5112:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4569,18 +4759,18 @@ "visibility": "internal" } ], - "id": 743, + "id": 875, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 741, + "id": 873, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5091:11:4", + "referencedDeclaration": 828, + "src": "5157:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4598,34 +4788,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 736, + "id": 868, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5064:6:4", + "referencedDeclaration": 663, + "src": "5130:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 739, + "id": 871, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 737, + "id": 869, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5071:3:4", + "referencedDeclaration": 4153, + "src": "5137:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 738, + "id": 870, "isConstant": false, "isLValue": false, "isPure": false, @@ -4633,7 +4823,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5071:10:4", + "src": "5137:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4644,27 +4834,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5064:18:4", + "src": "5130:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 740, + "id": 872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getNext", "nodeType": "MemberAccess", - "referencedDeclaration": 169, - "src": "5064:26:4", + "referencedDeclaration": 289, + "src": "5130:26:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 742, + "id": 874, "isConstant": false, "isLValue": false, "isPure": false, @@ -4672,31 +4862,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5064:39:4", + "src": "5130:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5046:57:4" + "src": "5112:57:6" }, { "expression": { "argumentTypes": null, - "id": 758, + "id": 890, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 744, + "id": 876, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5178:10:4", + "referencedDeclaration": 867, + "src": "5244:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4715,19 +4905,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 747, + "id": 879, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 745, + "id": 877, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5192:10:4", + "referencedDeclaration": 867, + "src": "5258:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4737,32 +4927,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 746, + "id": 878, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5206:7:4", + "referencedDeclaration": 822, + "src": "5272:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5192:21:4", + "src": "5258:21:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 748, + "id": 880, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "5191:23:4", + "src": "5257:23:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4770,35 +4960,35 @@ }, "falseExpression": { "argumentTypes": null, - "id": 756, + "id": 888, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5255:10:4", + "referencedDeclaration": 867, + "src": "5321:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 757, + "id": 889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "5191:74:4", + "src": "5257:74:6", "trueExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 754, + "id": 886, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5244:7:4", + "referencedDeclaration": 822, + "src": "5310:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4816,34 +5006,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 749, + "id": 881, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5217:6:4", + "referencedDeclaration": 663, + "src": "5283:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 752, + "id": 884, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 750, + "id": 882, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5224:3:4", + "referencedDeclaration": 4153, + "src": "5290:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 751, + "id": 883, "isConstant": false, "isLValue": false, "isPure": false, @@ -4851,7 +5041,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5224:10:4", + "src": "5290:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4862,27 +5052,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5217:18:4", + "src": "5283:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 753, + "id": 885, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getNext", "nodeType": "MemberAccess", - "referencedDeclaration": 169, - "src": "5217:26:4", + "referencedDeclaration": 289, + "src": "5283:26:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 755, + "id": 887, "isConstant": false, "isLValue": false, "isPure": false, @@ -4890,7 +5080,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5217:35:4", + "src": "5283:35:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4901,15 +5091,15 @@ "typeString": "uint256" } }, - "src": "5178:87:4", + "src": "5244:87:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 759, + "id": 891, "nodeType": "ExpressionStatement", - "src": "5178:87:4" + "src": "5244:87:6" }, { "expression": { @@ -4920,12 +5110,12 @@ "arguments": [ { "argumentTypes": null, - "id": 762, + "id": 894, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5310:11:4", + "referencedDeclaration": 828, + "src": "5376:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4933,12 +5123,12 @@ }, { "argumentTypes": null, - "id": 763, + "id": 895, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5331:10:4", + "referencedDeclaration": 867, + "src": "5397:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4948,18 +5138,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 764, + "id": 896, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5352:3:4", + "referencedDeclaration": 4153, + "src": "5418:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 765, + "id": 897, "isConstant": false, "isLValue": false, "isPure": false, @@ -4967,7 +5157,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5352:10:4", + "src": "5418:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4975,12 +5165,12 @@ }, { "argumentTypes": null, - "id": 766, + "id": 898, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5372:10:4", + "referencedDeclaration": 826, + "src": "5438:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5006,18 +5196,18 @@ "typeString": "uint256" } ], - "id": 761, + "id": 893, "name": "validPosition", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 866, - "src": "5287:13:4", + "referencedDeclaration": 998, + "src": "5353:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256,uint256,address,uint256) view returns (bool)" } }, - "id": 767, + "id": 899, "isConstant": false, "isLValue": false, "isPure": false, @@ -5025,7 +5215,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5287:103:4", + "src": "5353:103:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5039,21 +5229,21 @@ "typeString": "bool" } ], - "id": 760, + "id": 892, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5272:7:4", + "referencedDeclaration": 4156, + "src": "5338:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 768, + "id": 900, "isConstant": false, "isLValue": false, "isPure": false, @@ -5061,15 +5251,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5272:124:4", + "src": "5338:124:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 769, + "id": 901, "nodeType": "ExpressionStatement", - "src": "5272:124:4" + "src": "5338:124:6" }, { "expression": { @@ -5077,12 +5267,12 @@ "arguments": [ { "argumentTypes": null, - "id": 775, + "id": 907, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5429:11:4", + "referencedDeclaration": 828, + "src": "5495:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5090,12 +5280,12 @@ }, { "argumentTypes": null, - "id": 776, + "id": 908, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5442:7:4", + "referencedDeclaration": 822, + "src": "5508:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5103,12 +5293,12 @@ }, { "argumentTypes": null, - "id": 777, + "id": 909, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5451:10:4", + "referencedDeclaration": 867, + "src": "5517:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5134,34 +5324,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 770, + "id": 902, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5403:6:4", + "referencedDeclaration": 663, + "src": "5469:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 773, + "id": 905, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 771, + "id": 903, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5410:3:4", + "referencedDeclaration": 4153, + "src": "5476:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 772, + "id": 904, "isConstant": false, "isLValue": false, "isPure": false, @@ -5169,7 +5359,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5410:10:4", + "src": "5476:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5180,27 +5370,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5403:18:4", + "src": "5469:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 774, + "id": 906, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "insert", "nodeType": "MemberAccess", - "referencedDeclaration": 310, - "src": "5403:25:4", + "referencedDeclaration": 430, + "src": "5469:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256,uint256,uint256)" } }, - "id": 778, + "id": 910, "isConstant": false, "isLValue": false, "isPure": false, @@ -5208,28 +5398,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5403:59:4", + "src": "5469:59:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 779, + "id": 911, "nodeType": "ExpressionStatement", - "src": "5403:59:4" + "src": "5469:59:6" }, { "assignments": [ - 781 + 913 ], "declarations": [ { "constant": false, - "id": 781, + "id": 913, "name": "UUID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "5469:12:4", + "scope": 956, + "src": "5535:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5237,10 +5427,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 780, + "id": 912, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5469:7:4", + "src": "5535:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5250,7 +5440,7 @@ "visibility": "internal" } ], - "id": 787, + "id": 919, "initialValue": { "argumentTypes": null, "arguments": [ @@ -5258,18 +5448,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 783, + "id": 915, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5493:3:4", + "referencedDeclaration": 4153, + "src": "5559:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 784, + "id": 916, "isConstant": false, "isLValue": false, "isPure": false, @@ -5277,7 +5467,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5493:10:4", + "src": "5559:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5285,12 +5475,12 @@ }, { "argumentTypes": null, - "id": 785, + "id": 917, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5505:7:4", + "referencedDeclaration": 822, + "src": "5571:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5308,18 +5498,18 @@ "typeString": "uint256" } ], - "id": 782, + "id": 914, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "5484:8:4", + "referencedDeclaration": 1617, + "src": "5550:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 786, + "id": 918, "isConstant": false, "isLValue": false, "isPure": false, @@ -5327,14 +5517,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5484:29:4", + "src": "5550:29:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "5469:44:4" + "src": "5535:44:6" }, { "expression": { @@ -5342,12 +5532,12 @@ "arguments": [ { "argumentTypes": null, - "id": 791, + "id": 923, "name": "UUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 781, - "src": "5539:4:4", + "referencedDeclaration": 913, + "src": "5605:4:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5356,14 +5546,14 @@ { "argumentTypes": null, "hexValue": "6e756d546f6b656e73", - "id": 792, + "id": 924, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5545:11:4", + "src": "5611:11:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_aaabf4403cd242796b0e69a57762477ad48e1fa250247ff93eeada3e5b75581a", @@ -5373,12 +5563,12 @@ }, { "argumentTypes": null, - "id": 793, + "id": 925, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5558:10:4", + "referencedDeclaration": 826, + "src": "5624:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5402,18 +5592,18 @@ ], "expression": { "argumentTypes": null, - "id": 788, + "id": 920, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "5520:5:4", + "referencedDeclaration": 665, + "src": "5586:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 790, + "id": 922, "isConstant": false, "isLValue": true, "isPure": false, @@ -5421,13 +5611,13 @@ "memberName": "setAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 63, - "src": "5520:18:4", + "src": "5586:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory,uint256)" } }, - "id": 794, + "id": 926, "isConstant": false, "isLValue": false, "isPure": false, @@ -5435,15 +5625,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5520:49:4", + "src": "5586:49:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 795, + "id": 927, "nodeType": "ExpressionStatement", - "src": "5520:49:4" + "src": "5586:49:6" }, { "expression": { @@ -5451,12 +5641,12 @@ "arguments": [ { "argumentTypes": null, - "id": 799, + "id": 931, "name": "UUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 781, - "src": "5594:4:4", + "referencedDeclaration": 913, + "src": "5660:4:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5465,14 +5655,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697448617368", - "id": 800, + "id": 932, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5600:12:4", + "src": "5666:12:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_207714604a0440a484c6569f8718c59de7b49b2f64c69153d0c80360597b39a3", @@ -5485,12 +5675,12 @@ "arguments": [ { "argumentTypes": null, - "id": 802, + "id": 934, "name": "_secretHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 692, - "src": "5619:11:4", + "referencedDeclaration": 824, + "src": "5685:11:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5504,20 +5694,20 @@ "typeString": "bytes32" } ], - "id": 801, + "id": 933, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "5614:4:4", + "src": "5680:4:6", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint" }, - "id": 803, + "id": 935, "isConstant": false, "isLValue": false, "isPure": false, @@ -5525,7 +5715,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5614:17:4", + "src": "5680:17:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5549,18 +5739,18 @@ ], "expression": { "argumentTypes": null, - "id": 796, + "id": 928, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "5575:5:4", + "referencedDeclaration": 665, + "src": "5641:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 798, + "id": 930, "isConstant": false, "isLValue": true, "isPure": false, @@ -5568,13 +5758,13 @@ "memberName": "setAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 63, - "src": "5575:18:4", + "src": "5641:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory,uint256)" } }, - "id": 804, + "id": 936, "isConstant": false, "isLValue": false, "isPure": false, @@ -5582,20 +5772,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5575:57:4", + "src": "5641:57:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 805, + "id": 937, "nodeType": "ExpressionStatement", - "src": "5575:57:4" + "src": "5641:57:6" }, { "expression": { "argumentTypes": null, - "id": 814, + "id": 946, "isConstant": false, "isLValue": false, "isPure": false, @@ -5608,26 +5798,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 806, + "id": 938, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "5639:7:4", + "referencedDeclaration": 655, + "src": "5705:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 808, + "id": 940, "indexExpression": { "argumentTypes": null, - "id": 807, + "id": 939, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5647:7:4", + "referencedDeclaration": 822, + "src": "5713:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5638,43 +5828,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5639:16:4", + "src": "5705:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 809, + "id": 941, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "5639:26:4", + "referencedDeclaration": 641, + "src": "5705:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 812, + "id": 944, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 810, + "id": 942, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5666:3:4", + "referencedDeclaration": 4153, + "src": "5732:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 811, + "id": 943, "isConstant": false, "isLValue": false, "isPure": false, @@ -5682,7 +5872,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5666:10:4", + "src": "5732:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5693,7 +5883,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5639:38:4", + "src": "5705:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5704,14 +5894,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 813, + "id": 945, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "5680:4:4", + "src": "5746:4:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -5719,15 +5909,15 @@ }, "value": "true" }, - "src": "5639:45:4", + "src": "5705:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 815, + "id": 947, "nodeType": "ExpressionStatement", - "src": "5639:45:4" + "src": "5705:45:6" }, { "eventCall": { @@ -5735,12 +5925,12 @@ "arguments": [ { "argumentTypes": null, - "id": 817, + "id": 949, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5710:7:4", + "referencedDeclaration": 822, + "src": "5776:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5748,12 +5938,12 @@ }, { "argumentTypes": null, - "id": 818, + "id": 950, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5719:10:4", + "referencedDeclaration": 826, + "src": "5785:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5763,18 +5953,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 819, + "id": 951, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5731:3:4", + "referencedDeclaration": 4153, + "src": "5797:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 820, + "id": 952, "isConstant": false, "isLValue": false, "isPure": false, @@ -5782,7 +5972,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5731:10:4", + "src": "5797:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5804,18 +5994,18 @@ "typeString": "address" } ], - "id": 816, + "id": 948, "name": "_VoteCommitted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 454, - "src": "5695:14:4", + "referencedDeclaration": 574, + "src": "5761:14:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 821, + "id": 953, "isConstant": false, "isLValue": false, "isPure": false, @@ -5823,20 +6013,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5695:47:4", + "src": "5761:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 822, + "id": 954, "nodeType": "EmitStatement", - "src": "5690:52:4" + "src": "5756:52:6" } ] }, "documentation": "@notice Commits vote using hash of choice and secret salt to conceal vote until reveal\n@param _pollID Integer identifier associated with target poll\n@param _secretHash Commit keccak256 hash of voter's choice and salt (tightly packed in this order)\n@param _numTokens The number of tokens to be committed towards the target poll\n@param _prevPollID The ID of the poll that the user has voted the maximum number of tokens in which is still less than or equal to numTokens", - "id": 824, + "id": 956, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5844,16 +6034,16 @@ "name": "commitVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 697, + "id": 829, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 690, + "id": 822, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4559:12:4", + "scope": 956, + "src": "4625:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5861,10 +6051,10 @@ "typeString": "uint256" }, "typeName": { - "id": 689, + "id": 821, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4559:4:4", + "src": "4625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5875,11 +6065,11 @@ }, { "constant": false, - "id": 692, + "id": 824, "name": "_secretHash", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4577:19:4", + "scope": 956, + "src": "4643:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5887,10 +6077,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 691, + "id": 823, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4577:7:4", + "src": "4643:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5901,11 +6091,11 @@ }, { "constant": false, - "id": 694, + "id": 826, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4602:15:4", + "scope": 956, + "src": "4668:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5913,10 +6103,10 @@ "typeString": "uint256" }, "typeName": { - "id": 693, + "id": 825, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4602:4:4", + "src": "4668:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5927,11 +6117,11 @@ }, { "constant": false, - "id": 696, + "id": 828, "name": "_prevPollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4623:16:4", + "scope": 956, + "src": "4689:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5939,10 +6129,10 @@ "typeString": "uint256" }, "typeName": { - "id": 695, + "id": 827, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4623:4:4", + "src": "4689:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5952,39 +6142,39 @@ "visibility": "internal" } ], - "src": "4553:90:4" + "src": "4619:90:6" }, "payable": false, "returnParameters": { - "id": 698, + "id": 830, "nodeType": "ParameterList", "parameters": [], - "src": "4655:0:4" + "src": "4721:0:6" }, - "scope": 1471, - "src": "4534:1213:4", + "scope": 1618, + "src": "4600:1213:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 865, + "id": 997, "nodeType": "Block", - "src": "6374:260:4", + "src": "6440:260:6", "statements": [ { "assignments": [ - 838 + 970 ], "declarations": [ { "constant": false, - "id": 838, + "id": 970, "name": "prevValid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6380:14:4", + "scope": 998, + "src": "6446:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5992,10 +6182,10 @@ "typeString": "bool" }, "typeName": { - "id": 837, + "id": 969, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6380:4:4", + "src": "6446:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6005,7 +6195,7 @@ "visibility": "internal" } ], - "id": 846, + "id": 978, "initialValue": { "argumentTypes": null, "components": [ @@ -6015,19 +6205,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 844, + "id": 976, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 839, + "id": 971, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 832, - "src": "6398:10:4", + "referencedDeclaration": 964, + "src": "6464:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6040,12 +6230,12 @@ "arguments": [ { "argumentTypes": null, - "id": 841, + "id": 973, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 830, - "src": "6425:6:4", + "referencedDeclaration": 962, + "src": "6491:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6053,12 +6243,12 @@ }, { "argumentTypes": null, - "id": 842, + "id": 974, "name": "_prevID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 826, - "src": "6433:7:4", + "referencedDeclaration": 958, + "src": "6499:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6076,18 +6266,18 @@ "typeString": "uint256" } ], - "id": 840, + "id": 972, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "6412:12:4", + "referencedDeclaration": 1486, + "src": "6478:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 843, + "id": 975, "isConstant": false, "isLValue": false, "isPure": false, @@ -6095,47 +6285,47 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6412:29:4", + "src": "6478:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6398:43:4", + "src": "6464:43:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 845, + "id": 977, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "6397:45:4", + "src": "6463:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "6380:62:4" + "src": "6446:62:6" }, { "assignments": [ - 848 + 980 ], "declarations": [ { "constant": false, - "id": 848, + "id": 980, "name": "nextValid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6516:14:4", + "scope": 998, + "src": "6582:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6143,10 +6333,10 @@ "typeString": "bool" }, "typeName": { - "id": 847, + "id": 979, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6516:4:4", + "src": "6582:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6156,7 +6346,7 @@ "visibility": "internal" } ], - "id": 860, + "id": 992, "initialValue": { "argumentTypes": null, "components": [ @@ -6166,7 +6356,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 858, + "id": 990, "isConstant": false, "isLValue": false, "isPure": false, @@ -6177,19 +6367,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 854, + "id": 986, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 849, + "id": 981, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 832, - "src": "6534:10:4", + "referencedDeclaration": 964, + "src": "6600:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6202,12 +6392,12 @@ "arguments": [ { "argumentTypes": null, - "id": 851, + "id": 983, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 830, - "src": "6561:6:4", + "referencedDeclaration": 962, + "src": "6627:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6215,12 +6405,12 @@ }, { "argumentTypes": null, - "id": 852, + "id": 984, "name": "_nextID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 828, - "src": "6569:7:4", + "referencedDeclaration": 960, + "src": "6635:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6238,18 +6428,18 @@ "typeString": "uint256" } ], - "id": 850, + "id": 982, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "6548:12:4", + "referencedDeclaration": 1486, + "src": "6614:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 853, + "id": 985, "isConstant": false, "isLValue": false, "isPure": false, @@ -6257,13 +6447,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6548:29:4", + "src": "6614:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6534:43:4", + "src": "6600:43:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6277,19 +6467,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 857, + "id": 989, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 855, + "id": 987, "name": "_nextID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 828, - "src": "6581:7:4", + "referencedDeclaration": 960, + "src": "6647:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6300,14 +6490,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 856, + "id": 988, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6592:1:4", + "src": "6658:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6315,34 +6505,34 @@ }, "value": "0" }, - "src": "6581:12:4", + "src": "6647:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6534:59:4", + "src": "6600:59:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 859, + "id": 991, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "6533:61:4", + "src": "6599:61:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "6516:78:4" + "src": "6582:78:6" }, { "expression": { @@ -6351,19 +6541,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 863, + "id": 995, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 861, + "id": 993, "name": "prevValid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 838, - "src": "6607:9:4", + "referencedDeclaration": 970, + "src": "6673:9:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6373,32 +6563,32 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 862, + "id": 994, "name": "nextValid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 848, - "src": "6620:9:4", + "referencedDeclaration": 980, + "src": "6686:9:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6607:22:4", + "src": "6673:22:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 836, - "id": 864, + "functionReturnParameters": 968, + "id": 996, "nodeType": "Return", - "src": "6600:29:4" + "src": "6666:29:6" } ] }, "documentation": "@dev Compares previous and next poll's committed tokens for sorting purposes\n@param _prevID Integer identifier associated with previous poll in sorted order\n@param _nextID Integer identifier associated with next poll in sorted order\n@param _voter Address of user to check DLL position for\n@param _numTokens The number of tokens to be committed towards the poll (used for sorting)\n@return valid Boolean indication of if the specified position maintains the sort", - "id": 866, + "id": 998, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -6406,16 +6596,16 @@ "name": "validPosition", "nodeType": "FunctionDefinition", "parameters": { - "id": 833, + "id": 965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 826, + "id": 958, "name": "_prevID", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6263:12:4", + "scope": 998, + "src": "6329:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6423,10 +6613,10 @@ "typeString": "uint256" }, "typeName": { - "id": 825, + "id": 957, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6263:4:4", + "src": "6329:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6437,11 +6627,11 @@ }, { "constant": false, - "id": 828, + "id": 960, "name": "_nextID", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6281:12:4", + "scope": 998, + "src": "6347:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6449,10 +6639,10 @@ "typeString": "uint256" }, "typeName": { - "id": 827, + "id": 959, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6281:4:4", + "src": "6347:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6463,11 +6653,11 @@ }, { "constant": false, - "id": 830, + "id": 962, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6299:14:4", + "scope": 998, + "src": "6365:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6475,10 +6665,10 @@ "typeString": "address" }, "typeName": { - "id": 829, + "id": 961, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6299:7:4", + "src": "6365:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6489,11 +6679,11 @@ }, { "constant": false, - "id": 832, + "id": 964, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6319:15:4", + "scope": 998, + "src": "6385:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6501,10 +6691,10 @@ "typeString": "uint256" }, "typeName": { - "id": 831, + "id": 963, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6319:4:4", + "src": "6385:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6514,20 +6704,20 @@ "visibility": "internal" } ], - "src": "6257:81:4" + "src": "6323:81:6" }, "payable": false, "returnParameters": { - "id": 836, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 835, + "id": 967, "name": "valid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6360:10:4", + "scope": 998, + "src": "6426:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6535,10 +6725,10 @@ "typeString": "bool" }, "typeName": { - "id": 834, + "id": 966, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6360:4:4", + "src": "6426:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6548,19 +6738,19 @@ "visibility": "internal" } ], - "src": "6359:12:4" + "src": "6425:12:6" }, - "scope": 1471, - "src": "6235:399:4", + "scope": 1618, + "src": "6301:399:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 980, + "id": 1124, "nodeType": "Block", - "src": "7055:1062:4", + "src": "7121:1126:6", "statements": [ { "expression": { @@ -6571,12 +6761,12 @@ "arguments": [ { "argumentTypes": null, - "id": 877, + "id": 1009, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7133:7:4", + "referencedDeclaration": 1000, + "src": "7199:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6590,18 +6780,18 @@ "typeString": "uint256" } ], - "id": 876, + "id": 1008, "name": "revealPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1236, - "src": "7114:18:4", + "referencedDeclaration": 1383, + "src": "7180:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 878, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -6609,7 +6799,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7114:27:4", + "src": "7180:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6623,21 +6813,21 @@ "typeString": "bool" } ], - "id": 875, + "id": 1007, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7106:7:4", + "referencedDeclaration": 4156, + "src": "7172:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 879, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": false, @@ -6645,15 +6835,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7106:36:4", + "src": "7172:36:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 880, + "id": 1012, "nodeType": "ExpressionStatement", - "src": "7106:36:4" + "src": "7172:36:6" }, { "expression": { @@ -6667,26 +6857,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 882, + "id": 1014, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7156:7:4", + "referencedDeclaration": 655, + "src": "7222:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 884, + "id": 1016, "indexExpression": { "argumentTypes": null, - "id": 883, + "id": 1015, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7164:7:4", + "referencedDeclaration": 1000, + "src": "7230:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6697,43 +6887,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7156:16:4", + "src": "7222:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 885, + "id": 1017, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "7156:26:4", + "referencedDeclaration": 641, + "src": "7222:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 888, + "id": 1020, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 886, + "id": 1018, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7183:3:4", + "referencedDeclaration": 4153, + "src": "7249:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 887, + "id": 1019, "isConstant": false, "isLValue": false, "isPure": false, @@ -6741,7 +6931,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7183:10:4", + "src": "7249:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6752,7 +6942,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7156:38:4", + "src": "7222:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6766,21 +6956,21 @@ "typeString": "bool" } ], - "id": 881, + "id": 1013, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7148:7:4", + "referencedDeclaration": 4156, + "src": "7214:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 889, + "id": 1021, "isConstant": false, "isLValue": false, "isPure": false, @@ -6788,15 +6978,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7148:47:4", + "src": "7214:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 890, + "id": 1022, "nodeType": "ExpressionStatement", - "src": "7148:47:4" + "src": "7214:47:6" }, { "expression": { @@ -6804,7 +6994,7 @@ "arguments": [ { "argumentTypes": null, - "id": 899, + "id": 1031, "isConstant": false, "isLValue": false, "isPure": false, @@ -6812,7 +7002,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "7286:39:4", + "src": "7352:39:6", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -6821,26 +7011,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 892, + "id": 1024, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7287:7:4", + "referencedDeclaration": 655, + "src": "7353:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 894, + "id": 1026, "indexExpression": { "argumentTypes": null, - "id": 893, + "id": 1025, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7295:7:4", + "referencedDeclaration": 1000, + "src": "7361:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6851,43 +7041,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7287:16:4", + "src": "7353:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 895, + "id": 1027, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "7287:26:4", + "referencedDeclaration": 645, + "src": "7353:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 898, + "id": 1030, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 896, + "id": 1028, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7314:3:4", + "referencedDeclaration": 4153, + "src": "7380:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 897, + "id": 1029, "isConstant": false, "isLValue": false, "isPure": false, @@ -6895,7 +7085,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7314:10:4", + "src": "7380:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6906,7 +7096,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7287:38:4", + "src": "7353:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6925,21 +7115,21 @@ "typeString": "bool" } ], - "id": 891, + "id": 1023, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7278:7:4", + "referencedDeclaration": 4156, + "src": "7344:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 900, + "id": 1032, "isConstant": false, "isLValue": false, "isPure": false, @@ -6947,15 +7137,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7278:48:4", + "src": "7344:48:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 901, + "id": 1033, "nodeType": "ExpressionStatement", - "src": "7278:48:4" + "src": "7344:48:6" }, { "expression": { @@ -6967,7 +7157,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 915, + "id": 1047, "isConstant": false, "isLValue": false, "isPure": false, @@ -6980,12 +7170,12 @@ "arguments": [ { "argumentTypes": null, - "id": 906, + "id": 1038, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "7436:11:4", + "referencedDeclaration": 1002, + "src": "7502:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6993,12 +7183,12 @@ }, { "argumentTypes": null, - "id": 907, + "id": 1039, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 872, - "src": "7449:5:4", + "referencedDeclaration": 1004, + "src": "7515:5:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7018,18 +7208,18 @@ ], "expression": { "argumentTypes": null, - "id": 904, + "id": 1036, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "7419:3:4", + "referencedDeclaration": 4140, + "src": "7485:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 905, + "id": 1037, "isConstant": false, "isLValue": false, "isPure": true, @@ -7037,13 +7227,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7419:16:4", + "src": "7485:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 908, + "id": 1040, "isConstant": false, "isLValue": false, "isPure": false, @@ -7051,7 +7241,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7419:36:4", + "src": "7485:36:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -7065,18 +7255,18 @@ "typeString": "bytes memory" } ], - "id": 903, + "id": 1035, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "7409:9:4", + "referencedDeclaration": 4147, + "src": "7475:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 909, + "id": 1041, "isConstant": false, "isLValue": false, "isPure": false, @@ -7084,7 +7274,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7409:47:4", + "src": "7475:47:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7099,18 +7289,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 911, + "id": 1043, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7474:3:4", + "referencedDeclaration": 4153, + "src": "7540:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 912, + "id": 1044, "isConstant": false, "isLValue": false, "isPure": false, @@ -7118,7 +7308,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7474:10:4", + "src": "7540:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7126,12 +7316,12 @@ }, { "argumentTypes": null, - "id": 913, + "id": 1045, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7486:7:4", + "referencedDeclaration": 1000, + "src": "7552:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7149,18 +7339,18 @@ "typeString": "uint256" } ], - "id": 910, + "id": 1042, "name": "getCommitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1320, - "src": "7460:13:4", + "referencedDeclaration": 1467, + "src": "7526:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) view returns (bytes32)" } }, - "id": 914, + "id": 1046, "isConstant": false, "isLValue": false, "isPure": false, @@ -7168,13 +7358,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7460:34:4", + "src": "7526:34:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "7409:85:4", + "src": "7475:85:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7188,21 +7378,21 @@ "typeString": "bool" } ], - "id": 902, + "id": 1034, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7401:7:4", + "referencedDeclaration": 4156, + "src": "7467:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 916, + "id": 1048, "isConstant": false, "isLValue": false, "isPure": false, @@ -7210,28 +7400,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7401:94:4", + "src": "7467:94:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 917, + "id": 1049, "nodeType": "ExpressionStatement", - "src": "7401:94:4" + "src": "7467:94:6" }, { "assignments": [ - 919 + 1051 ], "declarations": [ { "constant": false, - "id": 919, + "id": 1051, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7563:14:4", + "scope": 1125, + "src": "7629:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7239,10 +7429,10 @@ "typeString": "uint256" }, "typeName": { - "id": 918, + "id": 1050, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7563:4:4", + "src": "7629:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7252,7 +7442,7 @@ "visibility": "internal" } ], - "id": 925, + "id": 1057, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7260,18 +7450,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 921, + "id": 1053, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7593:3:4", + "referencedDeclaration": 4153, + "src": "7659:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 922, + "id": 1054, "isConstant": false, "isLValue": false, "isPure": false, @@ -7279,7 +7469,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7593:10:4", + "src": "7659:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7287,12 +7477,12 @@ }, { "argumentTypes": null, - "id": 923, + "id": 1055, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7605:7:4", + "referencedDeclaration": 1000, + "src": "7671:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7310,18 +7500,18 @@ "typeString": "uint256" } ], - "id": 920, + "id": 1052, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "7580:12:4", + "referencedDeclaration": 1486, + "src": "7646:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 924, + "id": 1056, "isConstant": false, "isLValue": false, "isPure": false, @@ -7329,14 +7519,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7580:33:4", + "src": "7646:33:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7563:50:4" + "src": "7629:50:6" }, { "condition": { @@ -7345,19 +7535,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 928, + "id": 1060, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 926, + "id": 1058, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "7624:11:4", + "referencedDeclaration": 1002, + "src": "7690:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7368,14 +7558,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 927, + "id": 1059, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7639:1:4", + "src": "7705:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -7383,21 +7573,21 @@ }, "value": "1" }, - "src": "7624:16:4", + "src": "7690:16:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 944, + "id": 1088, "nodeType": "Block", - "src": "7746:57:4", + "src": "7842:91:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 942, + "id": 1086, "isConstant": false, "isLValue": false, "isPure": false, @@ -7408,26 +7598,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 937, + "id": 1075, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7754:7:4", + "referencedDeclaration": 655, + "src": "7850:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 939, + "id": 1077, "indexExpression": { "argumentTypes": null, - "id": 938, + "id": 1076, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7762:7:4", + "referencedDeclaration": 1000, + "src": "7858:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7438,65 +7628,160 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7754:16:4", + "src": "7850:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 940, + "id": 1078, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "7754:29:4", + "referencedDeclaration": 637, + "src": "7850:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 941, - "name": "numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7787:9:4", + "arguments": [ + { + "argumentTypes": null, + "id": 1084, + "name": "numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1051, + "src": "7916:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 1079, + "name": "pollMap", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 655, + "src": "7882:7:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", + "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" + } + }, + "id": 1081, + "indexExpression": { + "argumentTypes": null, + "id": 1080, + "name": "_pollID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1000, + "src": "7890:7:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "7882:16:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_storage", + "typeString": "struct PLCRVoting.Poll storage ref" + } + }, + "id": 1082, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesAgainst", + "nodeType": "MemberAccess", + "referencedDeclaration": 637, + "src": "7882:29:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1083, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "7882:33:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 1085, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7882:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7754:42:4", + "src": "7850:76:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 943, + "id": 1087, "nodeType": "ExpressionStatement", - "src": "7754:42:4" + "src": "7850:76:6" } ] }, - "id": 945, + "id": 1089, "nodeType": "IfStatement", - "src": "7620:183:4", + "src": "7686:247:6", "trueBody": { - "id": 936, + "id": 1074, "nodeType": "Block", - "src": "7642:98:4", + "src": "7708:128:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 934, + "id": 1072, "isConstant": false, "isLValue": false, "isPure": false, @@ -7507,26 +7792,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 929, + "id": 1061, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7695:7:4", + "referencedDeclaration": 655, + "src": "7761:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 931, + "id": 1063, "indexExpression": { "argumentTypes": null, - "id": 930, + "id": 1062, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7703:7:4", + "referencedDeclaration": 1000, + "src": "7769:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7537,50 +7822,145 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7695:16:4", + "src": "7761:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 932, + "id": 1064, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "7695:25:4", + "referencedDeclaration": 635, + "src": "7761:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 933, - "name": "numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7724:9:4", + "arguments": [ + { + "argumentTypes": null, + "id": 1070, + "name": "numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1051, + "src": "7819:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 1065, + "name": "pollMap", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 655, + "src": "7789:7:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", + "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" + } + }, + "id": 1067, + "indexExpression": { + "argumentTypes": null, + "id": 1066, + "name": "_pollID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1000, + "src": "7797:7:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "7789:16:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_storage", + "typeString": "struct PLCRVoting.Poll storage ref" + } + }, + "id": 1068, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesFor", + "nodeType": "MemberAccess", + "referencedDeclaration": 635, + "src": "7789:25:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1069, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "7789:29:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 1071, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7789:40:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7695:38:4", + "src": "7761:68:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 935, + "id": 1073, "nodeType": "ExpressionStatement", - "src": "7695:38:4" + "src": "7761:68:6" } ] } @@ -7591,12 +7971,12 @@ "arguments": [ { "argumentTypes": null, - "id": 951, + "id": 1095, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7835:7:4", + "referencedDeclaration": 1000, + "src": "7965:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7614,34 +7994,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 946, + "id": 1090, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "7809:6:4", + "referencedDeclaration": 663, + "src": "7939:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 949, + "id": 1093, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 947, + "id": 1091, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7816:3:4", + "referencedDeclaration": 4153, + "src": "7946:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 948, + "id": 1092, "isConstant": false, "isLValue": false, "isPure": false, @@ -7649,7 +8029,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7816:10:4", + "src": "7946:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7660,27 +8040,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7809:18:4", + "src": "7939:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 950, + "id": 1094, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "remove", "nodeType": "MemberAccess", - "referencedDeclaration": 364, - "src": "7809:25:4", + "referencedDeclaration": 484, + "src": "7939:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 952, + "id": 1096, "isConstant": false, "isLValue": false, "isPure": false, @@ -7688,20 +8068,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7809:34:4", + "src": "7939:34:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 953, + "id": 1097, "nodeType": "ExpressionStatement", - "src": "7809:34:4" + "src": "7939:34:6" }, { "expression": { "argumentTypes": null, - "id": 962, + "id": 1106, "isConstant": false, "isLValue": false, "isPure": false, @@ -7714,26 +8094,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 954, + "id": 1098, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7903:7:4", + "referencedDeclaration": 655, + "src": "8033:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 956, + "id": 1100, "indexExpression": { "argumentTypes": null, - "id": 955, + "id": 1099, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7911:7:4", + "referencedDeclaration": 1000, + "src": "8041:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7744,43 +8124,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7903:16:4", + "src": "8033:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 957, + "id": 1101, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "7903:26:4", + "referencedDeclaration": 645, + "src": "8033:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 960, + "id": 1104, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 958, + "id": 1102, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7930:3:4", + "referencedDeclaration": 4153, + "src": "8060:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 959, + "id": 1103, "isConstant": false, "isLValue": false, "isPure": false, @@ -7788,7 +8168,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7930:10:4", + "src": "8060:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7799,7 +8179,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7903:38:4", + "src": "8033:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7810,14 +8190,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 961, + "id": 1105, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "7944:4:4", + "src": "8074:4:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -7825,15 +8205,15 @@ }, "value": "true" }, - "src": "7903:45:4", + "src": "8033:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 963, + "id": 1107, "nodeType": "ExpressionStatement", - "src": "7903:45:4" + "src": "8033:45:6" }, { "eventCall": { @@ -7841,12 +8221,12 @@ "arguments": [ { "argumentTypes": null, - "id": 965, + "id": 1109, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7981:7:4", + "referencedDeclaration": 1000, + "src": "8111:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7854,12 +8234,12 @@ }, { "argumentTypes": null, - "id": 966, + "id": 1110, "name": "numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7996:9:4", + "referencedDeclaration": 1051, + "src": "8126:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7871,26 +8251,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 967, + "id": 1111, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8013:7:4", + "referencedDeclaration": 655, + "src": "8143:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 969, + "id": 1113, "indexExpression": { "argumentTypes": null, - "id": 968, + "id": 1112, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "8021:7:4", + "referencedDeclaration": 1000, + "src": "8151:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7901,21 +8281,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8013:16:4", + "src": "8143:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 970, + "id": 1114, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "8013:25:4", + "referencedDeclaration": 635, + "src": "8143:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7927,26 +8307,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 971, + "id": 1115, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8046:7:4", + "referencedDeclaration": 655, + "src": "8176:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 973, + "id": 1117, "indexExpression": { "argumentTypes": null, - "id": 972, + "id": 1116, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "8054:7:4", + "referencedDeclaration": 1000, + "src": "8184:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7957,21 +8337,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8046:16:4", + "src": "8176:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 974, + "id": 1118, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "8046:29:4", + "referencedDeclaration": 637, + "src": "8176:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7979,12 +8359,12 @@ }, { "argumentTypes": null, - "id": 975, + "id": 1119, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "8083:11:4", + "referencedDeclaration": 1002, + "src": "8213:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7994,18 +8374,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 976, + "id": 1120, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8096:3:4", + "referencedDeclaration": 4153, + "src": "8226:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 977, + "id": 1121, "isConstant": false, "isLValue": false, "isPure": false, @@ -8013,7 +8393,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8096:10:4", + "src": "8226:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8047,18 +8427,18 @@ "typeString": "address" } ], - "id": 964, + "id": 1108, "name": "_VoteRevealed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 468, - "src": "7960:13:4", + "referencedDeclaration": 588, + "src": "8090:13:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,uint256,uint256,uint256,address)" } }, - "id": 978, + "id": 1122, "isConstant": false, "isLValue": false, "isPure": false, @@ -8066,20 +8446,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7960:152:4", + "src": "8090:152:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 979, + "id": 1123, "nodeType": "EmitStatement", - "src": "7955:157:4" + "src": "8085:157:6" } ] }, "documentation": "@notice Reveals vote with choice and secret salt used in generating commitHash to attribute committed tokens\n@param _pollID Integer identifier associated with target poll\n@param _voteOption Vote choice used to generate commitHash for associated poll\n@param _salt Secret number used to generate commitHash for associated poll", - "id": 981, + "id": 1125, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -8087,16 +8467,16 @@ "name": "revealVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 873, + "id": 1005, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 868, + "id": 1000, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7002:12:4", + "scope": 1125, + "src": "7068:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8104,10 +8484,10 @@ "typeString": "uint256" }, "typeName": { - "id": 867, + "id": 999, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7002:4:4", + "src": "7068:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8118,11 +8498,11 @@ }, { "constant": false, - "id": 870, + "id": 1002, "name": "_voteOption", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7016:16:4", + "scope": 1125, + "src": "7082:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8130,10 +8510,10 @@ "typeString": "uint256" }, "typeName": { - "id": 869, + "id": 1001, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7016:4:4", + "src": "7082:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8144,11 +8524,11 @@ }, { "constant": false, - "id": 872, + "id": 1004, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7034:10:4", + "scope": 1125, + "src": "7100:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8156,10 +8536,10 @@ "typeString": "uint256" }, "typeName": { - "id": 871, + "id": 1003, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7034:4:4", + "src": "7100:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8169,26 +8549,26 @@ "visibility": "internal" } ], - "src": "7001:44:4" + "src": "7067:44:6" }, "payable": false, "returnParameters": { - "id": 874, + "id": 1006, "nodeType": "ParameterList", "parameters": [], - "src": "7055:0:4" + "src": "7121:0:6" }, - "scope": 1471, - "src": "6982:1135:4", + "scope": 1618, + "src": "7048:1199:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1044, + "id": 1188, "nodeType": "Block", - "src": "8442:356:4", + "src": "8572:356:6", "statements": [ { "expression": { @@ -8199,12 +8579,12 @@ "arguments": [ { "argumentTypes": null, - "id": 994, + "id": 1138, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8466:7:4", + "referencedDeclaration": 1129, + "src": "8596:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8218,18 +8598,18 @@ "typeString": "uint256" } ], - "id": 993, + "id": 1137, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "8456:9:4", + "referencedDeclaration": 1334, + "src": "8586:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 995, + "id": 1139, "isConstant": false, "isLValue": false, "isPure": false, @@ -8237,7 +8617,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8456:18:4", + "src": "8586:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8251,21 +8631,21 @@ "typeString": "bool" } ], - "id": 992, + "id": 1136, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8448:7:4", + "referencedDeclaration": 4156, + "src": "8578:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 996, + "id": 1140, "isConstant": false, "isLValue": false, "isPure": false, @@ -8273,15 +8653,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8448:27:4", + "src": "8578:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 997, + "id": 1141, "nodeType": "ExpressionStatement", - "src": "8448:27:4" + "src": "8578:27:6" }, { "expression": { @@ -8295,26 +8675,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 999, + "id": 1143, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8489:7:4", + "referencedDeclaration": 655, + "src": "8619:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1001, + "id": 1145, "indexExpression": { "argumentTypes": null, - "id": 1000, + "id": 1144, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8497:7:4", + "referencedDeclaration": 1129, + "src": "8627:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8325,35 +8705,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8489:16:4", + "src": "8619:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1002, + "id": 1146, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "8489:26:4", + "referencedDeclaration": 645, + "src": "8619:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1004, + "id": 1148, "indexExpression": { "argumentTypes": null, - "id": 1003, + "id": 1147, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8516:6:4", + "referencedDeclaration": 1127, + "src": "8646:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8364,7 +8744,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8489:34:4", + "src": "8619:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8378,21 +8758,21 @@ "typeString": "bool" } ], - "id": 998, + "id": 1142, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8481:7:4", + "referencedDeclaration": 4156, + "src": "8611:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1005, + "id": 1149, "isConstant": false, "isLValue": false, "isPure": false, @@ -8400,28 +8780,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8481:43:4", + "src": "8611:43:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1006, + "id": 1150, "nodeType": "ExpressionStatement", - "src": "8481:43:4" + "src": "8611:43:6" }, { "assignments": [ - 1008 + 1152 ], "declarations": [ { "constant": false, - "id": 1008, + "id": 1152, "name": "winningChoice", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8531:18:4", + "scope": 1189, + "src": "8661:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8429,10 +8809,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1007, + "id": 1151, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8531:4:4", + "src": "8661:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8442,7 +8822,7 @@ "visibility": "internal" } ], - "id": 1015, + "id": 1159, "initialValue": { "argumentTypes": null, "condition": { @@ -8450,12 +8830,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1010, + "id": 1154, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8561:7:4", + "referencedDeclaration": 1129, + "src": "8691:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8469,18 +8849,18 @@ "typeString": "uint256" } ], - "id": 1009, + "id": 1153, "name": "isPassed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1138, - "src": "8552:8:4", + "referencedDeclaration": 1285, + "src": "8682:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1011, + "id": 1155, "isConstant": false, "isLValue": false, "isPure": false, @@ -8488,7 +8868,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8552:17:4", + "src": "8682:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8497,14 +8877,14 @@ "falseExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1013, + "id": 1157, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8576:1:4", + "src": "8706:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -8512,24 +8892,24 @@ }, "value": "0" }, - "id": 1014, + "id": 1158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "8552:25:4", + "src": "8682:25:6", "trueExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1012, + "id": 1156, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8572:1:4", + "src": "8702:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -8543,20 +8923,20 @@ } }, "nodeType": "VariableDeclarationStatement", - "src": "8531:46:4" + "src": "8661:46:6" }, { "assignments": [ - 1017 + 1161 ], "declarations": [ { "constant": false, - "id": 1017, + "id": 1161, "name": "winnerHash", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8583:18:4", + "scope": 1189, + "src": "8713:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8564,10 +8944,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1016, + "id": 1160, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8583:7:4", + "src": "8713:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8577,7 +8957,7 @@ "visibility": "internal" } ], - "id": 1025, + "id": 1169, "initialValue": { "argumentTypes": null, "arguments": [ @@ -8586,12 +8966,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1021, + "id": 1165, "name": "winningChoice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1008, - "src": "8631:13:4", + "referencedDeclaration": 1152, + "src": "8761:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8599,12 +8979,12 @@ }, { "argumentTypes": null, - "id": 1022, + "id": 1166, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 987, - "src": "8646:5:4", + "referencedDeclaration": 1131, + "src": "8776:5:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8624,18 +9004,18 @@ ], "expression": { "argumentTypes": null, - "id": 1019, + "id": 1163, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "8614:3:4", + "referencedDeclaration": 4140, + "src": "8744:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1020, + "id": 1164, "isConstant": false, "isLValue": false, "isPure": true, @@ -8643,13 +9023,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8614:16:4", + "src": "8744:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1023, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": false, @@ -8657,7 +9037,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8614:38:4", + "src": "8744:38:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -8671,18 +9051,18 @@ "typeString": "bytes memory" } ], - "id": 1018, + "id": 1162, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "8604:9:4", + "referencedDeclaration": 4147, + "src": "8734:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1024, + "id": 1168, "isConstant": false, "isLValue": false, "isPure": false, @@ -8690,27 +9070,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8604:49:4", + "src": "8734:49:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "8583:70:4" + "src": "8713:70:6" }, { "assignments": [ - 1027 + 1171 ], "declarations": [ { "constant": false, - "id": 1027, + "id": 1171, "name": "commitHash", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8659:18:4", + "scope": 1189, + "src": "8789:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8718,10 +9098,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1026, + "id": 1170, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8659:7:4", + "src": "8789:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8731,18 +9111,18 @@ "visibility": "internal" } ], - "id": 1032, + "id": 1176, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1029, + "id": 1173, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8694:6:4", + "referencedDeclaration": 1127, + "src": "8824:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8750,12 +9130,12 @@ }, { "argumentTypes": null, - "id": 1030, + "id": 1174, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8702:7:4", + "referencedDeclaration": 1129, + "src": "8832:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8773,18 +9153,18 @@ "typeString": "uint256" } ], - "id": 1028, + "id": 1172, "name": "getCommitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1320, - "src": "8680:13:4", + "referencedDeclaration": 1467, + "src": "8810:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) view returns (bytes32)" } }, - "id": 1031, + "id": 1175, "isConstant": false, "isLValue": false, "isPure": false, @@ -8792,14 +9172,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8680:30:4", + "src": "8810:30:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "8659:51:4" + "src": "8789:51:6" }, { "expression": { @@ -8811,19 +9191,19 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1036, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1034, + "id": 1178, "name": "winnerHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1017, - "src": "8725:10:4", + "referencedDeclaration": 1161, + "src": "8855:10:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8833,18 +9213,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1035, + "id": 1179, "name": "commitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1027, - "src": "8739:10:4", + "referencedDeclaration": 1171, + "src": "8869:10:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "8725:24:4", + "src": "8855:24:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8858,21 +9238,21 @@ "typeString": "bool" } ], - "id": 1033, + "id": 1177, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8717:7:4", + "referencedDeclaration": 4156, + "src": "8847:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1037, + "id": 1181, "isConstant": false, "isLValue": false, "isPure": false, @@ -8880,15 +9260,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8717:33:4", + "src": "8847:33:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1038, + "id": 1182, "nodeType": "ExpressionStatement", - "src": "8717:33:4" + "src": "8847:33:6" }, { "expression": { @@ -8896,12 +9276,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1040, + "id": 1184, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8777:6:4", + "referencedDeclaration": 1127, + "src": "8907:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8909,12 +9289,12 @@ }, { "argumentTypes": null, - "id": 1041, + "id": 1185, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8785:7:4", + "referencedDeclaration": 1129, + "src": "8915:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8932,18 +9312,18 @@ "typeString": "uint256" } ], - "id": 1039, + "id": 1183, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "8764:12:4", + "referencedDeclaration": 1486, + "src": "8894:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1042, + "id": 1186, "isConstant": false, "isLValue": false, "isPure": false, @@ -8951,21 +9331,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8764:29:4", + "src": "8894:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 991, - "id": 1043, + "functionReturnParameters": 1135, + "id": 1187, "nodeType": "Return", - "src": "8757:36:4" + "src": "8887:36:6" } ] }, "documentation": "@param _pollID Integer identifier associated with target poll\n@param _salt Arbitrarily chosen integer used to generate secretHash\n@return correctVotes Number of tokens voted for winning option", - "id": 1045, + "id": 1189, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -8973,16 +9353,16 @@ "name": "getNumPassingTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 988, + "id": 1132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 983, + "id": 1127, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8360:14:4", + "scope": 1189, + "src": "8490:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8990,10 +9370,10 @@ "typeString": "address" }, "typeName": { - "id": 982, + "id": 1126, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8360:7:4", + "src": "8490:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9004,11 +9384,11 @@ }, { "constant": false, - "id": 985, + "id": 1129, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8376:12:4", + "scope": 1189, + "src": "8506:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9016,10 +9396,10 @@ "typeString": "uint256" }, "typeName": { - "id": 984, + "id": 1128, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8376:4:4", + "src": "8506:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9030,11 +9410,11 @@ }, { "constant": false, - "id": 987, + "id": 1131, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8390:10:4", + "scope": 1189, + "src": "8520:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9042,10 +9422,10 @@ "typeString": "uint256" }, "typeName": { - "id": 986, + "id": 1130, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8390:4:4", + "src": "8520:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9055,20 +9435,20 @@ "visibility": "internal" } ], - "src": "8359:42:4" + "src": "8489:42:6" }, "payable": false, "returnParameters": { - "id": 991, + "id": 1135, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 990, + "id": 1134, "name": "correctVotes", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8423:17:4", + "scope": 1189, + "src": "8553:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9076,10 +9456,10 @@ "typeString": "uint256" }, "typeName": { - "id": 989, + "id": 1133, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8423:4:4", + "src": "8553:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9089,36 +9469,36 @@ "visibility": "internal" } ], - "src": "8422:19:4" + "src": "8552:19:6" }, - "scope": 1471, - "src": "8331:467:4", + "scope": 1618, + "src": "8461:467:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1100, + "id": 1245, "nodeType": "Block", - "src": "9327:495:4", + "src": "9457:498:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1060, + "id": 1205, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1056, + "id": 1200, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9333:9:4", + "referencedDeclaration": 651, + "src": "9463:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9128,76 +9508,96 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1059, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 1057, - "name": "pollNonce", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9345:9:4", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "hexValue": "31", + "id": 1203, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "9489:1:6", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_1_by_1", + "typeString": "int_const 1" + }, + "value": "1" } - }, - "nodeType": "BinaryOperation", - "operator": "+", - "rightExpression": { - "argumentTypes": null, - "hexValue": "31", - "id": 1058, + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_1_by_1", + "typeString": "int_const 1" + } + ], + "expression": { + "argumentTypes": null, + "id": 1201, + "name": "pollNonce", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 651, + "src": "9475:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1202, "isConstant": false, "isLValue": false, - "isPure": true, - "kind": "number", + "isPure": false, "lValueRequested": false, - "nodeType": "Literal", - "src": "9357:1:4", - "subdenomination": null, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "9475:13:6", "typeDescriptions": { - "typeIdentifier": "t_rational_1_by_1", - "typeString": "int_const 1" - }, - "value": "1" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } }, - "src": "9345:13:4", + "id": 1204, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9475:16:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9333:25:4", + "src": "9463:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1061, + "id": 1206, "nodeType": "ExpressionStatement", - "src": "9333:25:4" + "src": "9463:28:6" }, { "assignments": [ - 1063 + 1208 ], "declarations": [ { "constant": false, - "id": 1063, + "id": 1208, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9365:18:4", + "scope": 1246, + "src": "9498:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9205,10 +9605,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1062, + "id": 1207, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9365:4:4", + "src": "9498:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9218,18 +9618,18 @@ "visibility": "internal" } ], - "id": 1069, + "id": 1214, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1067, + "id": 1212, "name": "_commitDuration", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1049, - "src": "9406:15:4", + "referencedDeclaration": 1193, + "src": "9539:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9247,18 +9647,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1064, + "id": 1209, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "9386:5:4", + "referencedDeclaration": 4143, + "src": "9519:5:6", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1065, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": false, @@ -9266,27 +9666,27 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9386:15:4", + "src": "9519:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1066, + "id": 1211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "9386:19:4", + "referencedDeclaration": 3890, + "src": "9519:19:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1068, + "id": 1213, "isConstant": false, "isLValue": false, "isPure": false, @@ -9294,27 +9694,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9386:36:4", + "src": "9519:36:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9365:57:4" + "src": "9498:57:6" }, { "assignments": [ - 1071 + 1216 ], "declarations": [ { "constant": false, - "id": 1071, + "id": 1216, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9428:18:4", + "scope": 1246, + "src": "9561:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9322,10 +9722,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1070, + "id": 1215, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9428:4:4", + "src": "9561:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9335,18 +9735,18 @@ "visibility": "internal" } ], - "id": 1076, + "id": 1221, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1074, + "id": 1219, "name": "_revealDuration", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1051, - "src": "9467:15:4", + "referencedDeclaration": 1195, + "src": "9600:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9362,32 +9762,32 @@ ], "expression": { "argumentTypes": null, - "id": 1072, + "id": 1217, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9449:13:4", + "referencedDeclaration": 1208, + "src": "9582:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1073, + "id": 1218, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "9449:17:4", + "referencedDeclaration": 3890, + "src": "9582:17:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1075, + "id": 1220, "isConstant": false, "isLValue": false, "isPure": false, @@ -9395,19 +9795,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9449:34:4", + "src": "9582:34:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9428:55:4" + "src": "9561:55:6" }, { "expression": { "argumentTypes": null, - "id": 1087, + "id": 1232, "isConstant": false, "isLValue": false, "isPure": false, @@ -9416,26 +9816,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1077, + "id": 1222, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "9490:7:4", + "referencedDeclaration": 655, + "src": "9623:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1079, + "id": 1224, "indexExpression": { "argumentTypes": null, - "id": 1078, + "id": 1223, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9498:9:4", + "referencedDeclaration": 651, + "src": "9631:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9446,9 +9846,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "9490:18:4", + "src": "9623:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, @@ -9459,12 +9859,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1081, + "id": 1226, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1047, - "src": "9536:11:4", + "referencedDeclaration": 1191, + "src": "9669:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9472,12 +9872,12 @@ }, { "argumentTypes": null, - "id": 1082, + "id": 1227, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9570:13:4", + "referencedDeclaration": 1208, + "src": "9703:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9485,12 +9885,12 @@ }, { "argumentTypes": null, - "id": 1083, + "id": 1228, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1071, - "src": "9606:13:4", + "referencedDeclaration": 1216, + "src": "9739:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9499,14 +9899,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1084, + "id": 1229, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "9637:1:4", + "src": "9770:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -9517,14 +9917,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1085, + "id": 1230, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "9660:1:4", + "src": "9793:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -9535,18 +9935,18 @@ ], "expression": { "argumentTypes": null, - "id": 1080, + "id": 1225, "name": "Poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 526, - "src": "9511:4:4", + "referencedDeclaration": 646, + "src": "9644:4:6", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Poll_$526_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Poll_$646_storage_ptr_$", "typeString": "type(struct PLCRVoting.Poll storage pointer)" } }, - "id": 1086, + "id": 1231, "isConstant": false, "isLValue": false, "isPure": false, @@ -9560,21 +9960,21 @@ "votesAgainst" ], "nodeType": "FunctionCall", - "src": "9511:157:4", + "src": "9644:157:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory", + "typeIdentifier": "t_struct$_Poll_$646_memory", "typeString": "struct PLCRVoting.Poll memory" } }, - "src": "9490:178:4", + "src": "9623:178:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1088, + "id": 1233, "nodeType": "ExpressionStatement", - "src": "9490:178:4" + "src": "9623:178:6" }, { "eventCall": { @@ -9582,12 +9982,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1090, + "id": 1235, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1047, - "src": "9700:11:4", + "referencedDeclaration": 1191, + "src": "9833:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9595,12 +9995,12 @@ }, { "argumentTypes": null, - "id": 1091, + "id": 1236, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9719:13:4", + "referencedDeclaration": 1208, + "src": "9852:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9608,12 +10008,12 @@ }, { "argumentTypes": null, - "id": 1092, + "id": 1237, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1071, - "src": "9740:13:4", + "referencedDeclaration": 1216, + "src": "9873:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9621,12 +10021,12 @@ }, { "argumentTypes": null, - "id": 1093, + "id": 1238, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9761:9:4", + "referencedDeclaration": 651, + "src": "9894:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9636,18 +10036,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1094, + "id": 1239, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9778:3:4", + "referencedDeclaration": 4153, + "src": "9911:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1095, + "id": 1240, "isConstant": false, "isLValue": false, "isPure": false, @@ -9655,7 +10055,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9778:10:4", + "src": "9911:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9685,18 +10085,18 @@ "typeString": "address" } ], - "id": 1089, + "id": 1234, "name": "_PollCreated", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 480, - "src": "9680:12:4", + "referencedDeclaration": 600, + "src": "9813:12:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,uint256,uint256,address)" } }, - "id": 1096, + "id": 1241, "isConstant": false, "isLValue": false, "isPure": false, @@ -9704,39 +10104,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9680:114:4", + "src": "9813:114:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1097, + "id": 1242, "nodeType": "EmitStatement", - "src": "9675:119:4" + "src": "9808:119:6" }, { "expression": { "argumentTypes": null, - "id": 1098, + "id": 1243, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9808:9:4", + "referencedDeclaration": 651, + "src": "9941:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1055, - "id": 1099, + "functionReturnParameters": 1199, + "id": 1244, "nodeType": "Return", - "src": "9801:16:4" + "src": "9934:16:6" } ] }, "documentation": "@dev Initiates a poll with canonical configured parameters at pollID emitted by PollCreated event\n@param _voteQuorum Type of majority (out of 100) that is necessary for poll to be successful\n@param _commitDuration Length of desired commit period in seconds\n@param _revealDuration Length of desired reveal period in seconds", - "id": 1101, + "id": 1246, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -9744,16 +10144,16 @@ "name": "startPoll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1052, + "id": 1196, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1047, + "id": 1191, "name": "_voteQuorum", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9236:16:4", + "scope": 1246, + "src": "9366:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9761,10 +10161,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1046, + "id": 1190, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9236:4:4", + "src": "9366:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9775,11 +10175,11 @@ }, { "constant": false, - "id": 1049, + "id": 1193, "name": "_commitDuration", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9254:20:4", + "scope": 1246, + "src": "9384:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9787,10 +10187,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1048, + "id": 1192, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9254:4:4", + "src": "9384:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9801,11 +10201,11 @@ }, { "constant": false, - "id": 1051, + "id": 1195, "name": "_revealDuration", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9276:20:4", + "scope": 1246, + "src": "9406:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9813,10 +10213,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1050, + "id": 1194, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9276:4:4", + "src": "9406:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9826,20 +10226,20 @@ "visibility": "internal" } ], - "src": "9235:62:4" + "src": "9365:62:6" }, "payable": false, "returnParameters": { - "id": 1055, + "id": 1199, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1054, + "id": 1198, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9314:11:4", + "scope": 1246, + "src": "9444:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9847,10 +10247,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1053, + "id": 1197, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9314:4:4", + "src": "9444:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9860,19 +10260,19 @@ "visibility": "internal" } ], - "src": "9313:13:4" + "src": "9443:13:6" }, - "scope": 1471, - "src": "9217:605:4", + "scope": 1618, + "src": "9347:608:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1137, + "id": 1284, "nodeType": "Block", - "src": "10095:172:4", + "src": "10228:179:6", "statements": [ { "expression": { @@ -9883,12 +10283,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1110, + "id": 1255, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1103, - "src": "10119:7:4", + "referencedDeclaration": 1248, + "src": "10252:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9902,18 +10302,18 @@ "typeString": "uint256" } ], - "id": 1109, + "id": 1254, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "10109:9:4", + "referencedDeclaration": 1334, + "src": "10242:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1111, + "id": 1256, "isConstant": false, "isLValue": false, "isPure": false, @@ -9921,7 +10321,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10109:18:4", + "src": "10242:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9935,21 +10335,21 @@ "typeString": "bool" } ], - "id": 1108, + "id": 1253, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10101:7:4", + "referencedDeclaration": 4156, + "src": "10234:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1112, + "id": 1257, "isConstant": false, "isLValue": false, "isPure": false, @@ -9957,43 +10357,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10101:27:4", + "src": "10234:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1113, + "id": 1258, "nodeType": "ExpressionStatement", - "src": "10101:27:4" + "src": "10234:27:6" }, { "assignments": [ - 1115 + 1260 ], "declarations": [ { "constant": false, - "id": 1115, + "id": 1260, "name": "poll", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10135:16:4", + "scope": 1285, + "src": "10268:16:6", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll" }, "typeName": { "contractScope": null, - "id": 1114, + "id": 1259, "name": "Poll", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 526, - "src": "10135:4:4", + "referencedDeclaration": 646, + "src": "10268:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage_ptr", + "typeIdentifier": "t_struct$_Poll_$646_storage_ptr", "typeString": "struct PLCRVoting.Poll" } }, @@ -10001,31 +10401,31 @@ "visibility": "internal" } ], - "id": 1119, + "id": 1264, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1116, + "id": 1261, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10154:7:4", + "referencedDeclaration": 655, + "src": "10287:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1118, + "id": 1263, "indexExpression": { "argumentTypes": null, - "id": 1117, + "id": 1262, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1103, - "src": "10162:7:4", + "referencedDeclaration": 1248, + "src": "10295:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10036,14 +10436,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10154:16:4", + "src": "10287:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "10135:35:4" + "src": "10268:35:6" }, { "expression": { @@ -10052,7 +10452,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1135, + "id": 1282, "isConstant": false, "isLValue": false, "isPure": false, @@ -10062,79 +10462,99 @@ "components": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1123, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 1120, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "10184:3:4", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 1268, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "10335:3:6", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], "expression": { "argumentTypes": null, - "id": 1121, - "name": "poll", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10190:4:4", + "expression": { + "argumentTypes": null, + "id": 1265, + "name": "poll", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1260, + "src": "10317:4:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", + "typeString": "struct PLCRVoting.Poll memory" + } + }, + "id": 1266, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesFor", + "nodeType": "MemberAccess", + "referencedDeclaration": 635, + "src": "10317:13:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", - "typeString": "struct PLCRVoting.Poll memory" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 1122, + "id": 1267, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "votesFor", + "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10190:13:4", + "referencedDeclaration": 3832, + "src": "10317:17:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10184:19:4", + "id": 1269, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10317:22:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1124, + "id": 1270, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "10183:21:4", + "src": "10316:24:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10147,175 +10567,198 @@ "components": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1133, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "id": 1125, - "name": "poll", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10208:4:4", - "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", - "typeString": "struct PLCRVoting.Poll memory" - } - }, - "id": 1126, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "voteQuorum", - "nodeType": "MemberAccess", - "referencedDeclaration": 513, - "src": "10208:15:4", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1131, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "arguments": [ + { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1127, + "id": 1277, "name": "poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10227:4:4", + "referencedDeclaration": 1260, + "src": "10382:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll memory" } }, - "id": 1128, + "id": 1278, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "votesFor", + "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10227:13:4", + "referencedDeclaration": 637, + "src": "10382:17:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "+", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1129, + "id": 1274, "name": "poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10243:4:4", + "referencedDeclaration": 1260, + "src": "10364:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll memory" } }, - "id": 1130, + "id": 1275, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "votesAgainst", + "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "10243:17:4", + "referencedDeclaration": 635, + "src": "10364:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10227:33:4", + "id": 1276, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "10364:17:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 1279, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10364:36:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], - "id": 1132, + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 1271, + "name": "poll", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1260, + "src": "10344:4:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", + "typeString": "struct PLCRVoting.Poll memory" + } + }, + "id": 1272, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "voteQuorum", + "nodeType": "MemberAccess", + "referencedDeclaration": 633, + "src": "10344:15:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1273, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "10226:35:4", + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "10344:19:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10208:53:4", + "id": 1280, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10344:57:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1134, + "id": 1281, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "10207:55:4", + "src": "10343:59:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10183:79:4", + "src": "10316:86:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1107, - "id": 1136, + "functionReturnParameters": 1252, + "id": 1283, "nodeType": "Return", - "src": "10176:86:4" + "src": "10309:93:6" } ] }, "documentation": "@notice Determines if proposal has passed\n@dev Check if votesFor out of totalVotes exceeds votesQuorum (requires pollEnded)\n@param _pollID Integer identifier associated with target poll", - "id": 1138, + "id": 1285, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -10323,16 +10766,16 @@ "name": "isPassed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1104, + "id": 1249, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1103, + "id": 1248, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10047:12:4", + "scope": 1285, + "src": "10180:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10340,10 +10783,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1102, + "id": 1247, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10047:4:4", + "src": "10180:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10353,20 +10796,20 @@ "visibility": "internal" } ], - "src": "10046:14:4" + "src": "10179:14:6" }, "payable": false, "returnParameters": { - "id": 1107, + "id": 1252, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1106, + "id": 1251, "name": "passed", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10082:11:4", + "scope": 1285, + "src": "10215:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10374,10 +10817,10 @@ "typeString": "bool" }, "typeName": { - "id": 1105, + "id": 1250, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "10082:4:4", + "src": "10215:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10387,19 +10830,19 @@ "visibility": "internal" } ], - "src": "10081:13:4" + "src": "10214:13:6" }, - "scope": 1471, - "src": "10029:238:4", + "scope": 1618, + "src": "10162:245:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1165, + "id": 1312, "nodeType": "Block", - "src": "10664:159:4", + "src": "10804:159:6", "statements": [ { "expression": { @@ -10410,12 +10853,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1147, + "id": 1294, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10688:7:4", + "referencedDeclaration": 1287, + "src": "10828:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10429,18 +10872,18 @@ "typeString": "uint256" } ], - "id": 1146, + "id": 1293, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "10678:9:4", + "referencedDeclaration": 1334, + "src": "10818:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1148, + "id": 1295, "isConstant": false, "isLValue": false, "isPure": false, @@ -10448,7 +10891,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10678:18:4", + "src": "10818:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10462,21 +10905,21 @@ "typeString": "bool" } ], - "id": 1145, + "id": 1292, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10670:7:4", + "referencedDeclaration": 4156, + "src": "10810:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1149, + "id": 1296, "isConstant": false, "isLValue": false, "isPure": false, @@ -10484,15 +10927,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10670:27:4", + "src": "10810:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1150, + "id": 1297, "nodeType": "ExpressionStatement", - "src": "10670:27:4" + "src": "10810:27:6" }, { "condition": { @@ -10500,12 +10943,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1152, + "id": 1299, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10717:7:4", + "referencedDeclaration": 1287, + "src": "10857:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10519,18 +10962,18 @@ "typeString": "uint256" } ], - "id": 1151, + "id": 1298, "name": "isPassed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1138, - "src": "10708:8:4", + "referencedDeclaration": 1285, + "src": "10848:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1153, + "id": 1300, "isConstant": false, "isLValue": false, "isPure": false, @@ -10538,7 +10981,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10708:17:4", + "src": "10848:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10551,26 +10994,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1159, + "id": 1306, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10789:7:4", + "referencedDeclaration": 655, + "src": "10929:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1161, + "id": 1308, "indexExpression": { "argumentTypes": null, - "id": 1160, + "id": 1307, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10797:7:4", + "referencedDeclaration": 1287, + "src": "10937:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10581,34 +11024,34 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10789:16:4", + "src": "10929:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1162, + "id": 1309, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "10789:29:4", + "referencedDeclaration": 637, + "src": "10929:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1144, - "id": 1163, + "functionReturnParameters": 1291, + "id": 1310, "nodeType": "Return", - "src": "10782:36:4" + "src": "10922:36:6" }, - "id": 1164, + "id": 1311, "nodeType": "IfStatement", - "src": "10704:114:4", + "src": "10844:114:6", "trueBody": { "expression": { "argumentTypes": null, @@ -10616,26 +11059,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1154, + "id": 1301, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10740:7:4", + "referencedDeclaration": 655, + "src": "10880:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1156, + "id": 1303, "indexExpression": { "argumentTypes": null, - "id": 1155, + "id": 1302, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10748:7:4", + "referencedDeclaration": 1287, + "src": "10888:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10646,36 +11089,36 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10740:16:4", + "src": "10880:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1157, + "id": 1304, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10740:25:4", + "referencedDeclaration": 635, + "src": "10880:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1144, - "id": 1158, + "functionReturnParameters": 1291, + "id": 1305, "nodeType": "Return", - "src": "10733:32:4" + "src": "10873:32:6" } } ] }, "documentation": "@dev Gets the total winning votes for reward distribution purposes\n@param _pollID Integer identifier associated with target poll\n@return Total number of votes committed to the winning option for specified poll", - "id": 1166, + "id": 1313, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -10683,16 +11126,16 @@ "name": "getTotalNumberOfTokensForWinningOption", "nodeType": "FunctionDefinition", "parameters": { - "id": 1141, + "id": 1288, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1140, + "id": 1287, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1166, - "src": "10613:12:4", + "scope": 1313, + "src": "10753:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10700,10 +11143,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1139, + "id": 1286, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10613:4:4", + "src": "10753:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10713,20 +11156,20 @@ "visibility": "internal" } ], - "src": "10612:14:4" + "src": "10752:14:6" }, "payable": false, "returnParameters": { - "id": 1144, + "id": 1291, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1143, + "id": 1290, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1166, - "src": "10648:14:4", + "scope": 1313, + "src": "10788:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10734,10 +11177,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1142, + "id": 1289, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10648:4:4", + "src": "10788:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10747,19 +11190,19 @@ "visibility": "internal" } ], - "src": "10647:16:4" + "src": "10787:16:6" }, - "scope": 1471, - "src": "10565:258:4", + "scope": 1618, + "src": "10705:258:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1186, + "id": 1333, "nodeType": "Block", - "src": "11063:94:4", + "src": "11203:94:6", "statements": [ { "expression": { @@ -10770,12 +11213,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1175, + "id": 1322, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1168, - "src": "11088:7:4", + "referencedDeclaration": 1315, + "src": "11228:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10789,18 +11232,18 @@ "typeString": "uint256" } ], - "id": 1174, + "id": 1321, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11077:10:4", + "referencedDeclaration": 1446, + "src": "11217:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1176, + "id": 1323, "isConstant": false, "isLValue": false, "isPure": false, @@ -10808,7 +11251,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11077:19:4", + "src": "11217:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10822,21 +11265,21 @@ "typeString": "bool" } ], - "id": 1173, + "id": 1320, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11069:7:4", + "referencedDeclaration": 4156, + "src": "11209:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1177, + "id": 1324, "isConstant": false, "isLValue": false, "isPure": false, @@ -10844,15 +11287,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11069:28:4", + "src": "11209:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1178, + "id": 1325, "nodeType": "ExpressionStatement", - "src": "11069:28:4" + "src": "11209:28:6" }, { "expression": { @@ -10864,26 +11307,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1180, + "id": 1327, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11121:7:4", + "referencedDeclaration": 655, + "src": "11261:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1182, + "id": 1329, "indexExpression": { "argumentTypes": null, - "id": 1181, + "id": 1328, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1168, - "src": "11129:7:4", + "referencedDeclaration": 1315, + "src": "11269:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10894,21 +11337,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11121:16:4", + "src": "11261:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1183, + "id": 1330, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "11121:30:4", + "referencedDeclaration": 631, + "src": "11261:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10922,18 +11365,18 @@ "typeString": "uint256" } ], - "id": 1179, + "id": 1326, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11111:9:4", + "referencedDeclaration": 1599, + "src": "11251:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1184, + "id": 1331, "isConstant": false, "isLValue": false, "isPure": false, @@ -10941,21 +11384,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11111:41:4", + "src": "11251:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1172, - "id": 1185, + "functionReturnParameters": 1319, + "id": 1332, "nodeType": "Return", - "src": "11104:48:4" + "src": "11244:48:6" } ] }, "documentation": "@notice Determines if poll is over\n@dev Checks isExpired for specified poll's revealEndDate\n@return Boolean indication of whether polling period is over", - "id": 1187, + "id": 1334, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -10963,16 +11406,16 @@ "name": "pollEnded", "nodeType": "FunctionDefinition", "parameters": { - "id": 1169, + "id": 1316, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1168, + "id": 1315, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1187, - "src": "11016:12:4", + "scope": 1334, + "src": "11156:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10980,10 +11423,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1167, + "id": 1314, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11016:4:4", + "src": "11156:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10993,20 +11436,20 @@ "visibility": "internal" } ], - "src": "11015:14:4" + "src": "11155:14:6" }, "payable": false, "returnParameters": { - "id": 1172, + "id": 1319, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1171, + "id": 1318, "name": "ended", "nodeType": "VariableDeclaration", - "scope": 1187, - "src": "11051:10:4", + "scope": 1334, + "src": "11191:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11014,10 +11457,10 @@ "typeString": "bool" }, "typeName": { - "id": 1170, + "id": 1317, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11051:4:4", + "src": "11191:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11027,19 +11470,19 @@ "visibility": "internal" } ], - "src": "11050:12:4" + "src": "11190:12:6" }, - "scope": 1471, - "src": "10997:160:4", + "scope": 1618, + "src": "11137:160:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1208, + "id": 1355, "nodeType": "Block", - "src": "11521:95:4", + "src": "11661:95:6", "statements": [ { "expression": { @@ -11050,12 +11493,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1196, + "id": 1343, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "11546:7:4", + "referencedDeclaration": 1336, + "src": "11686:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11069,18 +11512,18 @@ "typeString": "uint256" } ], - "id": 1195, + "id": 1342, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11535:10:4", + "referencedDeclaration": 1446, + "src": "11675:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1197, + "id": 1344, "isConstant": false, "isLValue": false, "isPure": false, @@ -11088,7 +11531,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11535:19:4", + "src": "11675:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11102,21 +11545,21 @@ "typeString": "bool" } ], - "id": 1194, + "id": 1341, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11527:7:4", + "referencedDeclaration": 4156, + "src": "11667:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1198, + "id": 1345, "isConstant": false, "isLValue": false, "isPure": false, @@ -11124,20 +11567,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11527:28:4", + "src": "11667:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1199, + "id": 1346, "nodeType": "ExpressionStatement", - "src": "11527:28:4" + "src": "11667:28:6" }, { "expression": { "argumentTypes": null, - "id": 1206, + "id": 1353, "isConstant": false, "isLValue": false, "isPure": false, @@ -11145,7 +11588,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11569:42:4", + "src": "11709:42:6", "subExpression": { "argumentTypes": null, "arguments": [ @@ -11155,26 +11598,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1201, + "id": 1348, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11580:7:4", + "referencedDeclaration": 655, + "src": "11720:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1203, + "id": 1350, "indexExpression": { "argumentTypes": null, - "id": 1202, + "id": 1349, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "11588:7:4", + "referencedDeclaration": 1336, + "src": "11728:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11185,21 +11628,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11580:16:4", + "src": "11720:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1204, + "id": 1351, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "commitEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 509, - "src": "11580:30:4", + "referencedDeclaration": 629, + "src": "11720:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11213,18 +11656,18 @@ "typeString": "uint256" } ], - "id": 1200, + "id": 1347, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11570:9:4", + "referencedDeclaration": 1599, + "src": "11710:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1205, + "id": 1352, "isConstant": false, "isLValue": false, "isPure": false, @@ -11232,7 +11675,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11570:41:4", + "src": "11710:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11243,15 +11686,15 @@ "typeString": "bool" } }, - "functionReturnParameters": 1193, - "id": 1207, + "functionReturnParameters": 1340, + "id": 1354, "nodeType": "Return", - "src": "11562:49:4" + "src": "11702:49:6" } ] }, "documentation": "@notice Checks if the commit period is still active for the specified poll\n@dev Checks isExpired for the specified poll's commitEndDate\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of isCommitPeriodActive for target poll", - "id": 1209, + "id": 1356, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11259,16 +11702,16 @@ "name": "commitPeriodActive", "nodeType": "FunctionDefinition", "parameters": { - "id": 1190, + "id": 1337, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1189, + "id": 1336, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1209, - "src": "11473:12:4", + "scope": 1356, + "src": "11613:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11276,10 +11719,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1188, + "id": 1335, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11473:4:4", + "src": "11613:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11289,20 +11732,20 @@ "visibility": "internal" } ], - "src": "11472:14:4" + "src": "11612:14:6" }, "payable": false, "returnParameters": { - "id": 1193, + "id": 1340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1192, + "id": 1339, "name": "active", "nodeType": "VariableDeclaration", - "scope": 1209, - "src": "11508:11:4", + "scope": 1356, + "src": "11648:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11310,10 +11753,10 @@ "typeString": "bool" }, "typeName": { - "id": 1191, + "id": 1338, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11508:4:4", + "src": "11648:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11323,19 +11766,19 @@ "visibility": "internal" } ], - "src": "11507:13:4" + "src": "11647:13:6" }, - "scope": 1471, - "src": "11445:171:4", + "scope": 1618, + "src": "11585:171:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1235, + "id": 1382, "nodeType": "Block", - "src": "11911:127:4", + "src": "12051:127:6", "statements": [ { "expression": { @@ -11346,12 +11789,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1218, + "id": 1365, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "11936:7:4", + "referencedDeclaration": 1358, + "src": "12076:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11365,18 +11808,18 @@ "typeString": "uint256" } ], - "id": 1217, + "id": 1364, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11925:10:4", + "referencedDeclaration": 1446, + "src": "12065:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1219, + "id": 1366, "isConstant": false, "isLValue": false, "isPure": false, @@ -11384,7 +11827,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11925:19:4", + "src": "12065:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11398,21 +11841,21 @@ "typeString": "bool" } ], - "id": 1216, + "id": 1363, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11917:7:4", + "referencedDeclaration": 4156, + "src": "12057:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1220, + "id": 1367, "isConstant": false, "isLValue": false, "isPure": false, @@ -11420,15 +11863,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11917:28:4", + "src": "12057:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1221, + "id": 1368, "nodeType": "ExpressionStatement", - "src": "11917:28:4" + "src": "12057:28:6" }, { "expression": { @@ -11437,14 +11880,14 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1233, + "id": 1380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1228, + "id": 1375, "isConstant": false, "isLValue": false, "isPure": false, @@ -11452,7 +11895,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11959:42:4", + "src": "12099:42:6", "subExpression": { "argumentTypes": null, "arguments": [ @@ -11462,26 +11905,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1223, + "id": 1370, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11970:7:4", + "referencedDeclaration": 655, + "src": "12110:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1225, + "id": 1372, "indexExpression": { "argumentTypes": null, - "id": 1224, + "id": 1371, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "11978:7:4", + "referencedDeclaration": 1358, + "src": "12118:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11492,21 +11935,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11970:16:4", + "src": "12110:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1226, + "id": 1373, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "11970:30:4", + "referencedDeclaration": 631, + "src": "12110:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11520,18 +11963,18 @@ "typeString": "uint256" } ], - "id": 1222, + "id": 1369, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11960:9:4", + "referencedDeclaration": 1599, + "src": "12100:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1227, + "id": 1374, "isConstant": false, "isLValue": false, "isPure": false, @@ -11539,7 +11982,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11960:41:4", + "src": "12100:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11554,7 +11997,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 1232, + "id": 1379, "isConstant": false, "isLValue": false, "isPure": false, @@ -11562,18 +12005,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "12005:28:4", + "src": "12145:28:6", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1230, + "id": 1377, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "12025:7:4", + "referencedDeclaration": 1358, + "src": "12165:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11587,18 +12030,18 @@ "typeString": "uint256" } ], - "id": 1229, + "id": 1376, "name": "commitPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1209, - "src": "12006:18:4", + "referencedDeclaration": 1356, + "src": "12146:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1231, + "id": 1378, "isConstant": false, "isLValue": false, "isPure": false, @@ -11606,7 +12049,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12006:27:4", + "src": "12146:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11617,21 +12060,21 @@ "typeString": "bool" } }, - "src": "11959:74:4", + "src": "12099:74:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1215, - "id": 1234, + "functionReturnParameters": 1362, + "id": 1381, "nodeType": "Return", - "src": "11952:81:4" + "src": "12092:81:6" } ] }, "documentation": "@notice Checks if the reveal period is still active for the specified poll\n@dev Checks isExpired for the specified poll's revealEndDate\n@param _pollID Integer identifier associated with target poll", - "id": 1236, + "id": 1383, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11639,16 +12082,16 @@ "name": "revealPeriodActive", "nodeType": "FunctionDefinition", "parameters": { - "id": 1212, + "id": 1359, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1211, + "id": 1358, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1236, - "src": "11863:12:4", + "scope": 1383, + "src": "12003:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11656,10 +12099,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1210, + "id": 1357, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11863:4:4", + "src": "12003:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11669,20 +12112,20 @@ "visibility": "internal" } ], - "src": "11862:14:4" + "src": "12002:14:6" }, "payable": false, "returnParameters": { - "id": 1215, + "id": 1362, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1214, + "id": 1361, "name": "active", "nodeType": "VariableDeclaration", - "scope": 1236, - "src": "11898:11:4", + "scope": 1383, + "src": "12038:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11690,10 +12133,10 @@ "typeString": "bool" }, "typeName": { - "id": 1213, + "id": 1360, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11898:4:4", + "src": "12038:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11703,19 +12146,19 @@ "visibility": "internal" } ], - "src": "11897:13:4" + "src": "12037:13:6" }, - "scope": 1471, - "src": "11835:203:4", + "scope": 1618, + "src": "11975:203:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1258, + "id": 1405, "nodeType": "Block", - "src": "12366:87:4", + "src": "12506:87:6", "statements": [ { "expression": { @@ -11726,12 +12169,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1247, + "id": 1394, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1240, - "src": "12391:7:4", + "referencedDeclaration": 1387, + "src": "12531:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11745,18 +12188,18 @@ "typeString": "uint256" } ], - "id": 1246, + "id": 1393, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "12380:10:4", + "referencedDeclaration": 1446, + "src": "12520:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1248, + "id": 1395, "isConstant": false, "isLValue": false, "isPure": false, @@ -11764,7 +12207,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12380:19:4", + "src": "12520:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11778,21 +12221,21 @@ "typeString": "bool" } ], - "id": 1245, + "id": 1392, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "12372:7:4", + "referencedDeclaration": 4156, + "src": "12512:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1249, + "id": 1396, "isConstant": false, "isLValue": false, "isPure": false, @@ -11800,15 +12243,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12372:28:4", + "src": "12512:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1250, + "id": 1397, "nodeType": "ExpressionStatement", - "src": "12372:28:4" + "src": "12512:28:6" }, { "expression": { @@ -11819,26 +12262,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1251, + "id": 1398, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "12414:7:4", + "referencedDeclaration": 655, + "src": "12554:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1253, + "id": 1400, "indexExpression": { "argumentTypes": null, - "id": 1252, + "id": 1399, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1240, - "src": "12422:7:4", + "referencedDeclaration": 1387, + "src": "12562:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11849,35 +12292,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12414:16:4", + "src": "12554:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1254, + "id": 1401, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "12414:26:4", + "referencedDeclaration": 641, + "src": "12554:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1256, + "id": 1403, "indexExpression": { "argumentTypes": null, - "id": 1255, + "id": 1402, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1238, - "src": "12441:6:4", + "referencedDeclaration": 1385, + "src": "12581:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11888,21 +12331,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12414:34:4", + "src": "12554:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1244, - "id": 1257, + "functionReturnParameters": 1391, + "id": 1404, "nodeType": "Return", - "src": "12407:41:4" + "src": "12547:41:6" } ] }, "documentation": "@dev Checks if user has committed for specified poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of whether user has committed", - "id": 1259, + "id": 1406, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11910,16 +12353,16 @@ "name": "didCommit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1241, + "id": 1388, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1238, + "id": 1385, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12299:14:4", + "scope": 1406, + "src": "12439:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11927,10 +12370,10 @@ "typeString": "address" }, "typeName": { - "id": 1237, + "id": 1384, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12299:7:4", + "src": "12439:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11941,11 +12384,11 @@ }, { "constant": false, - "id": 1240, + "id": 1387, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12315:12:4", + "scope": 1406, + "src": "12455:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11953,10 +12396,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1239, + "id": 1386, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12315:4:4", + "src": "12455:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11966,20 +12409,20 @@ "visibility": "internal" } ], - "src": "12298:30:4" + "src": "12438:30:6" }, "payable": false, "returnParameters": { - "id": 1244, + "id": 1391, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1243, + "id": 1390, "name": "committed", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12350:14:4", + "scope": 1406, + "src": "12490:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11987,10 +12430,10 @@ "typeString": "bool" }, "typeName": { - "id": 1242, + "id": 1389, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12350:4:4", + "src": "12490:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12000,19 +12443,19 @@ "visibility": "internal" } ], - "src": "12349:16:4" + "src": "12489:16:6" }, - "scope": 1471, - "src": "12280:173:4", + "scope": 1618, + "src": "12420:173:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1281, + "id": 1428, "nodeType": "Block", - "src": "12778:87:4", + "src": "12918:87:6", "statements": [ { "expression": { @@ -12023,12 +12466,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1270, + "id": 1417, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1263, - "src": "12803:7:4", + "referencedDeclaration": 1410, + "src": "12943:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12042,18 +12485,18 @@ "typeString": "uint256" } ], - "id": 1269, + "id": 1416, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "12792:10:4", + "referencedDeclaration": 1446, + "src": "12932:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1271, + "id": 1418, "isConstant": false, "isLValue": false, "isPure": false, @@ -12061,7 +12504,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12792:19:4", + "src": "12932:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12075,21 +12518,21 @@ "typeString": "bool" } ], - "id": 1268, + "id": 1415, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "12784:7:4", + "referencedDeclaration": 4156, + "src": "12924:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1272, + "id": 1419, "isConstant": false, "isLValue": false, "isPure": false, @@ -12097,15 +12540,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12784:28:4", + "src": "12924:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1273, + "id": 1420, "nodeType": "ExpressionStatement", - "src": "12784:28:4" + "src": "12924:28:6" }, { "expression": { @@ -12116,26 +12559,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1274, + "id": 1421, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "12826:7:4", + "referencedDeclaration": 655, + "src": "12966:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1276, + "id": 1423, "indexExpression": { "argumentTypes": null, - "id": 1275, + "id": 1422, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1263, - "src": "12834:7:4", + "referencedDeclaration": 1410, + "src": "12974:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12146,35 +12589,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12826:16:4", + "src": "12966:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1277, + "id": 1424, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "12826:26:4", + "referencedDeclaration": 645, + "src": "12966:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1279, + "id": 1426, "indexExpression": { "argumentTypes": null, - "id": 1278, + "id": 1425, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1261, - "src": "12853:6:4", + "referencedDeclaration": 1408, + "src": "12993:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12185,21 +12628,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12826:34:4", + "src": "12966:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1267, - "id": 1280, + "functionReturnParameters": 1414, + "id": 1427, "nodeType": "Return", - "src": "12819:41:4" + "src": "12959:41:6" } ] }, "documentation": "@dev Checks if user has revealed for specified poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of whether user has revealed", - "id": 1282, + "id": 1429, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12207,16 +12650,16 @@ "name": "didReveal", "nodeType": "FunctionDefinition", "parameters": { - "id": 1264, + "id": 1411, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1261, + "id": 1408, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12712:14:4", + "scope": 1429, + "src": "12852:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12224,10 +12667,10 @@ "typeString": "address" }, "typeName": { - "id": 1260, + "id": 1407, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12712:7:4", + "src": "12852:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12238,11 +12681,11 @@ }, { "constant": false, - "id": 1263, + "id": 1410, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12728:12:4", + "scope": 1429, + "src": "12868:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12250,10 +12693,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1262, + "id": 1409, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12728:4:4", + "src": "12868:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12263,20 +12706,20 @@ "visibility": "internal" } ], - "src": "12711:30:4" + "src": "12851:30:6" }, "payable": false, "returnParameters": { - "id": 1267, + "id": 1414, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1266, + "id": 1413, "name": "revealed", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12763:13:4", + "scope": 1429, + "src": "12903:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12284,10 +12727,10 @@ "typeString": "bool" }, "typeName": { - "id": 1265, + "id": 1412, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12763:4:4", + "src": "12903:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12297,19 +12740,19 @@ "visibility": "internal" } ], - "src": "12762:15:4" + "src": "12902:15:6" }, - "scope": 1471, - "src": "12693:172:4", + "scope": 1618, + "src": "12833:172:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1298, + "id": 1445, "nodeType": "Block", - "src": "13117:56:4", + "src": "13257:56:6", "statements": [ { "expression": { @@ -12321,7 +12764,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1295, + "id": 1442, "isConstant": false, "isLValue": false, "isPure": false, @@ -12332,19 +12775,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1291, + "id": 1438, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1289, + "id": 1436, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1284, - "src": "13131:7:4", + "referencedDeclaration": 1431, + "src": "13271:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12355,14 +12798,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1290, + "id": 1437, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "13142:1:4", + "src": "13282:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12370,7 +12813,7 @@ }, "value": "0" }, - "src": "13131:12:4", + "src": "13271:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12384,19 +12827,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1294, + "id": 1441, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1292, + "id": 1439, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1284, - "src": "13147:7:4", + "referencedDeclaration": 1431, + "src": "13287:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12406,52 +12849,52 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1293, + "id": 1440, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "13158:9:4", + "referencedDeclaration": 651, + "src": "13298:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13147:20:4", + "src": "13287:20:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "13131:36:4", + "src": "13271:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1296, + "id": 1443, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "13130:38:4", + "src": "13270:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1288, - "id": 1297, + "functionReturnParameters": 1435, + "id": 1444, "nodeType": "Return", - "src": "13123:45:4" + "src": "13263:45:6" } ] }, "documentation": "@dev Checks if a poll exists\n@param _pollID The pollID whose existance is to be evaluated.\n@return Boolean Indicates whether a poll exists for the provided pollID", - "id": 1299, + "id": 1446, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12459,16 +12902,16 @@ "name": "pollExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 1285, + "id": 1432, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1284, + "id": 1431, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1299, - "src": "13069:12:4", + "scope": 1446, + "src": "13209:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12476,10 +12919,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1283, + "id": 1430, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13069:4:4", + "src": "13209:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12489,20 +12932,20 @@ "visibility": "internal" } ], - "src": "13068:14:4" + "src": "13208:14:6" }, "payable": false, "returnParameters": { - "id": 1288, + "id": 1435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1287, + "id": 1434, "name": "exists", "nodeType": "VariableDeclaration", - "scope": 1299, - "src": "13104:11:4", + "scope": 1446, + "src": "13244:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12510,10 +12953,10 @@ "typeString": "bool" }, "typeName": { - "id": 1286, + "id": 1433, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13104:4:4", + "src": "13244:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12523,19 +12966,19 @@ "visibility": "internal" } ], - "src": "13103:13:4" + "src": "13243:13:6" }, - "scope": 1471, - "src": "13049:124:4", + "scope": 1618, + "src": "13189:124:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1319, + "id": 1466, "nodeType": "Block", - "src": "13610:86:4", + "src": "13750:86:6", "statements": [ { "expression": { @@ -12549,12 +12992,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1312, + "id": 1459, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1301, - "src": "13659:6:4", + "referencedDeclaration": 1448, + "src": "13799:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12562,12 +13005,12 @@ }, { "argumentTypes": null, - "id": 1313, + "id": 1460, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1303, - "src": "13667:7:4", + "referencedDeclaration": 1450, + "src": "13807:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12585,18 +13028,18 @@ "typeString": "uint256" } ], - "id": 1311, + "id": 1458, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "13650:8:4", + "referencedDeclaration": 1617, + "src": "13790:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 1314, + "id": 1461, "isConstant": false, "isLValue": false, "isPure": false, @@ -12604,7 +13047,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13650:25:4", + "src": "13790:25:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12613,14 +13056,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697448617368", - "id": 1315, + "id": 1462, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "13677:12:4", + "src": "13817:12:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_207714604a0440a484c6569f8718c59de7b49b2f64c69153d0c80360597b39a3", @@ -12642,18 +13085,18 @@ ], "expression": { "argumentTypes": null, - "id": 1309, + "id": 1456, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "13631:5:4", + "referencedDeclaration": 665, + "src": "13771:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 1310, + "id": 1457, "isConstant": false, "isLValue": true, "isPure": false, @@ -12661,13 +13104,13 @@ "memberName": "getAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 33, - "src": "13631:18:4", + "src": "13771:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory) view returns (uint256)" } }, - "id": 1316, + "id": 1463, "isConstant": false, "isLValue": false, "isPure": false, @@ -12675,7 +13118,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13631:59:4", + "src": "13771:59:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12689,20 +13132,20 @@ "typeString": "uint256" } ], - "id": 1308, + "id": 1455, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "13623:7:4", + "src": "13763:7:6", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes32_$", "typeString": "type(bytes32)" }, "typeName": "bytes32" }, - "id": 1317, + "id": 1464, "isConstant": false, "isLValue": false, "isPure": false, @@ -12710,21 +13153,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13623:68:4", + "src": "13763:68:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1307, - "id": 1318, + "functionReturnParameters": 1454, + "id": 1465, "nodeType": "Return", - "src": "13616:75:4" + "src": "13756:75:6" } ] }, "documentation": "@dev Gets the bytes32 commitHash property of target poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Bytes32 hash property attached to target poll", - "id": 1320, + "id": 1467, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12732,16 +13175,16 @@ "name": "getCommitHash", "nodeType": "FunctionDefinition", "parameters": { - "id": 1304, + "id": 1451, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1301, + "id": 1448, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13539:14:4", + "scope": 1467, + "src": "13679:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12749,10 +13192,10 @@ "typeString": "address" }, "typeName": { - "id": 1300, + "id": 1447, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13539:7:4", + "src": "13679:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12763,11 +13206,11 @@ }, { "constant": false, - "id": 1303, + "id": 1450, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13555:12:4", + "scope": 1467, + "src": "13695:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12775,10 +13218,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1302, + "id": 1449, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13555:4:4", + "src": "13695:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12788,20 +13231,20 @@ "visibility": "internal" } ], - "src": "13538:30:4" + "src": "13678:30:6" }, "payable": false, "returnParameters": { - "id": 1307, + "id": 1454, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1306, + "id": 1453, "name": "commitHash", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13590:18:4", + "scope": 1467, + "src": "13730:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12809,10 +13252,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1305, + "id": 1452, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13590:7:4", + "src": "13730:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12822,19 +13265,19 @@ "visibility": "internal" } ], - "src": "13589:20:4" + "src": "13729:20:6" }, - "scope": 1471, - "src": "13516:180:4", + "scope": 1618, + "src": "13656:180:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1338, + "id": 1485, "nodeType": "Block", - "src": "14043:76:4", + "src": "14183:76:6", "statements": [ { "expression": { @@ -12845,12 +13288,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1332, + "id": 1479, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1322, - "src": "14084:6:4", + "referencedDeclaration": 1469, + "src": "14224:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12858,12 +13301,12 @@ }, { "argumentTypes": null, - "id": 1333, + "id": 1480, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1324, - "src": "14092:7:4", + "referencedDeclaration": 1471, + "src": "14232:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12881,18 +13324,18 @@ "typeString": "uint256" } ], - "id": 1331, + "id": 1478, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "14075:8:4", + "referencedDeclaration": 1617, + "src": "14215:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 1334, + "id": 1481, "isConstant": false, "isLValue": false, "isPure": false, @@ -12900,7 +13343,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14075:25:4", + "src": "14215:25:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12909,14 +13352,14 @@ { "argumentTypes": null, "hexValue": "6e756d546f6b656e73", - "id": 1335, + "id": 1482, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14102:11:4", + "src": "14242:11:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_aaabf4403cd242796b0e69a57762477ad48e1fa250247ff93eeada3e5b75581a", @@ -12938,18 +13381,18 @@ ], "expression": { "argumentTypes": null, - "id": 1329, + "id": 1476, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "14056:5:4", + "referencedDeclaration": 665, + "src": "14196:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 1330, + "id": 1477, "isConstant": false, "isLValue": true, "isPure": false, @@ -12957,13 +13400,13 @@ "memberName": "getAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 33, - "src": "14056:18:4", + "src": "14196:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory) view returns (uint256)" } }, - "id": 1336, + "id": 1483, "isConstant": false, "isLValue": false, "isPure": false, @@ -12971,21 +13414,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14056:58:4", + "src": "14196:58:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1328, - "id": 1337, + "functionReturnParameters": 1475, + "id": 1484, "nodeType": "Return", - "src": "14049:65:4" + "src": "14189:65:6" } ] }, "documentation": "@dev Wrapper for getAttribute with attrName=\"numTokens\"\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Number of tokens committed to poll in sorted poll-linked-list", - "id": 1339, + "id": 1486, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12993,16 +13436,16 @@ "name": "getNumTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1325, + "id": 1472, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1322, + "id": 1469, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "13976:14:4", + "scope": 1486, + "src": "14116:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13010,10 +13453,10 @@ "typeString": "address" }, "typeName": { - "id": 1321, + "id": 1468, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13976:7:4", + "src": "14116:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13024,11 +13467,11 @@ }, { "constant": false, - "id": 1324, + "id": 1471, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "13992:12:4", + "scope": 1486, + "src": "14132:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13036,10 +13479,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1323, + "id": 1470, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13992:4:4", + "src": "14132:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13049,20 +13492,20 @@ "visibility": "internal" } ], - "src": "13975:30:4" + "src": "14115:30:6" }, "payable": false, "returnParameters": { - "id": 1328, + "id": 1475, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1327, + "id": 1474, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "14027:14:4", + "scope": 1486, + "src": "14167:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13070,10 +13513,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1326, + "id": 1473, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14027:4:4", + "src": "14167:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13083,19 +13526,19 @@ "visibility": "internal" } ], - "src": "14026:16:4" + "src": "14166:16:6" }, - "scope": 1471, - "src": "13954:165:4", + "scope": 1618, + "src": "14094:165:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1353, + "id": 1500, "nodeType": "Block", - "src": "14388:43:4", + "src": "14528:43:6", "statements": [ { "expression": { @@ -13104,14 +13547,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1350, + "id": 1497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14424:1:4", + "src": "14564:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -13131,26 +13574,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1346, + "id": 1493, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "14401:6:4", + "referencedDeclaration": 663, + "src": "14541:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1348, + "id": 1495, "indexExpression": { "argumentTypes": null, - "id": 1347, + "id": 1494, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "14408:6:4", + "referencedDeclaration": 1488, + "src": "14548:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13161,27 +13604,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14401:14:4", + "src": "14541:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1349, + "id": 1496, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "14401:22:4", + "referencedDeclaration": 305, + "src": "14541:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1351, + "id": 1498, "isConstant": false, "isLValue": false, "isPure": false, @@ -13189,21 +13632,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14401:25:4", + "src": "14541:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1345, - "id": 1352, + "functionReturnParameters": 1492, + "id": 1499, "nodeType": "Return", - "src": "14394:32:4" + "src": "14534:32:6" } ] }, "documentation": "@dev Gets top element of sorted poll-linked-list\n@param _voter Address of user to check against\n@return Integer identifier to poll with maximum number of tokens committed to it", - "id": 1354, + "id": 1501, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -13211,16 +13654,16 @@ "name": "getLastNode", "nodeType": "FunctionDefinition", "parameters": { - "id": 1342, + "id": 1489, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1341, + "id": 1488, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1354, - "src": "14338:14:4", + "scope": 1501, + "src": "14478:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13228,10 +13671,10 @@ "typeString": "address" }, "typeName": { - "id": 1340, + "id": 1487, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14338:7:4", + "src": "14478:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13241,20 +13684,20 @@ "visibility": "internal" } ], - "src": "14337:16:4" + "src": "14477:16:6" }, "payable": false, "returnParameters": { - "id": 1345, + "id": 1492, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1344, + "id": 1491, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1354, - "src": "14375:11:4", + "scope": 1501, + "src": "14515:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13262,10 +13705,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1343, + "id": 1490, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14375:4:4", + "src": "14515:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13275,19 +13718,19 @@ "visibility": "internal" } ], - "src": "14374:13:4" + "src": "14514:13:6" }, - "scope": 1471, - "src": "14317:114:4", + "scope": 1618, + "src": "14457:114:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1368, + "id": 1515, "nodeType": "Block", - "src": "14686:59:4", + "src": "14826:59:6", "statements": [ { "expression": { @@ -13295,12 +13738,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1362, + "id": 1509, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "14712:6:4", + "referencedDeclaration": 1503, + "src": "14852:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13311,12 +13754,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1364, + "id": 1511, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "14732:6:4", + "referencedDeclaration": 1503, + "src": "14872:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13330,18 +13773,18 @@ "typeString": "address" } ], - "id": 1363, + "id": 1510, "name": "getLastNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1354, - "src": "14720:11:4", + "referencedDeclaration": 1501, + "src": "14860:11:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 1365, + "id": 1512, "isConstant": false, "isLValue": false, "isPure": false, @@ -13349,7 +13792,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14720:19:4", + "src": "14860:19:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13367,18 +13810,18 @@ "typeString": "uint256" } ], - "id": 1361, + "id": 1508, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "14699:12:4", + "referencedDeclaration": 1486, + "src": "14839:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1366, + "id": 1513, "isConstant": false, "isLValue": false, "isPure": false, @@ -13386,21 +13829,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14699:41:4", + "src": "14839:41:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1360, - "id": 1367, + "functionReturnParameters": 1507, + "id": 1514, "nodeType": "Return", - "src": "14692:48:4" + "src": "14832:48:6" } ] }, "documentation": "@dev Gets the numTokens property of getLastNode\n@param _voter Address of user to check against\n@return Maximum number of tokens committed in poll specified", - "id": 1369, + "id": 1516, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -13408,16 +13851,16 @@ "name": "getLockedTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1357, + "id": 1504, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1356, + "id": 1503, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1369, - "src": "14633:14:4", + "scope": 1516, + "src": "14773:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13425,10 +13868,10 @@ "typeString": "address" }, "typeName": { - "id": 1355, + "id": 1502, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14633:7:4", + "src": "14773:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13438,20 +13881,20 @@ "visibility": "internal" } ], - "src": "14632:16:4" + "src": "14772:16:6" }, "payable": false, "returnParameters": { - "id": 1360, + "id": 1507, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1359, + "id": 1506, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1369, - "src": "14670:14:4", + "scope": 1516, + "src": "14810:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13459,10 +13902,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1358, + "id": 1505, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14670:4:4", + "src": "14810:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13472,32 +13915,32 @@ "visibility": "internal" } ], - "src": "14669:16:4" + "src": "14809:16:6" }, - "scope": 1471, - "src": "14608:137:4", + "scope": 1618, + "src": "14748:137:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1437, + "id": 1584, "nodeType": "Block", - "src": "15556:951:4", + "src": "15696:951:6", "statements": [ { "assignments": [ - 1381 + 1528 ], "declarations": [ { "constant": false, - "id": 1381, + "id": 1528, "name": "nodeID", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15637:11:4", + "scope": 1585, + "src": "15777:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13505,10 +13948,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1380, + "id": 1527, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15637:4:4", + "src": "15777:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13518,18 +13961,18 @@ "visibility": "internal" } ], - "id": 1385, + "id": 1532, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1383, + "id": 1530, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15663:6:4", + "referencedDeclaration": 1518, + "src": "15803:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13543,18 +13986,18 @@ "typeString": "address" } ], - "id": 1382, + "id": 1529, "name": "getLastNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1354, - "src": "15651:11:4", + "referencedDeclaration": 1501, + "src": "15791:11:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 1384, + "id": 1531, "isConstant": false, "isLValue": false, "isPure": false, @@ -13562,27 +14005,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15651:19:4", + "src": "15791:19:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15637:33:4" + "src": "15777:33:6" }, { "assignments": [ - 1387 + 1534 ], "declarations": [ { "constant": false, - "id": 1387, + "id": 1534, "name": "tokensInNode", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15676:17:4", + "scope": 1585, + "src": "15816:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13590,10 +14033,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1386, + "id": 1533, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15676:4:4", + "src": "15816:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13603,18 +14046,18 @@ "visibility": "internal" } ], - "id": 1392, + "id": 1539, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1389, + "id": 1536, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15709:6:4", + "referencedDeclaration": 1518, + "src": "15849:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13622,12 +14065,12 @@ }, { "argumentTypes": null, - "id": 1390, + "id": 1537, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15717:6:4", + "referencedDeclaration": 1528, + "src": "15857:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13645,18 +14088,18 @@ "typeString": "uint256" } ], - "id": 1388, + "id": 1535, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "15696:12:4", + "referencedDeclaration": 1486, + "src": "15836:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1391, + "id": 1538, "isConstant": false, "isLValue": false, "isPure": false, @@ -13664,37 +14107,37 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15696:28:4", + "src": "15836:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15676:48:4" + "src": "15816:48:6" }, { "body": { - "id": 1433, + "id": 1580, "nodeType": "Block", - "src": "15822:567:4", + "src": "15962:567:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1401, + "id": 1548, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1396, + "id": 1543, "name": "tokensInNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1387, - "src": "15884:12:4", + "referencedDeclaration": 1534, + "src": "16024:12:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13707,12 +14150,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1398, + "id": 1545, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15912:6:4", + "referencedDeclaration": 1518, + "src": "16052:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13720,12 +14163,12 @@ }, { "argumentTypes": null, - "id": 1399, + "id": 1546, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15920:6:4", + "referencedDeclaration": 1528, + "src": "16060:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13743,18 +14186,18 @@ "typeString": "uint256" } ], - "id": 1397, + "id": 1544, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "15899:12:4", + "referencedDeclaration": 1486, + "src": "16039:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1400, + "id": 1547, "isConstant": false, "isLValue": false, "isPure": false, @@ -13762,21 +14205,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15899:28:4", + "src": "16039:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15884:43:4", + "src": "16024:43:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1402, + "id": 1549, "nodeType": "ExpressionStatement", - "src": "15884:43:4" + "src": "16024:43:6" }, { "condition": { @@ -13785,19 +14228,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1405, + "id": 1552, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1403, + "id": 1550, "name": "tokensInNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1387, - "src": "15939:12:4", + "referencedDeclaration": 1534, + "src": "16079:12:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13807,31 +14250,31 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1404, + "id": 1551, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1373, - "src": "15955:10:4", + "referencedDeclaration": 1520, + "src": "16095:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15939:26:4", + "src": "16079:26:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1423, + "id": 1570, "nodeType": "IfStatement", - "src": "15935:312:4", + "src": "16075:312:6", "trueBody": { - "id": 1422, + "id": 1569, "nodeType": "Block", - "src": "15967:280:4", + "src": "16107:280:6", "statements": [ { "condition": { @@ -13840,19 +14283,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1408, + "id": 1555, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1406, + "id": 1553, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16011:6:4", + "referencedDeclaration": 1528, + "src": "16151:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13862,48 +14305,48 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1407, + "id": 1554, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1375, - "src": "16021:7:4", + "referencedDeclaration": 1522, + "src": "16161:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16011:17:4", + "src": "16151:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1419, + "id": 1566, "nodeType": "IfStatement", - "src": "16007:173:4", + "src": "16147:173:6", "trueBody": { - "id": 1418, + "id": 1565, "nodeType": "Block", - "src": "16030:150:4", + "src": "16170:150:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1416, + "id": 1563, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1409, + "id": 1556, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16130:6:4", + "referencedDeclaration": 1528, + "src": "16270:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13916,12 +14359,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1414, + "id": 1561, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16162:6:4", + "referencedDeclaration": 1528, + "src": "16302:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13939,26 +14382,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1410, + "id": 1557, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "16139:6:4", + "referencedDeclaration": 663, + "src": "16279:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1412, + "id": 1559, "indexExpression": { "argumentTypes": null, - "id": 1411, + "id": 1558, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "16146:6:4", + "referencedDeclaration": 1518, + "src": "16286:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13969,27 +14412,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16139:14:4", + "src": "16279:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1413, + "id": 1560, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "16139:22:4", + "referencedDeclaration": 305, + "src": "16279:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1415, + "id": 1562, "isConstant": false, "isLValue": false, "isPure": false, @@ -13997,21 +14440,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16139:30:4", + "src": "16279:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16130:39:4", + "src": "16270:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1417, + "id": 1564, "nodeType": "ExpressionStatement", - "src": "16130:39:4" + "src": "16270:39:6" } ] } @@ -14019,21 +14462,21 @@ { "expression": { "argumentTypes": null, - "id": 1420, + "id": 1567, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16231:6:4", + "referencedDeclaration": 1528, + "src": "16371:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1379, - "id": 1421, + "functionReturnParameters": 1526, + "id": 1568, "nodeType": "Return", - "src": "16224:13:4" + "src": "16364:13:6" } ] } @@ -14041,19 +14484,19 @@ { "expression": { "argumentTypes": null, - "id": 1431, + "id": 1578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1424, + "id": 1571, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16343:6:4", + "referencedDeclaration": 1528, + "src": "16483:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14066,12 +14509,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1429, + "id": 1576, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16375:6:4", + "referencedDeclaration": 1528, + "src": "16515:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14089,26 +14532,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1425, + "id": 1572, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "16352:6:4", + "referencedDeclaration": 663, + "src": "16492:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1427, + "id": 1574, "indexExpression": { "argumentTypes": null, - "id": 1426, + "id": 1573, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "16359:6:4", + "referencedDeclaration": 1518, + "src": "16499:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14119,27 +14562,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16352:14:4", + "src": "16492:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1428, + "id": 1575, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "16352:22:4", + "referencedDeclaration": 305, + "src": "16492:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1430, + "id": 1577, "isConstant": false, "isLValue": false, "isPure": false, @@ -14147,21 +14590,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16352:30:4", + "src": "16492:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16343:39:4", + "src": "16483:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1432, + "id": 1579, "nodeType": "ExpressionStatement", - "src": "16343:39:4" + "src": "16483:39:6" } ] }, @@ -14171,19 +14614,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1395, + "id": 1542, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1393, + "id": 1540, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15809:6:4", + "referencedDeclaration": 1528, + "src": "15949:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14194,14 +14637,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1394, + "id": 1541, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15819:1:4", + "src": "15959:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14209,39 +14652,39 @@ }, "value": "0" }, - "src": "15809:11:4", + "src": "15949:11:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1434, + "id": 1581, "nodeType": "WhileStatement", - "src": "15802:587:4" + "src": "15942:587:6" }, { "expression": { "argumentTypes": null, - "id": 1435, + "id": 1582, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16496:6:4", + "referencedDeclaration": 1528, + "src": "16636:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1379, - "id": 1436, + "functionReturnParameters": 1526, + "id": 1583, "nodeType": "Return", - "src": "16489:13:4" + "src": "16629:13:6" } ] }, "documentation": null, - "id": 1438, + "id": 1585, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -14249,16 +14692,16 @@ "name": "getInsertPointForNumTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1376, + "id": 1523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1371, + "id": 1518, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15469:14:4", + "scope": 1585, + "src": "15609:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14266,10 +14709,10 @@ "typeString": "address" }, "typeName": { - "id": 1370, + "id": 1517, "name": "address", "nodeType": "ElementaryTypeName", - "src": "15469:7:4", + "src": "15609:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14280,11 +14723,11 @@ }, { "constant": false, - "id": 1373, + "id": 1520, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15485:15:4", + "scope": 1585, + "src": "15625:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14292,10 +14735,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1372, + "id": 1519, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15485:4:4", + "src": "15625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14306,11 +14749,11 @@ }, { "constant": false, - "id": 1375, + "id": 1522, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15502:12:4", + "scope": 1585, + "src": "15642:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14318,10 +14761,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1374, + "id": 1521, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15502:4:4", + "src": "15642:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14331,20 +14774,20 @@ "visibility": "internal" } ], - "src": "15468:47:4" + "src": "15608:47:6" }, "payable": false, "returnParameters": { - "id": 1379, + "id": 1526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1378, + "id": 1525, "name": "prevNode", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15539:13:4", + "scope": 1585, + "src": "15679:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14352,10 +14795,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1377, + "id": 1524, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15539:4:4", + "src": "15679:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14365,19 +14808,19 @@ "visibility": "internal" } ], - "src": "15538:15:4" + "src": "15678:15:6" }, - "scope": 1471, - "src": "15433:1074:4", + "scope": 1618, + "src": "15573:1074:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1451, + "id": 1598, "nodeType": "Block", - "src": "16884:54:4", + "src": "17024:54:6", "statements": [ { "expression": { @@ -14389,7 +14832,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1448, + "id": 1595, "isConstant": false, "isLValue": false, "isPure": false, @@ -14398,18 +14841,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1445, + "id": 1592, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "16898:5:4", + "referencedDeclaration": 4143, + "src": "17038:5:6", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1446, + "id": 1593, "isConstant": false, "isLValue": false, "isPure": false, @@ -14417,7 +14860,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "16898:15:4", + "src": "17038:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14427,46 +14870,46 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1447, + "id": 1594, "name": "_terminationDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "16916:16:4", + "referencedDeclaration": 1587, + "src": "17056:16:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16898:34:4", + "src": "17038:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1449, + "id": 1596, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "16897:36:4", + "src": "17037:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1444, - "id": 1450, + "functionReturnParameters": 1591, + "id": 1597, "nodeType": "Return", - "src": "16890:43:4" + "src": "17030:43:6" } ] }, "documentation": "@dev Checks if an expiration date has been reached\n@param _terminationDate Integer timestamp of date to compare current timestamp with\n@return expired Boolean indication of whether the terminationDate has passed", - "id": 1452, + "id": 1599, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -14474,16 +14917,16 @@ "name": "isExpired", "nodeType": "FunctionDefinition", "parameters": { - "id": 1441, + "id": 1588, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1440, + "id": 1587, "name": "_terminationDate", "nodeType": "VariableDeclaration", - "scope": 1452, - "src": "16826:21:4", + "scope": 1599, + "src": "16966:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14491,10 +14934,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1439, + "id": 1586, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "16826:4:4", + "src": "16966:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14504,20 +14947,20 @@ "visibility": "internal" } ], - "src": "16825:23:4" + "src": "16965:23:6" }, "payable": false, "returnParameters": { - "id": 1444, + "id": 1591, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1443, + "id": 1590, "name": "expired", "nodeType": "VariableDeclaration", - "scope": 1452, - "src": "16870:12:4", + "scope": 1599, + "src": "17010:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14525,10 +14968,10 @@ "typeString": "bool" }, "typeName": { - "id": 1442, + "id": 1589, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "16870:4:4", + "src": "17010:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14538,19 +14981,19 @@ "visibility": "internal" } ], - "src": "16869:14:4" + "src": "17009:14:6" }, - "scope": 1471, - "src": "16807:131:4", + "scope": 1618, + "src": "16947:131:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1469, + "id": 1616, "nodeType": "Block", - "src": "17240:61:4", + "src": "17380:61:6", "statements": [ { "expression": { @@ -14561,12 +15004,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1464, + "id": 1611, "name": "_user", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1454, - "src": "17280:5:4", + "referencedDeclaration": 1601, + "src": "17420:5:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14574,12 +15017,12 @@ }, { "argumentTypes": null, - "id": 1465, + "id": 1612, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1456, - "src": "17287:7:4", + "referencedDeclaration": 1603, + "src": "17427:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14599,18 +15042,18 @@ ], "expression": { "argumentTypes": null, - "id": 1462, + "id": 1609, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "17263:3:4", + "referencedDeclaration": 4140, + "src": "17403:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1463, + "id": 1610, "isConstant": false, "isLValue": false, "isPure": true, @@ -14618,13 +15061,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17263:16:4", + "src": "17403:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1466, + "id": 1613, "isConstant": false, "isLValue": false, "isPure": false, @@ -14632,7 +15075,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17263:32:4", + "src": "17403:32:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -14646,18 +15089,18 @@ "typeString": "bytes memory" } ], - "id": 1461, + "id": 1608, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "17253:9:4", + "referencedDeclaration": 4147, + "src": "17393:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1467, + "id": 1614, "isConstant": false, "isLValue": false, "isPure": false, @@ -14665,21 +15108,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17253:43:4", + "src": "17393:43:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1460, - "id": 1468, + "functionReturnParameters": 1607, + "id": 1615, "nodeType": "Return", - "src": "17246:50:4" + "src": "17386:50:6" } ] }, "documentation": "@dev Generates an identifier which associates a user and a poll together\n@param _pollID Integer identifier associated with target poll\n@return UUID Hash which is deterministic from _user and _pollID", - "id": 1470, + "id": 1617, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -14687,16 +15130,16 @@ "name": "attrUUID", "nodeType": "FunctionDefinition", "parameters": { - "id": 1457, + "id": 1604, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1454, + "id": 1601, "name": "_user", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17176:13:4", + "scope": 1617, + "src": "17316:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14704,10 +15147,10 @@ "typeString": "address" }, "typeName": { - "id": 1453, + "id": 1600, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17176:7:4", + "src": "17316:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14718,11 +15161,11 @@ }, { "constant": false, - "id": 1456, + "id": 1603, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17191:12:4", + "scope": 1617, + "src": "17331:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14730,10 +15173,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1455, + "id": 1602, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17191:4:4", + "src": "17331:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14743,20 +15186,20 @@ "visibility": "internal" } ], - "src": "17175:29:4" + "src": "17315:29:6" }, "payable": false, "returnParameters": { - "id": 1460, + "id": 1607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1459, + "id": 1606, "name": "UUID", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17226:12:4", + "scope": 1617, + "src": "17366:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14764,10 +15207,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1458, + "id": 1605, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17226:7:4", + "src": "17366:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14777,82 +15220,82 @@ "visibility": "internal" } ], - "src": "17225:14:4" + "src": "17365:14:6" }, - "scope": 1471, - "src": "17158:143:4", + "scope": 1618, + "src": "17298:143:6", "stateMutability": "pure", "superFunction": null, "visibility": "public" } ], - "scope": 1472, - "src": "252:17051:4" + "scope": 1619, + "src": "252:17191:6" } ], - "src": "0:17304:4" + "src": "0:17444:6" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "exportedSymbols": { "PLCRVoting": [ - 1471 + 1618 ] }, - "id": 1472, + "id": 1619, "nodeType": "SourceUnit", "nodes": [ { - "id": 442, + "id": 562, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:4" + "src": "0:23:6" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 443, + "id": 563, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 409, - "src": "25:21:4", + "scope": 1619, + "sourceUnit": 529, + "src": "25:21:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/DLL.sol", + "absolutePath": "/home/bharath/computable/contracts/DLL.sol", "file": "./DLL.sol", - "id": 444, + "id": 564, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 366, - "src": "47:19:4", + "scope": 1619, + "sourceUnit": 486, + "src": "47:19:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/AttributeStore.sol", + "absolutePath": "/home/bharath/computable/contracts/AttributeStore.sol", "file": "./AttributeStore.sol", - "id": 445, + "id": 565, "nodeType": "ImportDirective", - "scope": 1472, + "scope": 1619, "sourceUnit": 65, - "src": "67:30:4", + "src": "67:30:6", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 446, + "id": 566, "nodeType": "ImportDirective", - "scope": 1472, - "sourceUnit": 3688, - "src": "98:24:4", + "scope": 1619, + "sourceUnit": 3892, + "src": "98:24:6", "symbolAliases": [], "unitAlias": "" }, @@ -14862,9 +15305,9 @@ "contractKind": "contract", "documentation": "@title Partial-Lock-Commit-Reveal Voting scheme with ERC20 tokens\n@author Team: Aspyn Palatnick, Cem Ozer, Yorke Rhodes", "fullyImplemented": true, - "id": 1471, + "id": 1618, "linearizedBaseContracts": [ - 1471 + 1618 ], "name": "PLCRVoting", "nodeType": "ContractDefinition", @@ -14872,21 +15315,21 @@ { "anonymous": false, "documentation": null, - "id": 454, + "id": 574, "name": "_VoteCommitted", "nodeType": "EventDefinition", "parameters": { - "id": 453, + "id": 573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 448, + "id": 568, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "348:19:4", + "scope": 574, + "src": "348:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14894,10 +15337,10 @@ "typeString": "uint256" }, "typeName": { - "id": 447, + "id": 567, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "348:4:4", + "src": "348:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14908,12 +15351,12 @@ }, { "constant": false, - "id": 450, + "id": 570, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "369:14:4", + "scope": 574, + "src": "369:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14921,10 +15364,10 @@ "typeString": "uint256" }, "typeName": { - "id": 449, + "id": 569, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "369:4:4", + "src": "369:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14935,12 +15378,12 @@ }, { "constant": false, - "id": 452, + "id": 572, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 454, - "src": "385:21:4", + "scope": 574, + "src": "385:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14948,10 +15391,10 @@ "typeString": "address" }, "typeName": { - "id": 451, + "id": 571, "name": "address", "nodeType": "ElementaryTypeName", - "src": "385:7:4", + "src": "385:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14961,28 +15404,28 @@ "visibility": "internal" } ], - "src": "347:60:4" + "src": "347:60:6" }, - "src": "327:81:4" + "src": "327:81:6" }, { "anonymous": false, "documentation": null, - "id": 468, + "id": 588, "name": "_VoteRevealed", "nodeType": "EventDefinition", "parameters": { - "id": 467, + "id": 587, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 456, + "id": 576, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "431:19:4", + "scope": 588, + "src": "431:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14990,10 +15433,10 @@ "typeString": "uint256" }, "typeName": { - "id": 455, + "id": 575, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "431:4:4", + "src": "431:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15004,12 +15447,12 @@ }, { "constant": false, - "id": 458, + "id": 578, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "452:14:4", + "scope": 588, + "src": "452:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15017,10 +15460,10 @@ "typeString": "uint256" }, "typeName": { - "id": 457, + "id": 577, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "452:4:4", + "src": "452:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15031,12 +15474,12 @@ }, { "constant": false, - "id": 460, + "id": 580, "indexed": false, "name": "votesFor", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "468:13:4", + "scope": 588, + "src": "468:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15044,10 +15487,10 @@ "typeString": "uint256" }, "typeName": { - "id": 459, + "id": 579, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "468:4:4", + "src": "468:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15058,12 +15501,12 @@ }, { "constant": false, - "id": 462, + "id": 582, "indexed": false, "name": "votesAgainst", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "483:17:4", + "scope": 588, + "src": "483:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15071,10 +15514,10 @@ "typeString": "uint256" }, "typeName": { - "id": 461, + "id": 581, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "483:4:4", + "src": "483:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15085,12 +15528,12 @@ }, { "constant": false, - "id": 464, + "id": 584, "indexed": true, "name": "choice", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "502:19:4", + "scope": 588, + "src": "502:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15098,10 +15541,10 @@ "typeString": "uint256" }, "typeName": { - "id": 463, + "id": 583, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "502:4:4", + "src": "502:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15112,12 +15555,12 @@ }, { "constant": false, - "id": 466, + "id": 586, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 468, - "src": "523:21:4", + "scope": 588, + "src": "523:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15125,10 +15568,10 @@ "typeString": "address" }, "typeName": { - "id": 465, + "id": 585, "name": "address", "nodeType": "ElementaryTypeName", - "src": "523:7:4", + "src": "523:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15138,28 +15581,28 @@ "visibility": "internal" } ], - "src": "430:115:4" + "src": "430:115:6" }, - "src": "411:135:4" + "src": "411:135:6" }, { "anonymous": false, "documentation": null, - "id": 480, + "id": 600, "name": "_PollCreated", "nodeType": "EventDefinition", "parameters": { - "id": 479, + "id": 599, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 470, + "id": 590, "indexed": false, "name": "voteQuorum", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "568:15:4", + "scope": 600, + "src": "568:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15167,10 +15610,10 @@ "typeString": "uint256" }, "typeName": { - "id": 469, + "id": 589, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "568:4:4", + "src": "568:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15181,12 +15624,12 @@ }, { "constant": false, - "id": 472, + "id": 592, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "585:18:4", + "scope": 600, + "src": "585:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15194,10 +15637,10 @@ "typeString": "uint256" }, "typeName": { - "id": 471, + "id": 591, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "585:4:4", + "src": "585:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15208,12 +15651,12 @@ }, { "constant": false, - "id": 474, + "id": 594, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "605:18:4", + "scope": 600, + "src": "605:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15221,10 +15664,10 @@ "typeString": "uint256" }, "typeName": { - "id": 473, + "id": 593, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "605:4:4", + "src": "605:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15235,12 +15678,12 @@ }, { "constant": false, - "id": 476, + "id": 596, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "625:19:4", + "scope": 600, + "src": "625:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15248,10 +15691,10 @@ "typeString": "uint256" }, "typeName": { - "id": 475, + "id": 595, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "625:4:4", + "src": "625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15262,12 +15705,12 @@ }, { "constant": false, - "id": 478, + "id": 598, "indexed": true, "name": "creator", "nodeType": "VariableDeclaration", - "scope": 480, - "src": "646:23:4", + "scope": 600, + "src": "646:23:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15275,10 +15718,10 @@ "typeString": "address" }, "typeName": { - "id": 477, + "id": 597, "name": "address", "nodeType": "ElementaryTypeName", - "src": "646:7:4", + "src": "646:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15288,28 +15731,28 @@ "visibility": "internal" } ], - "src": "567:103:4" + "src": "567:103:6" }, - "src": "549:122:4" + "src": "549:122:6" }, { "anonymous": false, "documentation": null, - "id": 486, + "id": 606, "name": "_VotingRightsGranted", "nodeType": "EventDefinition", "parameters": { - "id": 485, + "id": 605, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 482, + "id": 602, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 486, - "src": "701:14:4", + "scope": 606, + "src": "701:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15317,10 +15760,10 @@ "typeString": "uint256" }, "typeName": { - "id": 481, + "id": 601, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "701:4:4", + "src": "701:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15331,12 +15774,12 @@ }, { "constant": false, - "id": 484, + "id": 604, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 486, - "src": "717:21:4", + "scope": 606, + "src": "717:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15344,10 +15787,10 @@ "typeString": "address" }, "typeName": { - "id": 483, + "id": 603, "name": "address", "nodeType": "ElementaryTypeName", - "src": "717:7:4", + "src": "717:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15357,28 +15800,28 @@ "visibility": "internal" } ], - "src": "700:39:4" + "src": "700:39:6" }, - "src": "674:66:4" + "src": "674:66:6" }, { "anonymous": false, "documentation": null, - "id": 492, + "id": 612, "name": "_VotingRightsWithdrawn", "nodeType": "EventDefinition", "parameters": { - "id": 491, + "id": 611, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 488, + "id": 608, "indexed": false, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 492, - "src": "772:14:4", + "scope": 612, + "src": "772:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15386,10 +15829,10 @@ "typeString": "uint256" }, "typeName": { - "id": 487, + "id": 607, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "772:4:4", + "src": "772:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15400,12 +15843,12 @@ }, { "constant": false, - "id": 490, + "id": 610, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 492, - "src": "788:21:4", + "scope": 612, + "src": "788:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15413,10 +15856,10 @@ "typeString": "address" }, "typeName": { - "id": 489, + "id": 609, "name": "address", "nodeType": "ElementaryTypeName", - "src": "788:7:4", + "src": "788:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15426,28 +15869,28 @@ "visibility": "internal" } ], - "src": "771:39:4" + "src": "771:39:6" }, - "src": "743:68:4" + "src": "743:68:6" }, { "anonymous": false, "documentation": null, - "id": 498, + "id": 618, "name": "_TokensRescued", "nodeType": "EventDefinition", "parameters": { - "id": 497, + "id": 617, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 494, + "id": 614, "indexed": true, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 498, - "src": "835:19:4", + "scope": 618, + "src": "835:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15455,10 +15898,10 @@ "typeString": "uint256" }, "typeName": { - "id": 493, + "id": 613, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "835:4:4", + "src": "835:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15469,12 +15912,12 @@ }, { "constant": false, - "id": 496, + "id": 616, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 498, - "src": "856:21:4", + "scope": 618, + "src": "856:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15482,10 +15925,10 @@ "typeString": "address" }, "typeName": { - "id": 495, + "id": 615, "name": "address", "nodeType": "ElementaryTypeName", - "src": "856:7:4", + "src": "856:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15495,33 +15938,33 @@ "visibility": "internal" } ], - "src": "834:44:4" + "src": "834:44:6" }, - "src": "814:65:4" + "src": "814:65:6" }, { - "id": 501, + "id": 621, "libraryName": { "contractScope": null, - "id": 499, + "id": 619, "name": "AttributeStore", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 64, - "src": "948:14:4", + "src": "948:14:6", "typeDescriptions": { "typeIdentifier": "t_contract$_AttributeStore_$64", "typeString": "library AttributeStore" } }, "nodeType": "UsingForDirective", - "src": "942:45:4", + "src": "942:45:6", "typeName": { "contractScope": null, - "id": 500, + "id": 620, "name": "AttributeStore.Data", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 6, - "src": "967:19:4", + "src": "967:19:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage_ptr", "typeString": "struct AttributeStore.Data" @@ -15529,55 +15972,55 @@ } }, { - "id": 504, + "id": 624, "libraryName": { "contractScope": null, - "id": 502, + "id": 622, "name": "DLL", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 365, - "src": "996:3:4", + "referencedDeclaration": 485, + "src": "996:3:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_DLL_$365", + "typeIdentifier": "t_contract$_DLL_$485", "typeString": "library DLL" } }, "nodeType": "UsingForDirective", - "src": "990:23:4", + "src": "990:23:6", "typeName": { "contractScope": null, - "id": 503, + "id": 623, "name": "DLL.Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1004:8:4", + "referencedDeclaration": 199, + "src": "1004:8:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } } }, { - "id": 507, + "id": 627, "libraryName": { "contractScope": null, - "id": 505, + "id": 625, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "1022:8:4", + "referencedDeclaration": 3891, + "src": "1022:8:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "1016:24:4", + "src": "1016:24:6", "typeName": { - "id": 506, + "id": 626, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1035:4:4", + "src": "1035:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15586,15 +16029,15 @@ }, { "canonicalName": "PLCRVoting.Poll", - "id": 526, + "id": 646, "members": [ { "constant": false, - "id": 509, + "id": 629, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1062:18:4", + "scope": 646, + "src": "1062:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15602,10 +16045,10 @@ "typeString": "uint256" }, "typeName": { - "id": 508, + "id": 628, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1062:4:4", + "src": "1062:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15616,11 +16059,11 @@ }, { "constant": false, - "id": 511, + "id": 631, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1136:18:4", + "scope": 646, + "src": "1136:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15628,10 +16071,10 @@ "typeString": "uint256" }, "typeName": { - "id": 510, + "id": 630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1136:4:4", + "src": "1136:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15642,11 +16085,11 @@ }, { "constant": false, - "id": 513, + "id": 633, "name": "voteQuorum", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1210:15:4", + "scope": 646, + "src": "1210:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15654,10 +16097,10 @@ "typeString": "uint256" }, "typeName": { - "id": 512, + "id": 632, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1210:4:4", + "src": "1210:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15668,11 +16111,11 @@ }, { "constant": false, - "id": 515, + "id": 635, "name": "votesFor", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1286:13:4", + "scope": 646, + "src": "1286:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15680,10 +16123,10 @@ "typeString": "uint256" }, "typeName": { - "id": 514, + "id": 634, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1286:4:4", + "src": "1286:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15694,11 +16137,11 @@ }, { "constant": false, - "id": 517, + "id": 637, "name": "votesAgainst", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1347:17:4", + "scope": 646, + "src": "1347:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15706,10 +16149,10 @@ "typeString": "uint256" }, "typeName": { - "id": 516, + "id": 636, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1347:4:4", + "src": "1347:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15720,11 +16163,11 @@ }, { "constant": false, - "id": 521, + "id": 641, "name": "didCommit", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1414:34:4", + "scope": 646, + "src": "1414:34:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15732,28 +16175,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 520, + "id": 640, "keyType": { - "id": 518, + "id": 638, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1422:7:4", + "src": "1422:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1414:24:4", + "src": "1414:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 519, + "id": 639, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1433:4:4", + "src": "1433:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15765,11 +16208,11 @@ }, { "constant": false, - "id": 525, + "id": 645, "name": "didReveal", "nodeType": "VariableDeclaration", - "scope": 526, - "src": "1519:34:4", + "scope": 646, + "src": "1519:34:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15777,28 +16220,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 524, + "id": 644, "keyType": { - "id": 522, + "id": 642, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1527:7:4", + "src": "1527:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1519:24:4", + "src": "1519:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 523, + "id": 643, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1538:4:4", + "src": "1538:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15811,17 +16254,17 @@ ], "name": "Poll", "nodeType": "StructDefinition", - "scope": 1471, - "src": "1044:579:4", + "scope": 1618, + "src": "1044:579:6", "visibility": "public" }, { "constant": true, - "id": 529, + "id": 649, "name": "INITIAL_POLL_NONCE", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1686:43:4", + "scope": 1618, + "src": "1686:43:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -15829,10 +16272,10 @@ "typeString": "uint256" }, "typeName": { - "id": 527, + "id": 647, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1686:4:4", + "src": "1686:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15841,14 +16284,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 528, + "id": 648, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1728:1:4", + "src": "1728:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15860,11 +16303,11 @@ }, { "constant": false, - "id": 531, + "id": 651, "name": "pollNonce", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1733:21:4", + "scope": 1618, + "src": "1733:21:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -15872,10 +16315,10 @@ "typeString": "uint256" }, "typeName": { - "id": 530, + "id": 650, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1733:4:4", + "src": "1733:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15886,44 +16329,44 @@ }, { "constant": false, - "id": 535, + "id": 655, "name": "pollMap", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1759:36:4", + "scope": 1618, + "src": "1759:36:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll)" }, "typeName": { - "id": 534, + "id": 654, "keyType": { - "id": 532, + "id": 652, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1767:4:4", + "src": "1767:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "1759:21:4", + "src": "1759:21:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll)" }, "valueType": { "contractScope": null, - "id": 533, + "id": 653, "name": "Poll", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 526, - "src": "1775:4:4", + "referencedDeclaration": 646, + "src": "1775:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage_ptr", + "typeIdentifier": "t_struct$_Poll_$646_storage_ptr", "typeString": "struct PLCRVoting.Poll" } } @@ -15933,11 +16376,11 @@ }, { "constant": false, - "id": 539, + "id": 659, "name": "voteTokenBalance", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1829:48:4", + "scope": 1618, + "src": "1829:48:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -15945,28 +16388,28 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 538, + "id": 658, "keyType": { - "id": 536, + "id": 656, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1837:7:4", + "src": "1837:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1829:24:4", + "src": "1829:24:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 537, + "id": 657, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1848:4:4", + "src": "1848:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15978,44 +16421,44 @@ }, { "constant": false, - "id": 543, + "id": 663, "name": "dllMap", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1926:35:4", + "scope": 1618, + "src": "1926:35:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data)" }, "typeName": { - "id": 542, + "id": 662, "keyType": { - "id": 540, + "id": 660, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1934:7:4", + "src": "1934:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1926:28:4", + "src": "1926:28:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data)" }, "valueType": { "contractScope": null, - "id": 541, + "id": 661, "name": "DLL.Data", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 79, - "src": "1945:8:4", + "referencedDeclaration": 199, + "src": "1945:8:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage_ptr", + "typeIdentifier": "t_struct$_Data_$199_storage_ptr", "typeString": "struct DLL.Data" } } @@ -16025,11 +16468,11 @@ }, { "constant": false, - "id": 545, + "id": 665, "name": "store", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1965:25:4", + "scope": 1618, + "src": "1965:25:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -16038,11 +16481,11 @@ }, "typeName": { "contractScope": null, - "id": 544, + "id": 664, "name": "AttributeStore.Data", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 6, - "src": "1965:19:4", + "src": "1965:19:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage_ptr", "typeString": "struct AttributeStore.Data" @@ -16053,26 +16496,26 @@ }, { "constant": false, - "id": 547, + "id": 667, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1471, - "src": "1995:18:4", + "scope": 1618, + "src": "1995:18:6", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 546, + "id": 666, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "1995:5:4", + "referencedDeclaration": 528, + "src": "1995:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -16081,28 +16524,28 @@ }, { "body": { - "id": 562, + "id": 682, "nodeType": "Block", - "src": "2325:72:4", + "src": "2325:72:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 556, + "id": 676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 552, + "id": 672, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2331:5:4", + "referencedDeclaration": 667, + "src": "2331:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -16113,12 +16556,12 @@ "arguments": [ { "argumentTypes": null, - "id": 554, + "id": 674, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 549, - "src": "2345:10:4", + "referencedDeclaration": 669, + "src": "2345:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16132,18 +16575,18 @@ "typeString": "address" } ], - "id": 553, + "id": 673, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "2339:5:4", + "referencedDeclaration": 528, + "src": "2339:5:6", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 555, + "id": 675, "isConstant": false, "isLValue": false, "isPure": false, @@ -16151,38 +16594,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2339:17:4", + "src": "2339:17:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "2331:25:4", + "src": "2331:25:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 557, + "id": 677, "nodeType": "ExpressionStatement", - "src": "2331:25:4" + "src": "2331:25:6" }, { "expression": { "argumentTypes": null, - "id": 560, + "id": 680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 558, + "id": 678, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "2362:9:4", + "referencedDeclaration": 651, + "src": "2362:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16192,31 +16635,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 559, + "id": 679, "name": "INITIAL_POLL_NONCE", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 529, - "src": "2374:18:4", + "referencedDeclaration": 649, + "src": "2374:18:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2362:30:4", + "src": "2362:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 561, + "id": 681, "nodeType": "ExpressionStatement", - "src": "2362:30:4" + "src": "2362:30:6" } ] }, "documentation": "@dev Initializes voteQuorum, commitDuration, revealDuration, and pollNonce in addition to token contract and trusted mapping\n@param _tokenAddr The address where the ERC20 token contract is deployed", - "id": 563, + "id": 683, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -16224,16 +16667,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 550, + "id": 670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 549, + "id": 669, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 563, - "src": "2298:18:4", + "scope": 683, + "src": "2298:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16241,10 +16684,10 @@ "typeString": "address" }, "typeName": { - "id": 548, + "id": 668, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2298:7:4", + "src": "2298:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16254,26 +16697,26 @@ "visibility": "internal" } ], - "src": "2297:20:4" + "src": "2297:20:6" }, "payable": false, "returnParameters": { - "id": 551, + "id": 671, "nodeType": "ParameterList", "parameters": [], - "src": "2325:0:4" + "src": "2325:0:6" }, - "scope": 1471, - "src": "2286:111:4", + "scope": 1618, + "src": "2286:111:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 601, + "id": 727, "nodeType": "Block", - "src": "2797:227:4", + "src": "2797:260:6", "statements": [ { "expression": { @@ -16285,7 +16728,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 575, + "id": 695, "isConstant": false, "isLValue": false, "isPure": false, @@ -16297,18 +16740,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 571, + "id": 691, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2827:3:4", + "referencedDeclaration": 4153, + "src": "2827:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 572, + "id": 692, "isConstant": false, "isLValue": false, "isPure": false, @@ -16316,7 +16759,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2827:10:4", + "src": "2827:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16332,32 +16775,32 @@ ], "expression": { "argumentTypes": null, - "id": 569, + "id": 689, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2811:5:4", + "referencedDeclaration": 667, + "src": "2811:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 570, + "id": 690, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 422, - "src": "2811:15:4", + "referencedDeclaration": 542, + "src": "2811:15:6", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 573, + "id": 693, "isConstant": false, "isLValue": false, "isPure": false, @@ -16365,7 +16808,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2811:27:4", + "src": "2811:27:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16375,18 +16818,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 574, + "id": 694, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2842:10:4", + "referencedDeclaration": 685, + "src": "2842:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2811:41:4", + "src": "2811:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16400,21 +16843,21 @@ "typeString": "bool" } ], - "id": 568, + "id": 688, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "2803:7:4", + "referencedDeclaration": 4156, + "src": "2803:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 576, + "id": 696, "isConstant": false, "isLValue": false, "isPure": false, @@ -16422,20 +16865,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2803:50:4", + "src": "2803:50:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 577, + "id": 697, "nodeType": "ExpressionStatement", - "src": "2803:50:4" + "src": "2803:50:6" }, { "expression": { "argumentTypes": null, - "id": 583, + "id": 709, "isConstant": false, "isLValue": false, "isPure": false, @@ -16444,34 +16887,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 578, + "id": 698, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "2859:16:4", + "referencedDeclaration": 659, + "src": "2859:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 581, + "id": 701, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 579, + "id": 699, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2876:3:4", + "referencedDeclaration": 4153, + "src": "2876:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 580, + "id": 700, "isConstant": false, "isLValue": false, "isPure": false, @@ -16479,7 +16922,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2876:10:4", + "src": "2876:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16490,36 +16933,131 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2859:28:4", + "src": "2859:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 582, - "name": "_numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2891:10:4", + "arguments": [ + { + "argumentTypes": null, + "id": 707, + "name": "_numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 685, + "src": "2923:10:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 702, + "name": "voteTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 659, + "src": "2890:16:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", + "typeString": "mapping(address => uint256)" + } + }, + "id": 705, + "indexExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 703, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 4153, + "src": "2907:3:6", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 704, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "2907:10:6", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "2890:28:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 706, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "2890:32:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 708, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2890:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2859:42:4", + "src": "2859:75:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 584, + "id": 710, "nodeType": "ExpressionStatement", - "src": "2859:42:4" + "src": "2859:75:6" }, { "expression": { @@ -16532,18 +17070,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 588, + "id": 714, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "2934:3:4", + "referencedDeclaration": 4153, + "src": "2967:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 589, + "id": 715, "isConstant": false, "isLValue": false, "isPure": false, @@ -16551,7 +17089,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2934:10:4", + "src": "2967:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16559,25 +17097,25 @@ }, { "argumentTypes": null, - "id": 590, + "id": 716, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3725, - "src": "2946:4:4", + "referencedDeclaration": 4182, + "src": "2979:4:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, { "argumentTypes": null, - "id": 591, + "id": 717, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2952:10:4", + "referencedDeclaration": 685, + "src": "2985:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16591,7 +17129,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, { @@ -16601,32 +17139,32 @@ ], "expression": { "argumentTypes": null, - "id": 586, + "id": 712, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "2915:5:4", + "referencedDeclaration": 667, + "src": "2948:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 587, + "id": 713, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "2915:18:4", + "referencedDeclaration": 510, + "src": "2948:18:6", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 592, + "id": 718, "isConstant": false, "isLValue": false, "isPure": false, @@ -16634,7 +17172,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2915:48:4", + "src": "2948:48:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16648,21 +17186,21 @@ "typeString": "bool" } ], - "id": 585, + "id": 711, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "2907:7:4", + "referencedDeclaration": 4156, + "src": "2940:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 593, + "id": 719, "isConstant": false, "isLValue": false, "isPure": false, @@ -16670,15 +17208,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2907:57:4", + "src": "2940:57:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 594, + "id": 720, "nodeType": "ExpressionStatement", - "src": "2907:57:4" + "src": "2940:57:6" }, { "eventCall": { @@ -16686,12 +17224,12 @@ "arguments": [ { "argumentTypes": null, - "id": 596, + "id": 722, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 565, - "src": "2996:10:4", + "referencedDeclaration": 685, + "src": "3029:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16701,18 +17239,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 597, + "id": 723, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3008:3:4", + "referencedDeclaration": 4153, + "src": "3041:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 598, + "id": 724, "isConstant": false, "isLValue": false, "isPure": false, @@ -16720,7 +17258,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3008:10:4", + "src": "3041:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16738,18 +17276,18 @@ "typeString": "address" } ], - "id": 595, + "id": 721, "name": "_VotingRightsGranted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 486, - "src": "2975:20:4", + "referencedDeclaration": 606, + "src": "3008:20:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 599, + "id": 725, "isConstant": false, "isLValue": false, "isPure": false, @@ -16757,20 +17295,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2975:44:4", + "src": "3008:44:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 600, + "id": 726, "nodeType": "EmitStatement", - "src": "2970:49:4" + "src": "3003:49:6" } ] }, "documentation": "@notice Loads _numTokens ERC20 tokens into the voting contract for one-to-one voting rights\n@dev Assumes that msg.sender has approved voting contract to spend on their behalf\n@param _numTokens The number of votingTokens desired in exchange for ERC20 tokens", - "id": 602, + "id": 728, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -16778,16 +17316,16 @@ "name": "requestVotingRights", "nodeType": "FunctionDefinition", "parameters": { - "id": 566, + "id": 686, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 565, + "id": 685, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 602, - "src": "2771:15:4", + "scope": 728, + "src": "2771:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16795,10 +17333,10 @@ "typeString": "uint256" }, "typeName": { - "id": 564, + "id": 684, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2771:4:4", + "src": "2771:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16808,39 +17346,39 @@ "visibility": "internal" } ], - "src": "2770:17:4" + "src": "2770:17:6" }, "payable": false, "returnParameters": { - "id": 567, + "id": 687, "nodeType": "ParameterList", "parameters": [], - "src": "2797:0:4" + "src": "2797:0:6" }, - "scope": 1471, - "src": "2742:282:4", + "scope": 1618, + "src": "2742:315:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 648, + "id": 780, "nodeType": "Block", - "src": "3278:297:4", + "src": "3311:330:6", "statements": [ { "assignments": [ - 608 + 734 ], "declarations": [ { "constant": false, - "id": 608, + "id": 734, "name": "availableTokens", "nodeType": "VariableDeclaration", - "scope": 649, - "src": "3284:20:4", + "scope": 781, + "src": "3317:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16848,10 +17386,10 @@ "typeString": "uint256" }, "typeName": { - "id": 607, + "id": 733, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3284:4:4", + "src": "3317:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16861,7 +17399,7 @@ "visibility": "internal" } ], - "id": 619, + "id": 745, "initialValue": { "argumentTypes": null, "arguments": [ @@ -16872,18 +17410,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 615, + "id": 741, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3356:3:4", + "referencedDeclaration": 4153, + "src": "3389:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 616, + "id": 742, "isConstant": false, "isLValue": false, "isPure": false, @@ -16891,7 +17429,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3356:10:4", + "src": "3389:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16905,18 +17443,18 @@ "typeString": "address" } ], - "id": 614, + "id": 740, "name": "getLockedTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1369, - "src": "3340:15:4", + "referencedDeclaration": 1516, + "src": "3373:15:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 617, + "id": 743, "isConstant": false, "isLValue": false, "isPure": false, @@ -16924,7 +17462,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3340:27:4", + "src": "3373:27:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16942,34 +17480,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 609, + "id": 735, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "3307:16:4", + "referencedDeclaration": 659, + "src": "3340:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 612, + "id": 738, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 610, + "id": 736, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3324:3:4", + "referencedDeclaration": 4153, + "src": "3357:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 611, + "id": 737, "isConstant": false, "isLValue": false, "isPure": false, @@ -16977,7 +17515,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3324:10:4", + "src": "3357:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16988,27 +17526,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3307:28:4", + "src": "3340:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 613, + "id": 739, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3662, - "src": "3307:32:4", + "referencedDeclaration": 3866, + "src": "3340:32:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 618, + "id": 744, "isConstant": false, "isLValue": false, "isPure": false, @@ -17016,14 +17554,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3307:61:4", + "src": "3340:61:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "3284:84:4" + "src": "3317:84:6" }, { "expression": { @@ -17035,19 +17573,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 623, + "id": 749, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 621, + "id": 747, "name": "availableTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 608, - "src": "3382:15:4", + "referencedDeclaration": 734, + "src": "3415:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17057,18 +17595,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 622, + "id": 748, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3401:10:4", + "referencedDeclaration": 730, + "src": "3434:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3382:29:4", + "src": "3415:29:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17082,21 +17620,21 @@ "typeString": "bool" } ], - "id": 620, + "id": 746, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3374:7:4", + "referencedDeclaration": 4156, + "src": "3407:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 624, + "id": 750, "isConstant": false, "isLValue": false, "isPure": false, @@ -17104,20 +17642,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3374:38:4", + "src": "3407:38:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 625, + "id": 751, "nodeType": "ExpressionStatement", - "src": "3374:38:4" + "src": "3407:38:6" }, { "expression": { "argumentTypes": null, - "id": 631, + "id": 763, "isConstant": false, "isLValue": false, "isPure": false, @@ -17126,34 +17664,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 626, + "id": 752, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "3418:16:4", + "referencedDeclaration": 659, + "src": "3451:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 629, + "id": 755, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 627, + "id": 753, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3435:3:4", + "referencedDeclaration": 4153, + "src": "3468:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 628, + "id": 754, "isConstant": false, "isLValue": false, "isPure": false, @@ -17161,7 +17699,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3435:10:4", + "src": "3468:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17172,36 +17710,131 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "3418:28:4", + "src": "3451:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 630, - "name": "_numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3450:10:4", + "arguments": [ + { + "argumentTypes": null, + "id": 761, + "name": "_numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 730, + "src": "3515:10:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 756, + "name": "voteTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 659, + "src": "3482:16:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", + "typeString": "mapping(address => uint256)" + } + }, + "id": 759, + "indexExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 757, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 4153, + "src": "3499:3:6", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 758, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "3499:10:6", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "3482:28:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 760, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "3482:32:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 762, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3482:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3418:42:4", + "src": "3451:75:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 632, + "id": 764, "nodeType": "ExpressionStatement", - "src": "3418:42:4" + "src": "3451:75:6" }, { "expression": { @@ -17214,18 +17847,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 636, + "id": 768, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3489:3:4", + "referencedDeclaration": 4153, + "src": "3555:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 637, + "id": 769, "isConstant": false, "isLValue": false, "isPure": false, @@ -17233,7 +17866,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3489:10:4", + "src": "3555:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17241,12 +17874,12 @@ }, { "argumentTypes": null, - "id": 638, + "id": 770, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3501:10:4", + "referencedDeclaration": 730, + "src": "3567:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17266,32 +17899,32 @@ ], "expression": { "argumentTypes": null, - "id": 634, + "id": 766, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 547, - "src": "3474:5:4", + "referencedDeclaration": 667, + "src": "3540:5:6", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 635, + "id": 767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "3474:14:4", + "referencedDeclaration": 551, + "src": "3540:14:6", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 639, + "id": 771, "isConstant": false, "isLValue": false, "isPure": false, @@ -17299,7 +17932,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3474:38:4", + "src": "3540:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17313,21 +17946,21 @@ "typeString": "bool" } ], - "id": 633, + "id": 765, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3466:7:4", + "referencedDeclaration": 4156, + "src": "3532:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 640, + "id": 772, "isConstant": false, "isLValue": false, "isPure": false, @@ -17335,15 +17968,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3466:47:4", + "src": "3532:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 641, + "id": 773, "nodeType": "ExpressionStatement", - "src": "3466:47:4" + "src": "3532:47:6" }, { "eventCall": { @@ -17351,12 +17984,12 @@ "arguments": [ { "argumentTypes": null, - "id": 643, + "id": 775, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 604, - "src": "3547:10:4", + "referencedDeclaration": 730, + "src": "3613:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17366,18 +17999,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 644, + "id": 776, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3559:3:4", + "referencedDeclaration": 4153, + "src": "3625:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 645, + "id": 777, "isConstant": false, "isLValue": false, "isPure": false, @@ -17385,7 +18018,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3559:10:4", + "src": "3625:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17403,18 +18036,18 @@ "typeString": "address" } ], - "id": 642, + "id": 774, "name": "_VotingRightsWithdrawn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 492, - "src": "3524:22:4", + "referencedDeclaration": 612, + "src": "3590:22:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 646, + "id": 778, "isConstant": false, "isLValue": false, "isPure": false, @@ -17422,20 +18055,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3524:46:4", + "src": "3590:46:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 647, + "id": 779, "nodeType": "EmitStatement", - "src": "3519:51:4" + "src": "3585:51:6" } ] }, "documentation": "@notice Withdraw _numTokens ERC20 tokens from the voting contract, revoking these voting rights\n@param _numTokens The number of ERC20 tokens desired in exchange for voting rights", - "id": 649, + "id": 781, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -17443,16 +18076,16 @@ "name": "withdrawVotingRights", "nodeType": "FunctionDefinition", "parameters": { - "id": 605, + "id": 731, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 604, + "id": 730, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 649, - "src": "3252:15:4", + "scope": 781, + "src": "3285:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17460,10 +18093,10 @@ "typeString": "uint256" }, "typeName": { - "id": 603, + "id": 729, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3252:4:4", + "src": "3285:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17473,26 +18106,26 @@ "visibility": "internal" } ], - "src": "3251:17:4" + "src": "3284:17:6" }, "payable": false, "returnParameters": { - "id": 606, + "id": 732, "nodeType": "ParameterList", "parameters": [], - "src": "3278:0:4" + "src": "3311:0:6" }, - "scope": 1471, - "src": "3222:353:4", + "scope": 1618, + "src": "3255:386:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 687, + "id": 819, "nodeType": "Block", - "src": "3772:199:4", + "src": "3838:199:6", "statements": [ { "expression": { @@ -17507,26 +18140,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 656, + "id": 788, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "3796:7:4", + "referencedDeclaration": 655, + "src": "3862:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 658, + "id": 790, "indexExpression": { "argumentTypes": null, - "id": 657, + "id": 789, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3804:7:4", + "referencedDeclaration": 783, + "src": "3870:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17537,21 +18170,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3796:16:4", + "src": "3862:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 659, + "id": 791, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "3796:30:4", + "referencedDeclaration": 631, + "src": "3862:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17565,18 +18198,18 @@ "typeString": "uint256" } ], - "id": 655, + "id": 787, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "3786:9:4", + "referencedDeclaration": 1599, + "src": "3852:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 660, + "id": 792, "isConstant": false, "isLValue": false, "isPure": false, @@ -17584,7 +18217,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3786:41:4", + "src": "3852:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17598,21 +18231,21 @@ "typeString": "bool" } ], - "id": 654, + "id": 786, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3778:7:4", + "referencedDeclaration": 4156, + "src": "3844:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 661, + "id": 793, "isConstant": false, "isLValue": false, "isPure": false, @@ -17620,15 +18253,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3778:50:4", + "src": "3844:50:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 662, + "id": 794, "nodeType": "ExpressionStatement", - "src": "3778:50:4" + "src": "3844:50:6" }, { "expression": { @@ -17639,12 +18272,12 @@ "arguments": [ { "argumentTypes": null, - "id": 669, + "id": 801, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3870:7:4", + "referencedDeclaration": 783, + "src": "3936:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17662,34 +18295,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 664, + "id": 796, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "3842:6:4", + "referencedDeclaration": 663, + "src": "3908:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 667, + "id": 799, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 665, + "id": 797, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3849:3:4", + "referencedDeclaration": 4153, + "src": "3915:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 666, + "id": 798, "isConstant": false, "isLValue": false, "isPure": false, @@ -17697,7 +18330,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3849:10:4", + "src": "3915:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17708,27 +18341,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3842:18:4", + "src": "3908:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 668, + "id": 800, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "contains", "nodeType": "MemberAccess", - "referencedDeclaration": 153, - "src": "3842:27:4", + "referencedDeclaration": 273, + "src": "3908:27:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 670, + "id": 802, "isConstant": false, "isLValue": false, "isPure": false, @@ -17736,7 +18369,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3842:36:4", + "src": "3908:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17750,21 +18383,21 @@ "typeString": "bool" } ], - "id": 663, + "id": 795, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3834:7:4", + "referencedDeclaration": 4156, + "src": "3900:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 671, + "id": 803, "isConstant": false, "isLValue": false, "isPure": false, @@ -17772,15 +18405,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3834:45:4", + "src": "3900:45:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 672, + "id": 804, "nodeType": "ExpressionStatement", - "src": "3834:45:4" + "src": "3900:45:6" }, { "expression": { @@ -17788,12 +18421,12 @@ "arguments": [ { "argumentTypes": null, - "id": 678, + "id": 810, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3912:7:4", + "referencedDeclaration": 783, + "src": "3978:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17811,34 +18444,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 673, + "id": 805, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "3886:6:4", + "referencedDeclaration": 663, + "src": "3952:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 676, + "id": 808, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 674, + "id": 806, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3893:3:4", + "referencedDeclaration": 4153, + "src": "3959:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 675, + "id": 807, "isConstant": false, "isLValue": false, "isPure": false, @@ -17846,7 +18479,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3893:10:4", + "src": "3959:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17857,27 +18490,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3886:18:4", + "src": "3952:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 677, + "id": 809, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "remove", "nodeType": "MemberAccess", - "referencedDeclaration": 364, - "src": "3886:25:4", + "referencedDeclaration": 484, + "src": "3952:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 679, + "id": 811, "isConstant": false, "isLValue": false, "isPure": false, @@ -17885,15 +18518,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3886:34:4", + "src": "3952:34:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 680, + "id": 812, "nodeType": "ExpressionStatement", - "src": "3886:34:4" + "src": "3952:34:6" }, { "eventCall": { @@ -17901,12 +18534,12 @@ "arguments": [ { "argumentTypes": null, - "id": 682, + "id": 814, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 651, - "src": "3946:7:4", + "referencedDeclaration": 783, + "src": "4012:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17916,18 +18549,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 683, + "id": 815, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3955:3:4", + "referencedDeclaration": 4153, + "src": "4021:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 684, + "id": 816, "isConstant": false, "isLValue": false, "isPure": false, @@ -17935,7 +18568,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3955:10:4", + "src": "4021:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17953,18 +18586,18 @@ "typeString": "address" } ], - "id": 681, + "id": 813, "name": "_TokensRescued", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 498, - "src": "3931:14:4", + "referencedDeclaration": 618, + "src": "3997:14:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address)" } }, - "id": 685, + "id": 817, "isConstant": false, "isLValue": false, "isPure": false, @@ -17972,20 +18605,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3931:35:4", + "src": "3997:35:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 686, + "id": 818, "nodeType": "EmitStatement", - "src": "3926:40:4" + "src": "3992:40:6" } ] }, "documentation": "@dev Unlocks tokens locked in unrevealed vote where poll has ended\n@param _pollID Integer identifier associated with the target poll", - "id": 688, + "id": 820, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -17993,16 +18626,16 @@ "name": "rescueTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 652, + "id": 784, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 651, + "id": 783, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 688, - "src": "3749:12:4", + "scope": 820, + "src": "3815:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18010,10 +18643,10 @@ "typeString": "uint256" }, "typeName": { - "id": 650, + "id": 782, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3749:4:4", + "src": "3815:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18023,26 +18656,26 @@ "visibility": "internal" } ], - "src": "3748:14:4" + "src": "3814:14:6" }, "payable": false, "returnParameters": { - "id": 653, + "id": 785, "nodeType": "ParameterList", "parameters": [], - "src": "3772:0:4" + "src": "3838:0:6" }, - "scope": 1471, - "src": "3727:244:4", + "scope": 1618, + "src": "3793:244:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 823, + "id": 955, "nodeType": "Block", - "src": "4655:1092:4", + "src": "4721:1092:6", "statements": [ { "expression": { @@ -18053,12 +18686,12 @@ "arguments": [ { "argumentTypes": null, - "id": 701, + "id": 833, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "4688:7:4", + "referencedDeclaration": 822, + "src": "4754:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18072,18 +18705,18 @@ "typeString": "uint256" } ], - "id": 700, + "id": 832, "name": "commitPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1209, - "src": "4669:18:4", + "referencedDeclaration": 1356, + "src": "4735:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 702, + "id": 834, "isConstant": false, "isLValue": false, "isPure": false, @@ -18091,7 +18724,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4669:27:4", + "src": "4735:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18105,21 +18738,21 @@ "typeString": "bool" } ], - "id": 699, + "id": 831, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4661:7:4", + "referencedDeclaration": 4156, + "src": "4727:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 703, + "id": 835, "isConstant": false, "isLValue": false, "isPure": false, @@ -18127,15 +18760,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4661:36:4", + "src": "4727:36:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 704, + "id": 836, "nodeType": "ExpressionStatement", - "src": "4661:36:4" + "src": "4727:36:6" }, { "expression": { @@ -18147,7 +18780,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 711, + "id": 843, "isConstant": false, "isLValue": false, "isPure": false, @@ -18156,34 +18789,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 706, + "id": 838, "name": "voteTokenBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 539, - "src": "4711:16:4", + "referencedDeclaration": 659, + "src": "4777:16:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 709, + "id": 841, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 707, + "id": 839, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4728:3:4", + "referencedDeclaration": 4153, + "src": "4794:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 708, + "id": 840, "isConstant": false, "isLValue": false, "isPure": false, @@ -18191,7 +18824,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4728:10:4", + "src": "4794:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18202,7 +18835,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4711:28:4", + "src": "4777:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18212,18 +18845,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 710, + "id": 842, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "4743:10:4", + "referencedDeclaration": 826, + "src": "4809:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4711:42:4", + "src": "4777:42:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18237,21 +18870,21 @@ "typeString": "bool" } ], - "id": 705, + "id": 837, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4703:7:4", + "referencedDeclaration": 4156, + "src": "4769:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 712, + "id": 844, "isConstant": false, "isLValue": false, "isPure": false, @@ -18259,15 +18892,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4703:51:4", + "src": "4769:51:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 713, + "id": 845, "nodeType": "ExpressionStatement", - "src": "4703:51:4" + "src": "4769:51:6" }, { "expression": { @@ -18279,19 +18912,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 717, + "id": 849, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 715, + "id": 847, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "4802:7:4", + "referencedDeclaration": 822, + "src": "4868:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18302,14 +18935,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 716, + "id": 848, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4813:1:4", + "src": "4879:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18317,7 +18950,7 @@ }, "value": "0" }, - "src": "4802:12:4", + "src": "4868:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18331,21 +18964,21 @@ "typeString": "bool" } ], - "id": 714, + "id": 846, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4794:7:4", + "referencedDeclaration": 4156, + "src": "4860:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 718, + "id": 850, "isConstant": false, "isLValue": false, "isPure": false, @@ -18353,15 +18986,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4794:21:4", + "src": "4860:21:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 719, + "id": 851, "nodeType": "ExpressionStatement", - "src": "4794:21:4" + "src": "4860:21:6" }, { "expression": { @@ -18373,7 +19006,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 731, + "id": 863, "isConstant": false, "isLValue": false, "isPure": false, @@ -18384,19 +19017,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 723, + "id": 855, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 721, + "id": 853, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "4978:11:4", + "referencedDeclaration": 828, + "src": "5044:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18407,14 +19040,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 722, + "id": 854, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4993:1:4", + "src": "5059:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18422,7 +19055,7 @@ }, "value": "0" }, - "src": "4978:16:4", + "src": "5044:16:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18435,12 +19068,12 @@ "arguments": [ { "argumentTypes": null, - "id": 729, + "id": 861, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5026:11:4", + "referencedDeclaration": 828, + "src": "5092:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18458,34 +19091,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 724, + "id": 856, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "4998:6:4", + "referencedDeclaration": 663, + "src": "5064:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 727, + "id": 859, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 725, + "id": 857, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5005:3:4", + "referencedDeclaration": 4153, + "src": "5071:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 726, + "id": 858, "isConstant": false, "isLValue": false, "isPure": false, @@ -18493,7 +19126,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5005:10:4", + "src": "5071:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18504,27 +19137,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4998:18:4", + "src": "5064:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 728, + "id": 860, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "contains", "nodeType": "MemberAccess", - "referencedDeclaration": 153, - "src": "4998:27:4", + "referencedDeclaration": 273, + "src": "5064:27:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_bool_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (bool)" } }, - "id": 730, + "id": 862, "isConstant": false, "isLValue": false, "isPure": false, @@ -18532,13 +19165,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4998:40:4", + "src": "5064:40:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "4978:60:4", + "src": "5044:60:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18552,21 +19185,21 @@ "typeString": "bool" } ], - "id": 720, + "id": 852, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4970:7:4", + "referencedDeclaration": 4156, + "src": "5036:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 732, + "id": 864, "isConstant": false, "isLValue": false, "isPure": false, @@ -18574,28 +19207,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4970:69:4", + "src": "5036:69:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 733, + "id": 865, "nodeType": "ExpressionStatement", - "src": "4970:69:4" + "src": "5036:69:6" }, { "assignments": [ - 735 + 867 ], "declarations": [ { "constant": false, - "id": 735, + "id": 867, "name": "nextPollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "5046:15:4", + "scope": 956, + "src": "5112:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18603,10 +19236,10 @@ "typeString": "uint256" }, "typeName": { - "id": 734, + "id": 866, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5046:4:4", + "src": "5112:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18616,18 +19249,18 @@ "visibility": "internal" } ], - "id": 743, + "id": 875, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 741, + "id": 873, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5091:11:4", + "referencedDeclaration": 828, + "src": "5157:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18645,34 +19278,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 736, + "id": 868, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5064:6:4", + "referencedDeclaration": 663, + "src": "5130:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 739, + "id": 871, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 737, + "id": 869, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5071:3:4", + "referencedDeclaration": 4153, + "src": "5137:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 738, + "id": 870, "isConstant": false, "isLValue": false, "isPure": false, @@ -18680,7 +19313,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5071:10:4", + "src": "5137:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18691,27 +19324,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5064:18:4", + "src": "5130:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 740, + "id": 872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getNext", "nodeType": "MemberAccess", - "referencedDeclaration": 169, - "src": "5064:26:4", + "referencedDeclaration": 289, + "src": "5130:26:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 742, + "id": 874, "isConstant": false, "isLValue": false, "isPure": false, @@ -18719,31 +19352,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5064:39:4", + "src": "5130:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5046:57:4" + "src": "5112:57:6" }, { "expression": { "argumentTypes": null, - "id": 758, + "id": 890, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 744, + "id": 876, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5178:10:4", + "referencedDeclaration": 867, + "src": "5244:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18762,19 +19395,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 747, + "id": 879, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 745, + "id": 877, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5192:10:4", + "referencedDeclaration": 867, + "src": "5258:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18784,32 +19417,32 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 746, + "id": 878, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5206:7:4", + "referencedDeclaration": 822, + "src": "5272:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5192:21:4", + "src": "5258:21:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 748, + "id": 880, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "5191:23:4", + "src": "5257:23:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18817,35 +19450,35 @@ }, "falseExpression": { "argumentTypes": null, - "id": 756, + "id": 888, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5255:10:4", + "referencedDeclaration": 867, + "src": "5321:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 757, + "id": 889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "5191:74:4", + "src": "5257:74:6", "trueExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 754, + "id": 886, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5244:7:4", + "referencedDeclaration": 822, + "src": "5310:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18863,34 +19496,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 749, + "id": 881, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5217:6:4", + "referencedDeclaration": 663, + "src": "5283:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 752, + "id": 884, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 750, + "id": 882, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5224:3:4", + "referencedDeclaration": 4153, + "src": "5290:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 751, + "id": 883, "isConstant": false, "isLValue": false, "isPure": false, @@ -18898,7 +19531,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5224:10:4", + "src": "5290:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18909,27 +19542,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5217:18:4", + "src": "5283:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 753, + "id": 885, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getNext", "nodeType": "MemberAccess", - "referencedDeclaration": 169, - "src": "5217:26:4", + "referencedDeclaration": 289, + "src": "5283:26:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 755, + "id": 887, "isConstant": false, "isLValue": false, "isPure": false, @@ -18937,7 +19570,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5217:35:4", + "src": "5283:35:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18948,15 +19581,15 @@ "typeString": "uint256" } }, - "src": "5178:87:4", + "src": "5244:87:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 759, + "id": 891, "nodeType": "ExpressionStatement", - "src": "5178:87:4" + "src": "5244:87:6" }, { "expression": { @@ -18967,12 +19600,12 @@ "arguments": [ { "argumentTypes": null, - "id": 762, + "id": 894, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5310:11:4", + "referencedDeclaration": 828, + "src": "5376:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18980,12 +19613,12 @@ }, { "argumentTypes": null, - "id": 763, + "id": 895, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5331:10:4", + "referencedDeclaration": 867, + "src": "5397:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18995,18 +19628,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 764, + "id": 896, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5352:3:4", + "referencedDeclaration": 4153, + "src": "5418:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 765, + "id": 897, "isConstant": false, "isLValue": false, "isPure": false, @@ -19014,7 +19647,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5352:10:4", + "src": "5418:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19022,12 +19655,12 @@ }, { "argumentTypes": null, - "id": 766, + "id": 898, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5372:10:4", + "referencedDeclaration": 826, + "src": "5438:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19053,18 +19686,18 @@ "typeString": "uint256" } ], - "id": 761, + "id": 893, "name": "validPosition", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 866, - "src": "5287:13:4", + "referencedDeclaration": 998, + "src": "5353:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256,uint256,address,uint256) view returns (bool)" } }, - "id": 767, + "id": 899, "isConstant": false, "isLValue": false, "isPure": false, @@ -19072,7 +19705,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5287:103:4", + "src": "5353:103:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19086,21 +19719,21 @@ "typeString": "bool" } ], - "id": 760, + "id": 892, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5272:7:4", + "referencedDeclaration": 4156, + "src": "5338:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 768, + "id": 900, "isConstant": false, "isLValue": false, "isPure": false, @@ -19108,15 +19741,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5272:124:4", + "src": "5338:124:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 769, + "id": 901, "nodeType": "ExpressionStatement", - "src": "5272:124:4" + "src": "5338:124:6" }, { "expression": { @@ -19124,12 +19757,12 @@ "arguments": [ { "argumentTypes": null, - "id": 775, + "id": 907, "name": "_prevPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 696, - "src": "5429:11:4", + "referencedDeclaration": 828, + "src": "5495:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19137,12 +19770,12 @@ }, { "argumentTypes": null, - "id": 776, + "id": 908, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5442:7:4", + "referencedDeclaration": 822, + "src": "5508:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19150,12 +19783,12 @@ }, { "argumentTypes": null, - "id": 777, + "id": 909, "name": "nextPollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 735, - "src": "5451:10:4", + "referencedDeclaration": 867, + "src": "5517:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19181,34 +19814,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 770, + "id": 902, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "5403:6:4", + "referencedDeclaration": 663, + "src": "5469:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 773, + "id": 905, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 771, + "id": 903, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5410:3:4", + "referencedDeclaration": 4153, + "src": "5476:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 772, + "id": 904, "isConstant": false, "isLValue": false, "isPure": false, @@ -19216,7 +19849,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5410:10:4", + "src": "5476:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19227,27 +19860,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5403:18:4", + "src": "5469:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 774, + "id": 906, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "insert", "nodeType": "MemberAccess", - "referencedDeclaration": 310, - "src": "5403:25:4", + "referencedDeclaration": 430, + "src": "5469:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256,uint256,uint256)" } }, - "id": 778, + "id": 910, "isConstant": false, "isLValue": false, "isPure": false, @@ -19255,28 +19888,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5403:59:4", + "src": "5469:59:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 779, + "id": 911, "nodeType": "ExpressionStatement", - "src": "5403:59:4" + "src": "5469:59:6" }, { "assignments": [ - 781 + 913 ], "declarations": [ { "constant": false, - "id": 781, + "id": 913, "name": "UUID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "5469:12:4", + "scope": 956, + "src": "5535:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19284,10 +19917,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 780, + "id": 912, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5469:7:4", + "src": "5535:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19297,7 +19930,7 @@ "visibility": "internal" } ], - "id": 787, + "id": 919, "initialValue": { "argumentTypes": null, "arguments": [ @@ -19305,18 +19938,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 783, + "id": 915, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5493:3:4", + "referencedDeclaration": 4153, + "src": "5559:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 784, + "id": 916, "isConstant": false, "isLValue": false, "isPure": false, @@ -19324,7 +19957,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5493:10:4", + "src": "5559:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19332,12 +19965,12 @@ }, { "argumentTypes": null, - "id": 785, + "id": 917, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5505:7:4", + "referencedDeclaration": 822, + "src": "5571:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19355,18 +19988,18 @@ "typeString": "uint256" } ], - "id": 782, + "id": 914, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "5484:8:4", + "referencedDeclaration": 1617, + "src": "5550:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 786, + "id": 918, "isConstant": false, "isLValue": false, "isPure": false, @@ -19374,14 +20007,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5484:29:4", + "src": "5550:29:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "5469:44:4" + "src": "5535:44:6" }, { "expression": { @@ -19389,12 +20022,12 @@ "arguments": [ { "argumentTypes": null, - "id": 791, + "id": 923, "name": "UUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 781, - "src": "5539:4:4", + "referencedDeclaration": 913, + "src": "5605:4:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19403,14 +20036,14 @@ { "argumentTypes": null, "hexValue": "6e756d546f6b656e73", - "id": 792, + "id": 924, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5545:11:4", + "src": "5611:11:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_aaabf4403cd242796b0e69a57762477ad48e1fa250247ff93eeada3e5b75581a", @@ -19420,12 +20053,12 @@ }, { "argumentTypes": null, - "id": 793, + "id": 925, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5558:10:4", + "referencedDeclaration": 826, + "src": "5624:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19449,18 +20082,18 @@ ], "expression": { "argumentTypes": null, - "id": 788, + "id": 920, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "5520:5:4", + "referencedDeclaration": 665, + "src": "5586:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 790, + "id": 922, "isConstant": false, "isLValue": true, "isPure": false, @@ -19468,13 +20101,13 @@ "memberName": "setAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 63, - "src": "5520:18:4", + "src": "5586:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory,uint256)" } }, - "id": 794, + "id": 926, "isConstant": false, "isLValue": false, "isPure": false, @@ -19482,15 +20115,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5520:49:4", + "src": "5586:49:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 795, + "id": 927, "nodeType": "ExpressionStatement", - "src": "5520:49:4" + "src": "5586:49:6" }, { "expression": { @@ -19498,12 +20131,12 @@ "arguments": [ { "argumentTypes": null, - "id": 799, + "id": 931, "name": "UUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 781, - "src": "5594:4:4", + "referencedDeclaration": 913, + "src": "5660:4:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19512,14 +20145,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697448617368", - "id": 800, + "id": 932, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5600:12:4", + "src": "5666:12:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_207714604a0440a484c6569f8718c59de7b49b2f64c69153d0c80360597b39a3", @@ -19532,12 +20165,12 @@ "arguments": [ { "argumentTypes": null, - "id": 802, + "id": 934, "name": "_secretHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 692, - "src": "5619:11:4", + "referencedDeclaration": 824, + "src": "5685:11:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19551,20 +20184,20 @@ "typeString": "bytes32" } ], - "id": 801, + "id": 933, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "5614:4:4", + "src": "5680:4:6", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint" }, - "id": 803, + "id": 935, "isConstant": false, "isLValue": false, "isPure": false, @@ -19572,7 +20205,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5614:17:4", + "src": "5680:17:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19596,18 +20229,18 @@ ], "expression": { "argumentTypes": null, - "id": 796, + "id": 928, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "5575:5:4", + "referencedDeclaration": 665, + "src": "5641:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 798, + "id": 930, "isConstant": false, "isLValue": true, "isPure": false, @@ -19615,13 +20248,13 @@ "memberName": "setAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 63, - "src": "5575:18:4", + "src": "5641:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory,uint256)" } }, - "id": 804, + "id": 936, "isConstant": false, "isLValue": false, "isPure": false, @@ -19629,20 +20262,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5575:57:4", + "src": "5641:57:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 805, + "id": 937, "nodeType": "ExpressionStatement", - "src": "5575:57:4" + "src": "5641:57:6" }, { "expression": { "argumentTypes": null, - "id": 814, + "id": 946, "isConstant": false, "isLValue": false, "isPure": false, @@ -19655,26 +20288,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 806, + "id": 938, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "5639:7:4", + "referencedDeclaration": 655, + "src": "5705:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 808, + "id": 940, "indexExpression": { "argumentTypes": null, - "id": 807, + "id": 939, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5647:7:4", + "referencedDeclaration": 822, + "src": "5713:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19685,43 +20318,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5639:16:4", + "src": "5705:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 809, + "id": 941, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "5639:26:4", + "referencedDeclaration": 641, + "src": "5705:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 812, + "id": 944, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 810, + "id": 942, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5666:3:4", + "referencedDeclaration": 4153, + "src": "5732:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 811, + "id": 943, "isConstant": false, "isLValue": false, "isPure": false, @@ -19729,7 +20362,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5666:10:4", + "src": "5732:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19740,7 +20373,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5639:38:4", + "src": "5705:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19751,14 +20384,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 813, + "id": 945, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "5680:4:4", + "src": "5746:4:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -19766,15 +20399,15 @@ }, "value": "true" }, - "src": "5639:45:4", + "src": "5705:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 815, + "id": 947, "nodeType": "ExpressionStatement", - "src": "5639:45:4" + "src": "5705:45:6" }, { "eventCall": { @@ -19782,12 +20415,12 @@ "arguments": [ { "argumentTypes": null, - "id": 817, + "id": 949, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 690, - "src": "5710:7:4", + "referencedDeclaration": 822, + "src": "5776:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19795,12 +20428,12 @@ }, { "argumentTypes": null, - "id": 818, + "id": 950, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 694, - "src": "5719:10:4", + "referencedDeclaration": 826, + "src": "5785:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19810,18 +20443,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 819, + "id": 951, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5731:3:4", + "referencedDeclaration": 4153, + "src": "5797:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 820, + "id": 952, "isConstant": false, "isLValue": false, "isPure": false, @@ -19829,7 +20462,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5731:10:4", + "src": "5797:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19851,18 +20484,18 @@ "typeString": "address" } ], - "id": 816, + "id": 948, "name": "_VoteCommitted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 454, - "src": "5695:14:4", + "referencedDeclaration": 574, + "src": "5761:14:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 821, + "id": 953, "isConstant": false, "isLValue": false, "isPure": false, @@ -19870,20 +20503,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5695:47:4", + "src": "5761:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 822, + "id": 954, "nodeType": "EmitStatement", - "src": "5690:52:4" + "src": "5756:52:6" } ] }, "documentation": "@notice Commits vote using hash of choice and secret salt to conceal vote until reveal\n@param _pollID Integer identifier associated with target poll\n@param _secretHash Commit keccak256 hash of voter's choice and salt (tightly packed in this order)\n@param _numTokens The number of tokens to be committed towards the target poll\n@param _prevPollID The ID of the poll that the user has voted the maximum number of tokens in which is still less than or equal to numTokens", - "id": 824, + "id": 956, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -19891,16 +20524,16 @@ "name": "commitVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 697, + "id": 829, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 690, + "id": 822, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4559:12:4", + "scope": 956, + "src": "4625:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19908,10 +20541,10 @@ "typeString": "uint256" }, "typeName": { - "id": 689, + "id": 821, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4559:4:4", + "src": "4625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19922,11 +20555,11 @@ }, { "constant": false, - "id": 692, + "id": 824, "name": "_secretHash", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4577:19:4", + "scope": 956, + "src": "4643:19:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19934,10 +20567,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 691, + "id": 823, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4577:7:4", + "src": "4643:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19948,11 +20581,11 @@ }, { "constant": false, - "id": 694, + "id": 826, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4602:15:4", + "scope": 956, + "src": "4668:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19960,10 +20593,10 @@ "typeString": "uint256" }, "typeName": { - "id": 693, + "id": 825, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4602:4:4", + "src": "4668:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19974,11 +20607,11 @@ }, { "constant": false, - "id": 696, + "id": 828, "name": "_prevPollID", "nodeType": "VariableDeclaration", - "scope": 824, - "src": "4623:16:4", + "scope": 956, + "src": "4689:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19986,10 +20619,10 @@ "typeString": "uint256" }, "typeName": { - "id": 695, + "id": 827, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4623:4:4", + "src": "4689:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19999,39 +20632,39 @@ "visibility": "internal" } ], - "src": "4553:90:4" + "src": "4619:90:6" }, "payable": false, "returnParameters": { - "id": 698, + "id": 830, "nodeType": "ParameterList", "parameters": [], - "src": "4655:0:4" + "src": "4721:0:6" }, - "scope": 1471, - "src": "4534:1213:4", + "scope": 1618, + "src": "4600:1213:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 865, + "id": 997, "nodeType": "Block", - "src": "6374:260:4", + "src": "6440:260:6", "statements": [ { "assignments": [ - 838 + 970 ], "declarations": [ { "constant": false, - "id": 838, + "id": 970, "name": "prevValid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6380:14:4", + "scope": 998, + "src": "6446:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20039,10 +20672,10 @@ "typeString": "bool" }, "typeName": { - "id": 837, + "id": 969, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6380:4:4", + "src": "6446:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20052,7 +20685,7 @@ "visibility": "internal" } ], - "id": 846, + "id": 978, "initialValue": { "argumentTypes": null, "components": [ @@ -20062,19 +20695,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 844, + "id": 976, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 839, + "id": 971, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 832, - "src": "6398:10:4", + "referencedDeclaration": 964, + "src": "6464:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20087,12 +20720,12 @@ "arguments": [ { "argumentTypes": null, - "id": 841, + "id": 973, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 830, - "src": "6425:6:4", + "referencedDeclaration": 962, + "src": "6491:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20100,12 +20733,12 @@ }, { "argumentTypes": null, - "id": 842, + "id": 974, "name": "_prevID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 826, - "src": "6433:7:4", + "referencedDeclaration": 958, + "src": "6499:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20123,18 +20756,18 @@ "typeString": "uint256" } ], - "id": 840, + "id": 972, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "6412:12:4", + "referencedDeclaration": 1486, + "src": "6478:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 843, + "id": 975, "isConstant": false, "isLValue": false, "isPure": false, @@ -20142,47 +20775,47 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6412:29:4", + "src": "6478:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6398:43:4", + "src": "6464:43:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 845, + "id": 977, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "6397:45:4", + "src": "6463:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "6380:62:4" + "src": "6446:62:6" }, { "assignments": [ - 848 + 980 ], "declarations": [ { "constant": false, - "id": 848, + "id": 980, "name": "nextValid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6516:14:4", + "scope": 998, + "src": "6582:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20190,10 +20823,10 @@ "typeString": "bool" }, "typeName": { - "id": 847, + "id": 979, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6516:4:4", + "src": "6582:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20203,7 +20836,7 @@ "visibility": "internal" } ], - "id": 860, + "id": 992, "initialValue": { "argumentTypes": null, "components": [ @@ -20213,7 +20846,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 858, + "id": 990, "isConstant": false, "isLValue": false, "isPure": false, @@ -20224,19 +20857,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 854, + "id": 986, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 849, + "id": 981, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 832, - "src": "6534:10:4", + "referencedDeclaration": 964, + "src": "6600:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20249,12 +20882,12 @@ "arguments": [ { "argumentTypes": null, - "id": 851, + "id": 983, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 830, - "src": "6561:6:4", + "referencedDeclaration": 962, + "src": "6627:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20262,12 +20895,12 @@ }, { "argumentTypes": null, - "id": 852, + "id": 984, "name": "_nextID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 828, - "src": "6569:7:4", + "referencedDeclaration": 960, + "src": "6635:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20285,18 +20918,18 @@ "typeString": "uint256" } ], - "id": 850, + "id": 982, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "6548:12:4", + "referencedDeclaration": 1486, + "src": "6614:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 853, + "id": 985, "isConstant": false, "isLValue": false, "isPure": false, @@ -20304,13 +20937,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6548:29:4", + "src": "6614:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6534:43:4", + "src": "6600:43:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20324,19 +20957,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 857, + "id": 989, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 855, + "id": 987, "name": "_nextID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 828, - "src": "6581:7:4", + "referencedDeclaration": 960, + "src": "6647:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20347,14 +20980,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 856, + "id": 988, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6592:1:4", + "src": "6658:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -20362,34 +20995,34 @@ }, "value": "0" }, - "src": "6581:12:4", + "src": "6647:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6534:59:4", + "src": "6600:59:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 859, + "id": 991, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "6533:61:4", + "src": "6599:61:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "6516:78:4" + "src": "6582:78:6" }, { "expression": { @@ -20398,19 +21031,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 863, + "id": 995, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 861, + "id": 993, "name": "prevValid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 838, - "src": "6607:9:4", + "referencedDeclaration": 970, + "src": "6673:9:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20420,32 +21053,32 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 862, + "id": 994, "name": "nextValid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 848, - "src": "6620:9:4", + "referencedDeclaration": 980, + "src": "6686:9:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6607:22:4", + "src": "6673:22:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 836, - "id": 864, + "functionReturnParameters": 968, + "id": 996, "nodeType": "Return", - "src": "6600:29:4" + "src": "6666:29:6" } ] }, "documentation": "@dev Compares previous and next poll's committed tokens for sorting purposes\n@param _prevID Integer identifier associated with previous poll in sorted order\n@param _nextID Integer identifier associated with next poll in sorted order\n@param _voter Address of user to check DLL position for\n@param _numTokens The number of tokens to be committed towards the poll (used for sorting)\n@return valid Boolean indication of if the specified position maintains the sort", - "id": 866, + "id": 998, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -20453,16 +21086,16 @@ "name": "validPosition", "nodeType": "FunctionDefinition", "parameters": { - "id": 833, + "id": 965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 826, + "id": 958, "name": "_prevID", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6263:12:4", + "scope": 998, + "src": "6329:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20470,10 +21103,10 @@ "typeString": "uint256" }, "typeName": { - "id": 825, + "id": 957, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6263:4:4", + "src": "6329:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20484,11 +21117,11 @@ }, { "constant": false, - "id": 828, + "id": 960, "name": "_nextID", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6281:12:4", + "scope": 998, + "src": "6347:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20496,10 +21129,10 @@ "typeString": "uint256" }, "typeName": { - "id": 827, + "id": 959, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6281:4:4", + "src": "6347:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20510,11 +21143,11 @@ }, { "constant": false, - "id": 830, + "id": 962, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6299:14:4", + "scope": 998, + "src": "6365:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20522,10 +21155,10 @@ "typeString": "address" }, "typeName": { - "id": 829, + "id": 961, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6299:7:4", + "src": "6365:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20536,11 +21169,11 @@ }, { "constant": false, - "id": 832, + "id": 964, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6319:15:4", + "scope": 998, + "src": "6385:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20548,10 +21181,10 @@ "typeString": "uint256" }, "typeName": { - "id": 831, + "id": 963, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6319:4:4", + "src": "6385:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20561,20 +21194,20 @@ "visibility": "internal" } ], - "src": "6257:81:4" + "src": "6323:81:6" }, "payable": false, "returnParameters": { - "id": 836, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 835, + "id": 967, "name": "valid", "nodeType": "VariableDeclaration", - "scope": 866, - "src": "6360:10:4", + "scope": 998, + "src": "6426:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20582,10 +21215,10 @@ "typeString": "bool" }, "typeName": { - "id": 834, + "id": 966, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6360:4:4", + "src": "6426:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20595,19 +21228,19 @@ "visibility": "internal" } ], - "src": "6359:12:4" + "src": "6425:12:6" }, - "scope": 1471, - "src": "6235:399:4", + "scope": 1618, + "src": "6301:399:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 980, + "id": 1124, "nodeType": "Block", - "src": "7055:1062:4", + "src": "7121:1126:6", "statements": [ { "expression": { @@ -20618,12 +21251,12 @@ "arguments": [ { "argumentTypes": null, - "id": 877, + "id": 1009, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7133:7:4", + "referencedDeclaration": 1000, + "src": "7199:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20637,18 +21270,18 @@ "typeString": "uint256" } ], - "id": 876, + "id": 1008, "name": "revealPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1236, - "src": "7114:18:4", + "referencedDeclaration": 1383, + "src": "7180:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 878, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -20656,7 +21289,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7114:27:4", + "src": "7180:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20670,21 +21303,21 @@ "typeString": "bool" } ], - "id": 875, + "id": 1007, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7106:7:4", + "referencedDeclaration": 4156, + "src": "7172:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 879, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": false, @@ -20692,15 +21325,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7106:36:4", + "src": "7172:36:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 880, + "id": 1012, "nodeType": "ExpressionStatement", - "src": "7106:36:4" + "src": "7172:36:6" }, { "expression": { @@ -20714,26 +21347,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 882, + "id": 1014, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7156:7:4", + "referencedDeclaration": 655, + "src": "7222:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 884, + "id": 1016, "indexExpression": { "argumentTypes": null, - "id": 883, + "id": 1015, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7164:7:4", + "referencedDeclaration": 1000, + "src": "7230:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20744,43 +21377,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7156:16:4", + "src": "7222:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 885, + "id": 1017, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "7156:26:4", + "referencedDeclaration": 641, + "src": "7222:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 888, + "id": 1020, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 886, + "id": 1018, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7183:3:4", + "referencedDeclaration": 4153, + "src": "7249:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 887, + "id": 1019, "isConstant": false, "isLValue": false, "isPure": false, @@ -20788,7 +21421,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7183:10:4", + "src": "7249:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20799,7 +21432,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7156:38:4", + "src": "7222:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20813,21 +21446,21 @@ "typeString": "bool" } ], - "id": 881, + "id": 1013, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7148:7:4", + "referencedDeclaration": 4156, + "src": "7214:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 889, + "id": 1021, "isConstant": false, "isLValue": false, "isPure": false, @@ -20835,15 +21468,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7148:47:4", + "src": "7214:47:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 890, + "id": 1022, "nodeType": "ExpressionStatement", - "src": "7148:47:4" + "src": "7214:47:6" }, { "expression": { @@ -20851,7 +21484,7 @@ "arguments": [ { "argumentTypes": null, - "id": 899, + "id": 1031, "isConstant": false, "isLValue": false, "isPure": false, @@ -20859,7 +21492,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "7286:39:4", + "src": "7352:39:6", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -20868,26 +21501,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 892, + "id": 1024, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7287:7:4", + "referencedDeclaration": 655, + "src": "7353:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 894, + "id": 1026, "indexExpression": { "argumentTypes": null, - "id": 893, + "id": 1025, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7295:7:4", + "referencedDeclaration": 1000, + "src": "7361:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20898,43 +21531,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7287:16:4", + "src": "7353:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 895, + "id": 1027, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "7287:26:4", + "referencedDeclaration": 645, + "src": "7353:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 898, + "id": 1030, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 896, + "id": 1028, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7314:3:4", + "referencedDeclaration": 4153, + "src": "7380:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 897, + "id": 1029, "isConstant": false, "isLValue": false, "isPure": false, @@ -20942,7 +21575,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7314:10:4", + "src": "7380:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20953,7 +21586,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7287:38:4", + "src": "7353:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20972,21 +21605,21 @@ "typeString": "bool" } ], - "id": 891, + "id": 1023, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7278:7:4", + "referencedDeclaration": 4156, + "src": "7344:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 900, + "id": 1032, "isConstant": false, "isLValue": false, "isPure": false, @@ -20994,15 +21627,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7278:48:4", + "src": "7344:48:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 901, + "id": 1033, "nodeType": "ExpressionStatement", - "src": "7278:48:4" + "src": "7344:48:6" }, { "expression": { @@ -21014,7 +21647,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 915, + "id": 1047, "isConstant": false, "isLValue": false, "isPure": false, @@ -21027,12 +21660,12 @@ "arguments": [ { "argumentTypes": null, - "id": 906, + "id": 1038, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "7436:11:4", + "referencedDeclaration": 1002, + "src": "7502:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21040,12 +21673,12 @@ }, { "argumentTypes": null, - "id": 907, + "id": 1039, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 872, - "src": "7449:5:4", + "referencedDeclaration": 1004, + "src": "7515:5:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21065,18 +21698,18 @@ ], "expression": { "argumentTypes": null, - "id": 904, + "id": 1036, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "7419:3:4", + "referencedDeclaration": 4140, + "src": "7485:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 905, + "id": 1037, "isConstant": false, "isLValue": false, "isPure": true, @@ -21084,13 +21717,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7419:16:4", + "src": "7485:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 908, + "id": 1040, "isConstant": false, "isLValue": false, "isPure": false, @@ -21098,7 +21731,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7419:36:4", + "src": "7485:36:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -21112,18 +21745,18 @@ "typeString": "bytes memory" } ], - "id": 903, + "id": 1035, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "7409:9:4", + "referencedDeclaration": 4147, + "src": "7475:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 909, + "id": 1041, "isConstant": false, "isLValue": false, "isPure": false, @@ -21131,7 +21764,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7409:47:4", + "src": "7475:47:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21146,18 +21779,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 911, + "id": 1043, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7474:3:4", + "referencedDeclaration": 4153, + "src": "7540:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 912, + "id": 1044, "isConstant": false, "isLValue": false, "isPure": false, @@ -21165,7 +21798,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7474:10:4", + "src": "7540:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21173,12 +21806,12 @@ }, { "argumentTypes": null, - "id": 913, + "id": 1045, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7486:7:4", + "referencedDeclaration": 1000, + "src": "7552:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21196,18 +21829,18 @@ "typeString": "uint256" } ], - "id": 910, + "id": 1042, "name": "getCommitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1320, - "src": "7460:13:4", + "referencedDeclaration": 1467, + "src": "7526:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) view returns (bytes32)" } }, - "id": 914, + "id": 1046, "isConstant": false, "isLValue": false, "isPure": false, @@ -21215,13 +21848,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7460:34:4", + "src": "7526:34:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "7409:85:4", + "src": "7475:85:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21235,21 +21868,21 @@ "typeString": "bool" } ], - "id": 902, + "id": 1034, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7401:7:4", + "referencedDeclaration": 4156, + "src": "7467:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 916, + "id": 1048, "isConstant": false, "isLValue": false, "isPure": false, @@ -21257,28 +21890,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7401:94:4", + "src": "7467:94:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 917, + "id": 1049, "nodeType": "ExpressionStatement", - "src": "7401:94:4" + "src": "7467:94:6" }, { "assignments": [ - 919 + 1051 ], "declarations": [ { "constant": false, - "id": 919, + "id": 1051, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7563:14:4", + "scope": 1125, + "src": "7629:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21286,10 +21919,10 @@ "typeString": "uint256" }, "typeName": { - "id": 918, + "id": 1050, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7563:4:4", + "src": "7629:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21299,7 +21932,7 @@ "visibility": "internal" } ], - "id": 925, + "id": 1057, "initialValue": { "argumentTypes": null, "arguments": [ @@ -21307,18 +21940,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 921, + "id": 1053, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7593:3:4", + "referencedDeclaration": 4153, + "src": "7659:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 922, + "id": 1054, "isConstant": false, "isLValue": false, "isPure": false, @@ -21326,7 +21959,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7593:10:4", + "src": "7659:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21334,12 +21967,12 @@ }, { "argumentTypes": null, - "id": 923, + "id": 1055, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7605:7:4", + "referencedDeclaration": 1000, + "src": "7671:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21357,18 +21990,18 @@ "typeString": "uint256" } ], - "id": 920, + "id": 1052, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "7580:12:4", + "referencedDeclaration": 1486, + "src": "7646:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 924, + "id": 1056, "isConstant": false, "isLValue": false, "isPure": false, @@ -21376,14 +22009,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7580:33:4", + "src": "7646:33:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7563:50:4" + "src": "7629:50:6" }, { "condition": { @@ -21392,19 +22025,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 928, + "id": 1060, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 926, + "id": 1058, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "7624:11:4", + "referencedDeclaration": 1002, + "src": "7690:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21415,14 +22048,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 927, + "id": 1059, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7639:1:4", + "src": "7705:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -21430,21 +22063,21 @@ }, "value": "1" }, - "src": "7624:16:4", + "src": "7690:16:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 944, + "id": 1088, "nodeType": "Block", - "src": "7746:57:4", + "src": "7842:91:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 942, + "id": 1086, "isConstant": false, "isLValue": false, "isPure": false, @@ -21455,26 +22088,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 937, + "id": 1075, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7754:7:4", + "referencedDeclaration": 655, + "src": "7850:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 939, + "id": 1077, "indexExpression": { "argumentTypes": null, - "id": 938, + "id": 1076, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7762:7:4", + "referencedDeclaration": 1000, + "src": "7858:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21485,65 +22118,160 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7754:16:4", + "src": "7850:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 940, + "id": 1078, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "7754:29:4", + "referencedDeclaration": 637, + "src": "7850:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 941, - "name": "numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7787:9:4", + "arguments": [ + { + "argumentTypes": null, + "id": 1084, + "name": "numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1051, + "src": "7916:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 1079, + "name": "pollMap", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 655, + "src": "7882:7:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", + "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" + } + }, + "id": 1081, + "indexExpression": { + "argumentTypes": null, + "id": 1080, + "name": "_pollID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1000, + "src": "7890:7:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "7882:16:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_storage", + "typeString": "struct PLCRVoting.Poll storage ref" + } + }, + "id": 1082, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesAgainst", + "nodeType": "MemberAccess", + "referencedDeclaration": 637, + "src": "7882:29:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1083, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "7882:33:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 1085, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7882:44:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7754:42:4", + "src": "7850:76:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 943, + "id": 1087, "nodeType": "ExpressionStatement", - "src": "7754:42:4" + "src": "7850:76:6" } ] }, - "id": 945, + "id": 1089, "nodeType": "IfStatement", - "src": "7620:183:4", + "src": "7686:247:6", "trueBody": { - "id": 936, + "id": 1074, "nodeType": "Block", - "src": "7642:98:4", + "src": "7708:128:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 934, + "id": 1072, "isConstant": false, "isLValue": false, "isPure": false, @@ -21554,26 +22282,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 929, + "id": 1061, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7695:7:4", + "referencedDeclaration": 655, + "src": "7761:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 931, + "id": 1063, "indexExpression": { "argumentTypes": null, - "id": 930, + "id": 1062, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7703:7:4", + "referencedDeclaration": 1000, + "src": "7769:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21584,50 +22312,145 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7695:16:4", + "src": "7761:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 932, + "id": 1064, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "7695:25:4", + "referencedDeclaration": 635, + "src": "7761:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 933, - "name": "numTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7724:9:4", + "arguments": [ + { + "argumentTypes": null, + "id": 1070, + "name": "numTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1051, + "src": "7819:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 1065, + "name": "pollMap", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 655, + "src": "7789:7:6", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", + "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" + } + }, + "id": 1067, + "indexExpression": { + "argumentTypes": null, + "id": 1066, + "name": "_pollID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1000, + "src": "7797:7:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "7789:16:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_storage", + "typeString": "struct PLCRVoting.Poll storage ref" + } + }, + "id": 1068, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesFor", + "nodeType": "MemberAccess", + "referencedDeclaration": 635, + "src": "7789:25:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1069, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "7789:29:6", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 1071, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7789:40:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7695:38:4", + "src": "7761:68:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 935, + "id": 1073, "nodeType": "ExpressionStatement", - "src": "7695:38:4" + "src": "7761:68:6" } ] } @@ -21638,12 +22461,12 @@ "arguments": [ { "argumentTypes": null, - "id": 951, + "id": 1095, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7835:7:4", + "referencedDeclaration": 1000, + "src": "7965:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21661,34 +22484,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 946, + "id": 1090, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "7809:6:4", + "referencedDeclaration": 663, + "src": "7939:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 949, + "id": 1093, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 947, + "id": 1091, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7816:3:4", + "referencedDeclaration": 4153, + "src": "7946:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 948, + "id": 1092, "isConstant": false, "isLValue": false, "isPure": false, @@ -21696,7 +22519,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7816:10:4", + "src": "7946:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21707,27 +22530,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7809:18:4", + "src": "7939:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 950, + "id": 1094, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "remove", "nodeType": "MemberAccess", - "referencedDeclaration": 364, - "src": "7809:25:4", + "referencedDeclaration": 484, + "src": "7939:25:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_nonpayable$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$__$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256)" } }, - "id": 952, + "id": 1096, "isConstant": false, "isLValue": false, "isPure": false, @@ -21735,20 +22558,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7809:34:4", + "src": "7939:34:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 953, + "id": 1097, "nodeType": "ExpressionStatement", - "src": "7809:34:4" + "src": "7939:34:6" }, { "expression": { "argumentTypes": null, - "id": 962, + "id": 1106, "isConstant": false, "isLValue": false, "isPure": false, @@ -21761,26 +22584,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 954, + "id": 1098, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "7903:7:4", + "referencedDeclaration": 655, + "src": "8033:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 956, + "id": 1100, "indexExpression": { "argumentTypes": null, - "id": 955, + "id": 1099, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7911:7:4", + "referencedDeclaration": 1000, + "src": "8041:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21791,43 +22614,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7903:16:4", + "src": "8033:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 957, + "id": 1101, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "7903:26:4", + "referencedDeclaration": 645, + "src": "8033:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 960, + "id": 1104, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 958, + "id": 1102, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7930:3:4", + "referencedDeclaration": 4153, + "src": "8060:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 959, + "id": 1103, "isConstant": false, "isLValue": false, "isPure": false, @@ -21835,7 +22658,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7930:10:4", + "src": "8060:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21846,7 +22669,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7903:38:4", + "src": "8033:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21857,14 +22680,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 961, + "id": 1105, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "7944:4:4", + "src": "8074:4:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21872,15 +22695,15 @@ }, "value": "true" }, - "src": "7903:45:4", + "src": "8033:45:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 963, + "id": 1107, "nodeType": "ExpressionStatement", - "src": "7903:45:4" + "src": "8033:45:6" }, { "eventCall": { @@ -21888,12 +22711,12 @@ "arguments": [ { "argumentTypes": null, - "id": 965, + "id": 1109, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "7981:7:4", + "referencedDeclaration": 1000, + "src": "8111:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21901,12 +22724,12 @@ }, { "argumentTypes": null, - "id": 966, + "id": 1110, "name": "numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 919, - "src": "7996:9:4", + "referencedDeclaration": 1051, + "src": "8126:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21918,26 +22741,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 967, + "id": 1111, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8013:7:4", + "referencedDeclaration": 655, + "src": "8143:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 969, + "id": 1113, "indexExpression": { "argumentTypes": null, - "id": 968, + "id": 1112, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "8021:7:4", + "referencedDeclaration": 1000, + "src": "8151:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21948,21 +22771,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8013:16:4", + "src": "8143:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 970, + "id": 1114, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "8013:25:4", + "referencedDeclaration": 635, + "src": "8143:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21974,26 +22797,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 971, + "id": 1115, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8046:7:4", + "referencedDeclaration": 655, + "src": "8176:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 973, + "id": 1117, "indexExpression": { "argumentTypes": null, - "id": 972, + "id": 1116, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 868, - "src": "8054:7:4", + "referencedDeclaration": 1000, + "src": "8184:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22004,21 +22827,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8046:16:4", + "src": "8176:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 974, + "id": 1118, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "8046:29:4", + "referencedDeclaration": 637, + "src": "8176:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22026,12 +22849,12 @@ }, { "argumentTypes": null, - "id": 975, + "id": 1119, "name": "_voteOption", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 870, - "src": "8083:11:4", + "referencedDeclaration": 1002, + "src": "8213:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22041,18 +22864,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 976, + "id": 1120, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8096:3:4", + "referencedDeclaration": 4153, + "src": "8226:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 977, + "id": 1121, "isConstant": false, "isLValue": false, "isPure": false, @@ -22060,7 +22883,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8096:10:4", + "src": "8226:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22094,18 +22917,18 @@ "typeString": "address" } ], - "id": 964, + "id": 1108, "name": "_VoteRevealed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 468, - "src": "7960:13:4", + "referencedDeclaration": 588, + "src": "8090:13:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,uint256,uint256,uint256,address)" } }, - "id": 978, + "id": 1122, "isConstant": false, "isLValue": false, "isPure": false, @@ -22113,20 +22936,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7960:152:4", + "src": "8090:152:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 979, + "id": 1123, "nodeType": "EmitStatement", - "src": "7955:157:4" + "src": "8085:157:6" } ] }, "documentation": "@notice Reveals vote with choice and secret salt used in generating commitHash to attribute committed tokens\n@param _pollID Integer identifier associated with target poll\n@param _voteOption Vote choice used to generate commitHash for associated poll\n@param _salt Secret number used to generate commitHash for associated poll", - "id": 981, + "id": 1125, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -22134,16 +22957,16 @@ "name": "revealVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 873, + "id": 1005, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 868, + "id": 1000, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7002:12:4", + "scope": 1125, + "src": "7068:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22151,10 +22974,10 @@ "typeString": "uint256" }, "typeName": { - "id": 867, + "id": 999, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7002:4:4", + "src": "7068:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22165,11 +22988,11 @@ }, { "constant": false, - "id": 870, + "id": 1002, "name": "_voteOption", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7016:16:4", + "scope": 1125, + "src": "7082:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22177,10 +23000,10 @@ "typeString": "uint256" }, "typeName": { - "id": 869, + "id": 1001, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7016:4:4", + "src": "7082:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22191,11 +23014,11 @@ }, { "constant": false, - "id": 872, + "id": 1004, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 981, - "src": "7034:10:4", + "scope": 1125, + "src": "7100:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22203,10 +23026,10 @@ "typeString": "uint256" }, "typeName": { - "id": 871, + "id": 1003, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7034:4:4", + "src": "7100:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22216,26 +23039,26 @@ "visibility": "internal" } ], - "src": "7001:44:4" + "src": "7067:44:6" }, "payable": false, "returnParameters": { - "id": 874, + "id": 1006, "nodeType": "ParameterList", "parameters": [], - "src": "7055:0:4" + "src": "7121:0:6" }, - "scope": 1471, - "src": "6982:1135:4", + "scope": 1618, + "src": "7048:1199:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1044, + "id": 1188, "nodeType": "Block", - "src": "8442:356:4", + "src": "8572:356:6", "statements": [ { "expression": { @@ -22246,12 +23069,12 @@ "arguments": [ { "argumentTypes": null, - "id": 994, + "id": 1138, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8466:7:4", + "referencedDeclaration": 1129, + "src": "8596:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22265,18 +23088,18 @@ "typeString": "uint256" } ], - "id": 993, + "id": 1137, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "8456:9:4", + "referencedDeclaration": 1334, + "src": "8586:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 995, + "id": 1139, "isConstant": false, "isLValue": false, "isPure": false, @@ -22284,7 +23107,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8456:18:4", + "src": "8586:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22298,21 +23121,21 @@ "typeString": "bool" } ], - "id": 992, + "id": 1136, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8448:7:4", + "referencedDeclaration": 4156, + "src": "8578:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 996, + "id": 1140, "isConstant": false, "isLValue": false, "isPure": false, @@ -22320,15 +23143,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8448:27:4", + "src": "8578:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 997, + "id": 1141, "nodeType": "ExpressionStatement", - "src": "8448:27:4" + "src": "8578:27:6" }, { "expression": { @@ -22342,26 +23165,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 999, + "id": 1143, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "8489:7:4", + "referencedDeclaration": 655, + "src": "8619:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1001, + "id": 1145, "indexExpression": { "argumentTypes": null, - "id": 1000, + "id": 1144, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8497:7:4", + "referencedDeclaration": 1129, + "src": "8627:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22372,35 +23195,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8489:16:4", + "src": "8619:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1002, + "id": 1146, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "8489:26:4", + "referencedDeclaration": 645, + "src": "8619:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1004, + "id": 1148, "indexExpression": { "argumentTypes": null, - "id": 1003, + "id": 1147, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8516:6:4", + "referencedDeclaration": 1127, + "src": "8646:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22411,7 +23234,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8489:34:4", + "src": "8619:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22425,21 +23248,21 @@ "typeString": "bool" } ], - "id": 998, + "id": 1142, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8481:7:4", + "referencedDeclaration": 4156, + "src": "8611:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1005, + "id": 1149, "isConstant": false, "isLValue": false, "isPure": false, @@ -22447,28 +23270,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8481:43:4", + "src": "8611:43:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1006, + "id": 1150, "nodeType": "ExpressionStatement", - "src": "8481:43:4" + "src": "8611:43:6" }, { "assignments": [ - 1008 + 1152 ], "declarations": [ { "constant": false, - "id": 1008, + "id": 1152, "name": "winningChoice", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8531:18:4", + "scope": 1189, + "src": "8661:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22476,10 +23299,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1007, + "id": 1151, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8531:4:4", + "src": "8661:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22489,7 +23312,7 @@ "visibility": "internal" } ], - "id": 1015, + "id": 1159, "initialValue": { "argumentTypes": null, "condition": { @@ -22497,12 +23320,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1010, + "id": 1154, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8561:7:4", + "referencedDeclaration": 1129, + "src": "8691:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22516,18 +23339,18 @@ "typeString": "uint256" } ], - "id": 1009, + "id": 1153, "name": "isPassed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1138, - "src": "8552:8:4", + "referencedDeclaration": 1285, + "src": "8682:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1011, + "id": 1155, "isConstant": false, "isLValue": false, "isPure": false, @@ -22535,7 +23358,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8552:17:4", + "src": "8682:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22544,14 +23367,14 @@ "falseExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1013, + "id": 1157, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8576:1:4", + "src": "8706:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -22559,24 +23382,24 @@ }, "value": "0" }, - "id": 1014, + "id": 1158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "8552:25:4", + "src": "8682:25:6", "trueExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1012, + "id": 1156, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8572:1:4", + "src": "8702:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -22590,20 +23413,20 @@ } }, "nodeType": "VariableDeclarationStatement", - "src": "8531:46:4" + "src": "8661:46:6" }, { "assignments": [ - 1017 + 1161 ], "declarations": [ { "constant": false, - "id": 1017, + "id": 1161, "name": "winnerHash", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8583:18:4", + "scope": 1189, + "src": "8713:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22611,10 +23434,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1016, + "id": 1160, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8583:7:4", + "src": "8713:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22624,7 +23447,7 @@ "visibility": "internal" } ], - "id": 1025, + "id": 1169, "initialValue": { "argumentTypes": null, "arguments": [ @@ -22633,12 +23456,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1021, + "id": 1165, "name": "winningChoice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1008, - "src": "8631:13:4", + "referencedDeclaration": 1152, + "src": "8761:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22646,12 +23469,12 @@ }, { "argumentTypes": null, - "id": 1022, + "id": 1166, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 987, - "src": "8646:5:4", + "referencedDeclaration": 1131, + "src": "8776:5:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22671,18 +23494,18 @@ ], "expression": { "argumentTypes": null, - "id": 1019, + "id": 1163, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "8614:3:4", + "referencedDeclaration": 4140, + "src": "8744:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1020, + "id": 1164, "isConstant": false, "isLValue": false, "isPure": true, @@ -22690,13 +23513,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8614:16:4", + "src": "8744:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1023, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": false, @@ -22704,7 +23527,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8614:38:4", + "src": "8744:38:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -22718,18 +23541,18 @@ "typeString": "bytes memory" } ], - "id": 1018, + "id": 1162, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "8604:9:4", + "referencedDeclaration": 4147, + "src": "8734:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1024, + "id": 1168, "isConstant": false, "isLValue": false, "isPure": false, @@ -22737,27 +23560,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8604:49:4", + "src": "8734:49:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "8583:70:4" + "src": "8713:70:6" }, { "assignments": [ - 1027 + 1171 ], "declarations": [ { "constant": false, - "id": 1027, + "id": 1171, "name": "commitHash", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8659:18:4", + "scope": 1189, + "src": "8789:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22765,10 +23588,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1026, + "id": 1170, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8659:7:4", + "src": "8789:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22778,18 +23601,18 @@ "visibility": "internal" } ], - "id": 1032, + "id": 1176, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1029, + "id": 1173, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8694:6:4", + "referencedDeclaration": 1127, + "src": "8824:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22797,12 +23620,12 @@ }, { "argumentTypes": null, - "id": 1030, + "id": 1174, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8702:7:4", + "referencedDeclaration": 1129, + "src": "8832:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22820,18 +23643,18 @@ "typeString": "uint256" } ], - "id": 1028, + "id": 1172, "name": "getCommitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1320, - "src": "8680:13:4", + "referencedDeclaration": 1467, + "src": "8810:13:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) view returns (bytes32)" } }, - "id": 1031, + "id": 1175, "isConstant": false, "isLValue": false, "isPure": false, @@ -22839,14 +23662,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8680:30:4", + "src": "8810:30:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "8659:51:4" + "src": "8789:51:6" }, { "expression": { @@ -22858,19 +23681,19 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1036, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1034, + "id": 1178, "name": "winnerHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1017, - "src": "8725:10:4", + "referencedDeclaration": 1161, + "src": "8855:10:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22880,18 +23703,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1035, + "id": 1179, "name": "commitHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1027, - "src": "8739:10:4", + "referencedDeclaration": 1171, + "src": "8869:10:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "8725:24:4", + "src": "8855:24:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22905,21 +23728,21 @@ "typeString": "bool" } ], - "id": 1033, + "id": 1177, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8717:7:4", + "referencedDeclaration": 4156, + "src": "8847:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1037, + "id": 1181, "isConstant": false, "isLValue": false, "isPure": false, @@ -22927,15 +23750,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8717:33:4", + "src": "8847:33:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1038, + "id": 1182, "nodeType": "ExpressionStatement", - "src": "8717:33:4" + "src": "8847:33:6" }, { "expression": { @@ -22943,12 +23766,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1040, + "id": 1184, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 983, - "src": "8777:6:4", + "referencedDeclaration": 1127, + "src": "8907:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22956,12 +23779,12 @@ }, { "argumentTypes": null, - "id": 1041, + "id": 1185, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 985, - "src": "8785:7:4", + "referencedDeclaration": 1129, + "src": "8915:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22979,18 +23802,18 @@ "typeString": "uint256" } ], - "id": 1039, + "id": 1183, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "8764:12:4", + "referencedDeclaration": 1486, + "src": "8894:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1042, + "id": 1186, "isConstant": false, "isLValue": false, "isPure": false, @@ -22998,21 +23821,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8764:29:4", + "src": "8894:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 991, - "id": 1043, + "functionReturnParameters": 1135, + "id": 1187, "nodeType": "Return", - "src": "8757:36:4" + "src": "8887:36:6" } ] }, "documentation": "@param _pollID Integer identifier associated with target poll\n@param _salt Arbitrarily chosen integer used to generate secretHash\n@return correctVotes Number of tokens voted for winning option", - "id": 1045, + "id": 1189, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -23020,16 +23843,16 @@ "name": "getNumPassingTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 988, + "id": 1132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 983, + "id": 1127, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8360:14:4", + "scope": 1189, + "src": "8490:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23037,10 +23860,10 @@ "typeString": "address" }, "typeName": { - "id": 982, + "id": 1126, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8360:7:4", + "src": "8490:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23051,11 +23874,11 @@ }, { "constant": false, - "id": 985, + "id": 1129, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8376:12:4", + "scope": 1189, + "src": "8506:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23063,10 +23886,10 @@ "typeString": "uint256" }, "typeName": { - "id": 984, + "id": 1128, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8376:4:4", + "src": "8506:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23077,11 +23900,11 @@ }, { "constant": false, - "id": 987, + "id": 1131, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8390:10:4", + "scope": 1189, + "src": "8520:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23089,10 +23912,10 @@ "typeString": "uint256" }, "typeName": { - "id": 986, + "id": 1130, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8390:4:4", + "src": "8520:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23102,20 +23925,20 @@ "visibility": "internal" } ], - "src": "8359:42:4" + "src": "8489:42:6" }, "payable": false, "returnParameters": { - "id": 991, + "id": 1135, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 990, + "id": 1134, "name": "correctVotes", "nodeType": "VariableDeclaration", - "scope": 1045, - "src": "8423:17:4", + "scope": 1189, + "src": "8553:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23123,10 +23946,10 @@ "typeString": "uint256" }, "typeName": { - "id": 989, + "id": 1133, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8423:4:4", + "src": "8553:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23136,36 +23959,36 @@ "visibility": "internal" } ], - "src": "8422:19:4" + "src": "8552:19:6" }, - "scope": 1471, - "src": "8331:467:4", + "scope": 1618, + "src": "8461:467:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1100, + "id": 1245, "nodeType": "Block", - "src": "9327:495:4", + "src": "9457:498:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1060, + "id": 1205, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1056, + "id": 1200, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9333:9:4", + "referencedDeclaration": 651, + "src": "9463:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23175,76 +23998,96 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1059, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 1057, - "name": "pollNonce", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9345:9:4", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "hexValue": "31", + "id": 1203, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "9489:1:6", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_1_by_1", + "typeString": "int_const 1" + }, + "value": "1" } - }, - "nodeType": "BinaryOperation", - "operator": "+", - "rightExpression": { - "argumentTypes": null, - "hexValue": "31", - "id": 1058, + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_1_by_1", + "typeString": "int_const 1" + } + ], + "expression": { + "argumentTypes": null, + "id": 1201, + "name": "pollNonce", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 651, + "src": "9475:9:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1202, "isConstant": false, "isLValue": false, - "isPure": true, - "kind": "number", + "isPure": false, "lValueRequested": false, - "nodeType": "Literal", - "src": "9357:1:4", - "subdenomination": null, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "9475:13:6", "typeDescriptions": { - "typeIdentifier": "t_rational_1_by_1", - "typeString": "int_const 1" - }, - "value": "1" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } }, - "src": "9345:13:4", + "id": 1204, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9475:16:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9333:25:4", + "src": "9463:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1061, + "id": 1206, "nodeType": "ExpressionStatement", - "src": "9333:25:4" + "src": "9463:28:6" }, { "assignments": [ - 1063 + 1208 ], "declarations": [ { "constant": false, - "id": 1063, + "id": 1208, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9365:18:4", + "scope": 1246, + "src": "9498:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23252,10 +24095,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1062, + "id": 1207, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9365:4:4", + "src": "9498:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23265,18 +24108,18 @@ "visibility": "internal" } ], - "id": 1069, + "id": 1214, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1067, + "id": 1212, "name": "_commitDuration", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1049, - "src": "9406:15:4", + "referencedDeclaration": 1193, + "src": "9539:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23294,18 +24137,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1064, + "id": 1209, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "9386:5:4", + "referencedDeclaration": 4143, + "src": "9519:5:6", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1065, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": false, @@ -23313,27 +24156,27 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9386:15:4", + "src": "9519:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1066, + "id": 1211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "9386:19:4", + "referencedDeclaration": 3890, + "src": "9519:19:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1068, + "id": 1213, "isConstant": false, "isLValue": false, "isPure": false, @@ -23341,27 +24184,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9386:36:4", + "src": "9519:36:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9365:57:4" + "src": "9498:57:6" }, { "assignments": [ - 1071 + 1216 ], "declarations": [ { "constant": false, - "id": 1071, + "id": 1216, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9428:18:4", + "scope": 1246, + "src": "9561:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23369,10 +24212,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1070, + "id": 1215, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9428:4:4", + "src": "9561:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23382,18 +24225,18 @@ "visibility": "internal" } ], - "id": 1076, + "id": 1221, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1074, + "id": 1219, "name": "_revealDuration", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1051, - "src": "9467:15:4", + "referencedDeclaration": 1195, + "src": "9600:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23409,32 +24252,32 @@ ], "expression": { "argumentTypes": null, - "id": 1072, + "id": 1217, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9449:13:4", + "referencedDeclaration": 1208, + "src": "9582:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1073, + "id": 1218, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "9449:17:4", + "referencedDeclaration": 3890, + "src": "9582:17:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1075, + "id": 1220, "isConstant": false, "isLValue": false, "isPure": false, @@ -23442,19 +24285,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9449:34:4", + "src": "9582:34:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9428:55:4" + "src": "9561:55:6" }, { "expression": { "argumentTypes": null, - "id": 1087, + "id": 1232, "isConstant": false, "isLValue": false, "isPure": false, @@ -23463,26 +24306,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1077, + "id": 1222, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "9490:7:4", + "referencedDeclaration": 655, + "src": "9623:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1079, + "id": 1224, "indexExpression": { "argumentTypes": null, - "id": 1078, + "id": 1223, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9498:9:4", + "referencedDeclaration": 651, + "src": "9631:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23493,9 +24336,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "9490:18:4", + "src": "9623:18:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, @@ -23506,12 +24349,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1081, + "id": 1226, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1047, - "src": "9536:11:4", + "referencedDeclaration": 1191, + "src": "9669:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23519,12 +24362,12 @@ }, { "argumentTypes": null, - "id": 1082, + "id": 1227, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9570:13:4", + "referencedDeclaration": 1208, + "src": "9703:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23532,12 +24375,12 @@ }, { "argumentTypes": null, - "id": 1083, + "id": 1228, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1071, - "src": "9606:13:4", + "referencedDeclaration": 1216, + "src": "9739:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23546,14 +24389,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1084, + "id": 1229, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "9637:1:4", + "src": "9770:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -23564,14 +24407,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1085, + "id": 1230, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "9660:1:4", + "src": "9793:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -23582,18 +24425,18 @@ ], "expression": { "argumentTypes": null, - "id": 1080, + "id": 1225, "name": "Poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 526, - "src": "9511:4:4", + "referencedDeclaration": 646, + "src": "9644:4:6", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Poll_$526_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Poll_$646_storage_ptr_$", "typeString": "type(struct PLCRVoting.Poll storage pointer)" } }, - "id": 1086, + "id": 1231, "isConstant": false, "isLValue": false, "isPure": false, @@ -23607,21 +24450,21 @@ "votesAgainst" ], "nodeType": "FunctionCall", - "src": "9511:157:4", + "src": "9644:157:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory", + "typeIdentifier": "t_struct$_Poll_$646_memory", "typeString": "struct PLCRVoting.Poll memory" } }, - "src": "9490:178:4", + "src": "9623:178:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1088, + "id": 1233, "nodeType": "ExpressionStatement", - "src": "9490:178:4" + "src": "9623:178:6" }, { "eventCall": { @@ -23629,12 +24472,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1090, + "id": 1235, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1047, - "src": "9700:11:4", + "referencedDeclaration": 1191, + "src": "9833:11:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23642,12 +24485,12 @@ }, { "argumentTypes": null, - "id": 1091, + "id": 1236, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1063, - "src": "9719:13:4", + "referencedDeclaration": 1208, + "src": "9852:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23655,12 +24498,12 @@ }, { "argumentTypes": null, - "id": 1092, + "id": 1237, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1071, - "src": "9740:13:4", + "referencedDeclaration": 1216, + "src": "9873:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23668,12 +24511,12 @@ }, { "argumentTypes": null, - "id": 1093, + "id": 1238, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9761:9:4", + "referencedDeclaration": 651, + "src": "9894:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23683,18 +24526,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1094, + "id": 1239, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9778:3:4", + "referencedDeclaration": 4153, + "src": "9911:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1095, + "id": 1240, "isConstant": false, "isLValue": false, "isPure": false, @@ -23702,7 +24545,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9778:10:4", + "src": "9911:10:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23732,18 +24575,18 @@ "typeString": "address" } ], - "id": 1089, + "id": 1234, "name": "_PollCreated", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 480, - "src": "9680:12:4", + "referencedDeclaration": 600, + "src": "9813:12:6", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,uint256,uint256,address)" } }, - "id": 1096, + "id": 1241, "isConstant": false, "isLValue": false, "isPure": false, @@ -23751,39 +24594,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9680:114:4", + "src": "9813:114:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1097, + "id": 1242, "nodeType": "EmitStatement", - "src": "9675:119:4" + "src": "9808:119:6" }, { "expression": { "argumentTypes": null, - "id": 1098, + "id": 1243, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "9808:9:4", + "referencedDeclaration": 651, + "src": "9941:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1055, - "id": 1099, + "functionReturnParameters": 1199, + "id": 1244, "nodeType": "Return", - "src": "9801:16:4" + "src": "9934:16:6" } ] }, "documentation": "@dev Initiates a poll with canonical configured parameters at pollID emitted by PollCreated event\n@param _voteQuorum Type of majority (out of 100) that is necessary for poll to be successful\n@param _commitDuration Length of desired commit period in seconds\n@param _revealDuration Length of desired reveal period in seconds", - "id": 1101, + "id": 1246, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -23791,16 +24634,16 @@ "name": "startPoll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1052, + "id": 1196, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1047, + "id": 1191, "name": "_voteQuorum", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9236:16:4", + "scope": 1246, + "src": "9366:16:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23808,10 +24651,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1046, + "id": 1190, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9236:4:4", + "src": "9366:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23822,11 +24665,11 @@ }, { "constant": false, - "id": 1049, + "id": 1193, "name": "_commitDuration", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9254:20:4", + "scope": 1246, + "src": "9384:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23834,10 +24677,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1048, + "id": 1192, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9254:4:4", + "src": "9384:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23848,11 +24691,11 @@ }, { "constant": false, - "id": 1051, + "id": 1195, "name": "_revealDuration", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9276:20:4", + "scope": 1246, + "src": "9406:20:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23860,10 +24703,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1050, + "id": 1194, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9276:4:4", + "src": "9406:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23873,20 +24716,20 @@ "visibility": "internal" } ], - "src": "9235:62:4" + "src": "9365:62:6" }, "payable": false, "returnParameters": { - "id": 1055, + "id": 1199, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1054, + "id": 1198, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1101, - "src": "9314:11:4", + "scope": 1246, + "src": "9444:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23894,10 +24737,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1053, + "id": 1197, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9314:4:4", + "src": "9444:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23907,19 +24750,19 @@ "visibility": "internal" } ], - "src": "9313:13:4" + "src": "9443:13:6" }, - "scope": 1471, - "src": "9217:605:4", + "scope": 1618, + "src": "9347:608:6", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1137, + "id": 1284, "nodeType": "Block", - "src": "10095:172:4", + "src": "10228:179:6", "statements": [ { "expression": { @@ -23930,12 +24773,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1110, + "id": 1255, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1103, - "src": "10119:7:4", + "referencedDeclaration": 1248, + "src": "10252:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23949,18 +24792,18 @@ "typeString": "uint256" } ], - "id": 1109, + "id": 1254, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "10109:9:4", + "referencedDeclaration": 1334, + "src": "10242:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1111, + "id": 1256, "isConstant": false, "isLValue": false, "isPure": false, @@ -23968,7 +24811,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10109:18:4", + "src": "10242:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23982,21 +24825,21 @@ "typeString": "bool" } ], - "id": 1108, + "id": 1253, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10101:7:4", + "referencedDeclaration": 4156, + "src": "10234:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1112, + "id": 1257, "isConstant": false, "isLValue": false, "isPure": false, @@ -24004,43 +24847,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10101:27:4", + "src": "10234:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1113, + "id": 1258, "nodeType": "ExpressionStatement", - "src": "10101:27:4" + "src": "10234:27:6" }, { "assignments": [ - 1115 + 1260 ], "declarations": [ { "constant": false, - "id": 1115, + "id": 1260, "name": "poll", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10135:16:4", + "scope": 1285, + "src": "10268:16:6", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll" }, "typeName": { "contractScope": null, - "id": 1114, + "id": 1259, "name": "Poll", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 526, - "src": "10135:4:4", + "referencedDeclaration": 646, + "src": "10268:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage_ptr", + "typeIdentifier": "t_struct$_Poll_$646_storage_ptr", "typeString": "struct PLCRVoting.Poll" } }, @@ -24048,31 +24891,31 @@ "visibility": "internal" } ], - "id": 1119, + "id": 1264, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1116, + "id": 1261, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10154:7:4", + "referencedDeclaration": 655, + "src": "10287:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1118, + "id": 1263, "indexExpression": { "argumentTypes": null, - "id": 1117, + "id": 1262, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1103, - "src": "10162:7:4", + "referencedDeclaration": 1248, + "src": "10295:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24083,14 +24926,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10154:16:4", + "src": "10287:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "10135:35:4" + "src": "10268:35:6" }, { "expression": { @@ -24099,7 +24942,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1135, + "id": 1282, "isConstant": false, "isLValue": false, "isPure": false, @@ -24109,79 +24952,99 @@ "components": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1123, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 1120, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "10184:3:4", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 1268, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "10335:3:6", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], "expression": { "argumentTypes": null, - "id": 1121, - "name": "poll", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10190:4:4", + "expression": { + "argumentTypes": null, + "id": 1265, + "name": "poll", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1260, + "src": "10317:4:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", + "typeString": "struct PLCRVoting.Poll memory" + } + }, + "id": 1266, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "votesFor", + "nodeType": "MemberAccess", + "referencedDeclaration": 635, + "src": "10317:13:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", - "typeString": "struct PLCRVoting.Poll memory" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 1122, + "id": 1267, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "votesFor", + "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10190:13:4", + "referencedDeclaration": 3832, + "src": "10317:17:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10184:19:4", + "id": 1269, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10317:22:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1124, + "id": 1270, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "10183:21:4", + "src": "10316:24:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24194,175 +25057,198 @@ "components": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1133, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "id": 1125, - "name": "poll", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10208:4:4", - "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", - "typeString": "struct PLCRVoting.Poll memory" - } - }, - "id": 1126, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "voteQuorum", - "nodeType": "MemberAccess", - "referencedDeclaration": 513, - "src": "10208:15:4", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 1131, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "arguments": [ + { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1127, + "id": 1277, "name": "poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10227:4:4", + "referencedDeclaration": 1260, + "src": "10382:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll memory" } }, - "id": 1128, + "id": 1278, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "votesFor", + "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10227:13:4", + "referencedDeclaration": 637, + "src": "10382:17:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "+", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1129, + "id": 1274, "name": "poll", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1115, - "src": "10243:4:4", + "referencedDeclaration": 1260, + "src": "10364:4:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_memory_ptr", + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", "typeString": "struct PLCRVoting.Poll memory" } }, - "id": 1130, + "id": 1275, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "votesAgainst", + "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "10243:17:4", + "referencedDeclaration": 635, + "src": "10364:13:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10227:33:4", + "id": 1276, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "10364:17:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 1279, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10364:36:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], - "id": 1132, + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 1271, + "name": "poll", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1260, + "src": "10344:4:6", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Poll_$646_memory_ptr", + "typeString": "struct PLCRVoting.Poll memory" + } + }, + "id": 1272, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "voteQuorum", + "nodeType": "MemberAccess", + "referencedDeclaration": 633, + "src": "10344:15:6", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 1273, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "10226:35:4", + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "10344:19:6", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10208:53:4", + "id": 1280, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10344:57:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1134, + "id": 1281, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "10207:55:4", + "src": "10343:59:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10183:79:4", + "src": "10316:86:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1107, - "id": 1136, + "functionReturnParameters": 1252, + "id": 1283, "nodeType": "Return", - "src": "10176:86:4" + "src": "10309:93:6" } ] }, "documentation": "@notice Determines if proposal has passed\n@dev Check if votesFor out of totalVotes exceeds votesQuorum (requires pollEnded)\n@param _pollID Integer identifier associated with target poll", - "id": 1138, + "id": 1285, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -24370,16 +25256,16 @@ "name": "isPassed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1104, + "id": 1249, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1103, + "id": 1248, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10047:12:4", + "scope": 1285, + "src": "10180:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24387,10 +25273,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1102, + "id": 1247, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10047:4:4", + "src": "10180:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24400,20 +25286,20 @@ "visibility": "internal" } ], - "src": "10046:14:4" + "src": "10179:14:6" }, "payable": false, "returnParameters": { - "id": 1107, + "id": 1252, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1106, + "id": 1251, "name": "passed", "nodeType": "VariableDeclaration", - "scope": 1138, - "src": "10082:11:4", + "scope": 1285, + "src": "10215:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24421,10 +25307,10 @@ "typeString": "bool" }, "typeName": { - "id": 1105, + "id": 1250, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "10082:4:4", + "src": "10215:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24434,19 +25320,19 @@ "visibility": "internal" } ], - "src": "10081:13:4" + "src": "10214:13:6" }, - "scope": 1471, - "src": "10029:238:4", + "scope": 1618, + "src": "10162:245:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1165, + "id": 1312, "nodeType": "Block", - "src": "10664:159:4", + "src": "10804:159:6", "statements": [ { "expression": { @@ -24457,12 +25343,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1147, + "id": 1294, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10688:7:4", + "referencedDeclaration": 1287, + "src": "10828:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24476,18 +25362,18 @@ "typeString": "uint256" } ], - "id": 1146, + "id": 1293, "name": "pollEnded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "10678:9:4", + "referencedDeclaration": 1334, + "src": "10818:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1148, + "id": 1295, "isConstant": false, "isLValue": false, "isPure": false, @@ -24495,7 +25381,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10678:18:4", + "src": "10818:18:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24509,21 +25395,21 @@ "typeString": "bool" } ], - "id": 1145, + "id": 1292, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10670:7:4", + "referencedDeclaration": 4156, + "src": "10810:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1149, + "id": 1296, "isConstant": false, "isLValue": false, "isPure": false, @@ -24531,15 +25417,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10670:27:4", + "src": "10810:27:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1150, + "id": 1297, "nodeType": "ExpressionStatement", - "src": "10670:27:4" + "src": "10810:27:6" }, { "condition": { @@ -24547,12 +25433,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1152, + "id": 1299, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10717:7:4", + "referencedDeclaration": 1287, + "src": "10857:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24566,18 +25452,18 @@ "typeString": "uint256" } ], - "id": 1151, + "id": 1298, "name": "isPassed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1138, - "src": "10708:8:4", + "referencedDeclaration": 1285, + "src": "10848:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1153, + "id": 1300, "isConstant": false, "isLValue": false, "isPure": false, @@ -24585,7 +25471,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10708:17:4", + "src": "10848:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24598,26 +25484,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1159, + "id": 1306, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10789:7:4", + "referencedDeclaration": 655, + "src": "10929:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1161, + "id": 1308, "indexExpression": { "argumentTypes": null, - "id": 1160, + "id": 1307, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10797:7:4", + "referencedDeclaration": 1287, + "src": "10937:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24628,34 +25514,34 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10789:16:4", + "src": "10929:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1162, + "id": 1309, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesAgainst", "nodeType": "MemberAccess", - "referencedDeclaration": 517, - "src": "10789:29:4", + "referencedDeclaration": 637, + "src": "10929:29:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1144, - "id": 1163, + "functionReturnParameters": 1291, + "id": 1310, "nodeType": "Return", - "src": "10782:36:4" + "src": "10922:36:6" }, - "id": 1164, + "id": 1311, "nodeType": "IfStatement", - "src": "10704:114:4", + "src": "10844:114:6", "trueBody": { "expression": { "argumentTypes": null, @@ -24663,26 +25549,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1154, + "id": 1301, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "10740:7:4", + "referencedDeclaration": 655, + "src": "10880:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1156, + "id": 1303, "indexExpression": { "argumentTypes": null, - "id": 1155, + "id": 1302, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1140, - "src": "10748:7:4", + "referencedDeclaration": 1287, + "src": "10888:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24693,36 +25579,36 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10740:16:4", + "src": "10880:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1157, + "id": 1304, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "votesFor", "nodeType": "MemberAccess", - "referencedDeclaration": 515, - "src": "10740:25:4", + "referencedDeclaration": 635, + "src": "10880:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1144, - "id": 1158, + "functionReturnParameters": 1291, + "id": 1305, "nodeType": "Return", - "src": "10733:32:4" + "src": "10873:32:6" } } ] }, "documentation": "@dev Gets the total winning votes for reward distribution purposes\n@param _pollID Integer identifier associated with target poll\n@return Total number of votes committed to the winning option for specified poll", - "id": 1166, + "id": 1313, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -24730,16 +25616,16 @@ "name": "getTotalNumberOfTokensForWinningOption", "nodeType": "FunctionDefinition", "parameters": { - "id": 1141, + "id": 1288, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1140, + "id": 1287, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1166, - "src": "10613:12:4", + "scope": 1313, + "src": "10753:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24747,10 +25633,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1139, + "id": 1286, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10613:4:4", + "src": "10753:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24760,20 +25646,20 @@ "visibility": "internal" } ], - "src": "10612:14:4" + "src": "10752:14:6" }, "payable": false, "returnParameters": { - "id": 1144, + "id": 1291, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1143, + "id": 1290, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1166, - "src": "10648:14:4", + "scope": 1313, + "src": "10788:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24781,10 +25667,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1142, + "id": 1289, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10648:4:4", + "src": "10788:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24794,19 +25680,19 @@ "visibility": "internal" } ], - "src": "10647:16:4" + "src": "10787:16:6" }, - "scope": 1471, - "src": "10565:258:4", + "scope": 1618, + "src": "10705:258:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1186, + "id": 1333, "nodeType": "Block", - "src": "11063:94:4", + "src": "11203:94:6", "statements": [ { "expression": { @@ -24817,12 +25703,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1175, + "id": 1322, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1168, - "src": "11088:7:4", + "referencedDeclaration": 1315, + "src": "11228:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24836,18 +25722,18 @@ "typeString": "uint256" } ], - "id": 1174, + "id": 1321, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11077:10:4", + "referencedDeclaration": 1446, + "src": "11217:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1176, + "id": 1323, "isConstant": false, "isLValue": false, "isPure": false, @@ -24855,7 +25741,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11077:19:4", + "src": "11217:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24869,21 +25755,21 @@ "typeString": "bool" } ], - "id": 1173, + "id": 1320, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11069:7:4", + "referencedDeclaration": 4156, + "src": "11209:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1177, + "id": 1324, "isConstant": false, "isLValue": false, "isPure": false, @@ -24891,15 +25777,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11069:28:4", + "src": "11209:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1178, + "id": 1325, "nodeType": "ExpressionStatement", - "src": "11069:28:4" + "src": "11209:28:6" }, { "expression": { @@ -24911,26 +25797,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1180, + "id": 1327, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11121:7:4", + "referencedDeclaration": 655, + "src": "11261:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1182, + "id": 1329, "indexExpression": { "argumentTypes": null, - "id": 1181, + "id": 1328, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1168, - "src": "11129:7:4", + "referencedDeclaration": 1315, + "src": "11269:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24941,21 +25827,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11121:16:4", + "src": "11261:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1183, + "id": 1330, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "11121:30:4", + "referencedDeclaration": 631, + "src": "11261:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24969,18 +25855,18 @@ "typeString": "uint256" } ], - "id": 1179, + "id": 1326, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11111:9:4", + "referencedDeclaration": 1599, + "src": "11251:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1184, + "id": 1331, "isConstant": false, "isLValue": false, "isPure": false, @@ -24988,21 +25874,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11111:41:4", + "src": "11251:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1172, - "id": 1185, + "functionReturnParameters": 1319, + "id": 1332, "nodeType": "Return", - "src": "11104:48:4" + "src": "11244:48:6" } ] }, "documentation": "@notice Determines if poll is over\n@dev Checks isExpired for specified poll's revealEndDate\n@return Boolean indication of whether polling period is over", - "id": 1187, + "id": 1334, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25010,16 +25896,16 @@ "name": "pollEnded", "nodeType": "FunctionDefinition", "parameters": { - "id": 1169, + "id": 1316, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1168, + "id": 1315, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1187, - "src": "11016:12:4", + "scope": 1334, + "src": "11156:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25027,10 +25913,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1167, + "id": 1314, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11016:4:4", + "src": "11156:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25040,20 +25926,20 @@ "visibility": "internal" } ], - "src": "11015:14:4" + "src": "11155:14:6" }, "payable": false, "returnParameters": { - "id": 1172, + "id": 1319, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1171, + "id": 1318, "name": "ended", "nodeType": "VariableDeclaration", - "scope": 1187, - "src": "11051:10:4", + "scope": 1334, + "src": "11191:10:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25061,10 +25947,10 @@ "typeString": "bool" }, "typeName": { - "id": 1170, + "id": 1317, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11051:4:4", + "src": "11191:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25074,19 +25960,19 @@ "visibility": "internal" } ], - "src": "11050:12:4" + "src": "11190:12:6" }, - "scope": 1471, - "src": "10997:160:4", + "scope": 1618, + "src": "11137:160:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1208, + "id": 1355, "nodeType": "Block", - "src": "11521:95:4", + "src": "11661:95:6", "statements": [ { "expression": { @@ -25097,12 +25983,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1196, + "id": 1343, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "11546:7:4", + "referencedDeclaration": 1336, + "src": "11686:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25116,18 +26002,18 @@ "typeString": "uint256" } ], - "id": 1195, + "id": 1342, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11535:10:4", + "referencedDeclaration": 1446, + "src": "11675:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1197, + "id": 1344, "isConstant": false, "isLValue": false, "isPure": false, @@ -25135,7 +26021,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11535:19:4", + "src": "11675:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25149,21 +26035,21 @@ "typeString": "bool" } ], - "id": 1194, + "id": 1341, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11527:7:4", + "referencedDeclaration": 4156, + "src": "11667:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1198, + "id": 1345, "isConstant": false, "isLValue": false, "isPure": false, @@ -25171,20 +26057,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11527:28:4", + "src": "11667:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1199, + "id": 1346, "nodeType": "ExpressionStatement", - "src": "11527:28:4" + "src": "11667:28:6" }, { "expression": { "argumentTypes": null, - "id": 1206, + "id": 1353, "isConstant": false, "isLValue": false, "isPure": false, @@ -25192,7 +26078,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11569:42:4", + "src": "11709:42:6", "subExpression": { "argumentTypes": null, "arguments": [ @@ -25202,26 +26088,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1201, + "id": 1348, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11580:7:4", + "referencedDeclaration": 655, + "src": "11720:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1203, + "id": 1350, "indexExpression": { "argumentTypes": null, - "id": 1202, + "id": 1349, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "11588:7:4", + "referencedDeclaration": 1336, + "src": "11728:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25232,21 +26118,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11580:16:4", + "src": "11720:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1204, + "id": 1351, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "commitEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 509, - "src": "11580:30:4", + "referencedDeclaration": 629, + "src": "11720:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25260,18 +26146,18 @@ "typeString": "uint256" } ], - "id": 1200, + "id": 1347, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11570:9:4", + "referencedDeclaration": 1599, + "src": "11710:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1205, + "id": 1352, "isConstant": false, "isLValue": false, "isPure": false, @@ -25279,7 +26165,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11570:41:4", + "src": "11710:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25290,15 +26176,15 @@ "typeString": "bool" } }, - "functionReturnParameters": 1193, - "id": 1207, + "functionReturnParameters": 1340, + "id": 1354, "nodeType": "Return", - "src": "11562:49:4" + "src": "11702:49:6" } ] }, "documentation": "@notice Checks if the commit period is still active for the specified poll\n@dev Checks isExpired for the specified poll's commitEndDate\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of isCommitPeriodActive for target poll", - "id": 1209, + "id": 1356, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25306,16 +26192,16 @@ "name": "commitPeriodActive", "nodeType": "FunctionDefinition", "parameters": { - "id": 1190, + "id": 1337, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1189, + "id": 1336, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1209, - "src": "11473:12:4", + "scope": 1356, + "src": "11613:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25323,10 +26209,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1188, + "id": 1335, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11473:4:4", + "src": "11613:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25336,20 +26222,20 @@ "visibility": "internal" } ], - "src": "11472:14:4" + "src": "11612:14:6" }, "payable": false, "returnParameters": { - "id": 1193, + "id": 1340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1192, + "id": 1339, "name": "active", "nodeType": "VariableDeclaration", - "scope": 1209, - "src": "11508:11:4", + "scope": 1356, + "src": "11648:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25357,10 +26243,10 @@ "typeString": "bool" }, "typeName": { - "id": 1191, + "id": 1338, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11508:4:4", + "src": "11648:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25370,19 +26256,19 @@ "visibility": "internal" } ], - "src": "11507:13:4" + "src": "11647:13:6" }, - "scope": 1471, - "src": "11445:171:4", + "scope": 1618, + "src": "11585:171:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1235, + "id": 1382, "nodeType": "Block", - "src": "11911:127:4", + "src": "12051:127:6", "statements": [ { "expression": { @@ -25393,12 +26279,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1218, + "id": 1365, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "11936:7:4", + "referencedDeclaration": 1358, + "src": "12076:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25412,18 +26298,18 @@ "typeString": "uint256" } ], - "id": 1217, + "id": 1364, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "11925:10:4", + "referencedDeclaration": 1446, + "src": "12065:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1219, + "id": 1366, "isConstant": false, "isLValue": false, "isPure": false, @@ -25431,7 +26317,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11925:19:4", + "src": "12065:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25445,21 +26331,21 @@ "typeString": "bool" } ], - "id": 1216, + "id": 1363, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "11917:7:4", + "referencedDeclaration": 4156, + "src": "12057:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1220, + "id": 1367, "isConstant": false, "isLValue": false, "isPure": false, @@ -25467,15 +26353,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11917:28:4", + "src": "12057:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1221, + "id": 1368, "nodeType": "ExpressionStatement", - "src": "11917:28:4" + "src": "12057:28:6" }, { "expression": { @@ -25484,14 +26370,14 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1233, + "id": 1380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1228, + "id": 1375, "isConstant": false, "isLValue": false, "isPure": false, @@ -25499,7 +26385,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11959:42:4", + "src": "12099:42:6", "subExpression": { "argumentTypes": null, "arguments": [ @@ -25509,26 +26395,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1223, + "id": 1370, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "11970:7:4", + "referencedDeclaration": 655, + "src": "12110:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1225, + "id": 1372, "indexExpression": { "argumentTypes": null, - "id": 1224, + "id": 1371, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "11978:7:4", + "referencedDeclaration": 1358, + "src": "12118:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25539,21 +26425,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11970:16:4", + "src": "12110:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1226, + "id": 1373, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "revealEndDate", "nodeType": "MemberAccess", - "referencedDeclaration": 511, - "src": "11970:30:4", + "referencedDeclaration": 631, + "src": "12110:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25567,18 +26453,18 @@ "typeString": "uint256" } ], - "id": 1222, + "id": 1369, "name": "isExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1452, - "src": "11960:9:4", + "referencedDeclaration": 1599, + "src": "12100:9:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1227, + "id": 1374, "isConstant": false, "isLValue": false, "isPure": false, @@ -25586,7 +26472,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11960:41:4", + "src": "12100:41:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25601,7 +26487,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 1232, + "id": 1379, "isConstant": false, "isLValue": false, "isPure": false, @@ -25609,18 +26495,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "12005:28:4", + "src": "12145:28:6", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1230, + "id": 1377, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1211, - "src": "12025:7:4", + "referencedDeclaration": 1358, + "src": "12165:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25634,18 +26520,18 @@ "typeString": "uint256" } ], - "id": 1229, + "id": 1376, "name": "commitPeriodActive", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1209, - "src": "12006:18:4", + "referencedDeclaration": 1356, + "src": "12146:18:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1231, + "id": 1378, "isConstant": false, "isLValue": false, "isPure": false, @@ -25653,7 +26539,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12006:27:4", + "src": "12146:27:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25664,21 +26550,21 @@ "typeString": "bool" } }, - "src": "11959:74:4", + "src": "12099:74:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1215, - "id": 1234, + "functionReturnParameters": 1362, + "id": 1381, "nodeType": "Return", - "src": "11952:81:4" + "src": "12092:81:6" } ] }, "documentation": "@notice Checks if the reveal period is still active for the specified poll\n@dev Checks isExpired for the specified poll's revealEndDate\n@param _pollID Integer identifier associated with target poll", - "id": 1236, + "id": 1383, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25686,16 +26572,16 @@ "name": "revealPeriodActive", "nodeType": "FunctionDefinition", "parameters": { - "id": 1212, + "id": 1359, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1211, + "id": 1358, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1236, - "src": "11863:12:4", + "scope": 1383, + "src": "12003:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25703,10 +26589,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1210, + "id": 1357, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11863:4:4", + "src": "12003:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25716,20 +26602,20 @@ "visibility": "internal" } ], - "src": "11862:14:4" + "src": "12002:14:6" }, "payable": false, "returnParameters": { - "id": 1215, + "id": 1362, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1214, + "id": 1361, "name": "active", "nodeType": "VariableDeclaration", - "scope": 1236, - "src": "11898:11:4", + "scope": 1383, + "src": "12038:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25737,10 +26623,10 @@ "typeString": "bool" }, "typeName": { - "id": 1213, + "id": 1360, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11898:4:4", + "src": "12038:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25750,19 +26636,19 @@ "visibility": "internal" } ], - "src": "11897:13:4" + "src": "12037:13:6" }, - "scope": 1471, - "src": "11835:203:4", + "scope": 1618, + "src": "11975:203:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1258, + "id": 1405, "nodeType": "Block", - "src": "12366:87:4", + "src": "12506:87:6", "statements": [ { "expression": { @@ -25773,12 +26659,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1247, + "id": 1394, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1240, - "src": "12391:7:4", + "referencedDeclaration": 1387, + "src": "12531:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25792,18 +26678,18 @@ "typeString": "uint256" } ], - "id": 1246, + "id": 1393, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "12380:10:4", + "referencedDeclaration": 1446, + "src": "12520:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1248, + "id": 1395, "isConstant": false, "isLValue": false, "isPure": false, @@ -25811,7 +26697,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12380:19:4", + "src": "12520:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25825,21 +26711,21 @@ "typeString": "bool" } ], - "id": 1245, + "id": 1392, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "12372:7:4", + "referencedDeclaration": 4156, + "src": "12512:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1249, + "id": 1396, "isConstant": false, "isLValue": false, "isPure": false, @@ -25847,15 +26733,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12372:28:4", + "src": "12512:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1250, + "id": 1397, "nodeType": "ExpressionStatement", - "src": "12372:28:4" + "src": "12512:28:6" }, { "expression": { @@ -25866,26 +26752,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1251, + "id": 1398, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "12414:7:4", + "referencedDeclaration": 655, + "src": "12554:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1253, + "id": 1400, "indexExpression": { "argumentTypes": null, - "id": 1252, + "id": 1399, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1240, - "src": "12422:7:4", + "referencedDeclaration": 1387, + "src": "12562:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25896,35 +26782,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12414:16:4", + "src": "12554:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1254, + "id": 1401, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didCommit", "nodeType": "MemberAccess", - "referencedDeclaration": 521, - "src": "12414:26:4", + "referencedDeclaration": 641, + "src": "12554:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1256, + "id": 1403, "indexExpression": { "argumentTypes": null, - "id": 1255, + "id": 1402, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1238, - "src": "12441:6:4", + "referencedDeclaration": 1385, + "src": "12581:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25935,21 +26821,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12414:34:4", + "src": "12554:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1244, - "id": 1257, + "functionReturnParameters": 1391, + "id": 1404, "nodeType": "Return", - "src": "12407:41:4" + "src": "12547:41:6" } ] }, "documentation": "@dev Checks if user has committed for specified poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of whether user has committed", - "id": 1259, + "id": 1406, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25957,16 +26843,16 @@ "name": "didCommit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1241, + "id": 1388, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1238, + "id": 1385, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12299:14:4", + "scope": 1406, + "src": "12439:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25974,10 +26860,10 @@ "typeString": "address" }, "typeName": { - "id": 1237, + "id": 1384, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12299:7:4", + "src": "12439:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25988,11 +26874,11 @@ }, { "constant": false, - "id": 1240, + "id": 1387, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12315:12:4", + "scope": 1406, + "src": "12455:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26000,10 +26886,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1239, + "id": 1386, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12315:4:4", + "src": "12455:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26013,20 +26899,20 @@ "visibility": "internal" } ], - "src": "12298:30:4" + "src": "12438:30:6" }, "payable": false, "returnParameters": { - "id": 1244, + "id": 1391, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1243, + "id": 1390, "name": "committed", "nodeType": "VariableDeclaration", - "scope": 1259, - "src": "12350:14:4", + "scope": 1406, + "src": "12490:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26034,10 +26920,10 @@ "typeString": "bool" }, "typeName": { - "id": 1242, + "id": 1389, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12350:4:4", + "src": "12490:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26047,19 +26933,19 @@ "visibility": "internal" } ], - "src": "12349:16:4" + "src": "12489:16:6" }, - "scope": 1471, - "src": "12280:173:4", + "scope": 1618, + "src": "12420:173:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1281, + "id": 1428, "nodeType": "Block", - "src": "12778:87:4", + "src": "12918:87:6", "statements": [ { "expression": { @@ -26070,12 +26956,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1270, + "id": 1417, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1263, - "src": "12803:7:4", + "referencedDeclaration": 1410, + "src": "12943:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26089,18 +26975,18 @@ "typeString": "uint256" } ], - "id": 1269, + "id": 1416, "name": "pollExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1299, - "src": "12792:10:4", + "referencedDeclaration": 1446, + "src": "12932:10:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view returns (bool)" } }, - "id": 1271, + "id": 1418, "isConstant": false, "isLValue": false, "isPure": false, @@ -26108,7 +26994,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12792:19:4", + "src": "12932:19:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26122,21 +27008,21 @@ "typeString": "bool" } ], - "id": 1268, + "id": 1415, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "12784:7:4", + "referencedDeclaration": 4156, + "src": "12924:7:6", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1272, + "id": 1419, "isConstant": false, "isLValue": false, "isPure": false, @@ -26144,15 +27030,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12784:28:4", + "src": "12924:28:6", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1273, + "id": 1420, "nodeType": "ExpressionStatement", - "src": "12784:28:4" + "src": "12924:28:6" }, { "expression": { @@ -26163,26 +27049,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1274, + "id": 1421, "name": "pollMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 535, - "src": "12826:7:4", + "referencedDeclaration": 655, + "src": "12966:7:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$526_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Poll_$646_storage_$", "typeString": "mapping(uint256 => struct PLCRVoting.Poll storage ref)" } }, - "id": 1276, + "id": 1423, "indexExpression": { "argumentTypes": null, - "id": 1275, + "id": 1422, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1263, - "src": "12834:7:4", + "referencedDeclaration": 1410, + "src": "12974:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26193,35 +27079,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12826:16:4", + "src": "12966:16:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Poll_$526_storage", + "typeIdentifier": "t_struct$_Poll_$646_storage", "typeString": "struct PLCRVoting.Poll storage ref" } }, - "id": 1277, + "id": 1424, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "didReveal", "nodeType": "MemberAccess", - "referencedDeclaration": 525, - "src": "12826:26:4", + "referencedDeclaration": 645, + "src": "12966:26:6", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1279, + "id": 1426, "indexExpression": { "argumentTypes": null, - "id": 1278, + "id": 1425, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1261, - "src": "12853:6:4", + "referencedDeclaration": 1408, + "src": "12993:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26232,21 +27118,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12826:34:4", + "src": "12966:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1267, - "id": 1280, + "functionReturnParameters": 1414, + "id": 1427, "nodeType": "Return", - "src": "12819:41:4" + "src": "12959:41:6" } ] }, "documentation": "@dev Checks if user has revealed for specified poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Boolean indication of whether user has revealed", - "id": 1282, + "id": 1429, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26254,16 +27140,16 @@ "name": "didReveal", "nodeType": "FunctionDefinition", "parameters": { - "id": 1264, + "id": 1411, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1261, + "id": 1408, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12712:14:4", + "scope": 1429, + "src": "12852:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26271,10 +27157,10 @@ "typeString": "address" }, "typeName": { - "id": 1260, + "id": 1407, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12712:7:4", + "src": "12852:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26285,11 +27171,11 @@ }, { "constant": false, - "id": 1263, + "id": 1410, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12728:12:4", + "scope": 1429, + "src": "12868:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26297,10 +27183,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1262, + "id": 1409, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12728:4:4", + "src": "12868:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26310,20 +27196,20 @@ "visibility": "internal" } ], - "src": "12711:30:4" + "src": "12851:30:6" }, "payable": false, "returnParameters": { - "id": 1267, + "id": 1414, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1266, + "id": 1413, "name": "revealed", "nodeType": "VariableDeclaration", - "scope": 1282, - "src": "12763:13:4", + "scope": 1429, + "src": "12903:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26331,10 +27217,10 @@ "typeString": "bool" }, "typeName": { - "id": 1265, + "id": 1412, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12763:4:4", + "src": "12903:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26344,19 +27230,19 @@ "visibility": "internal" } ], - "src": "12762:15:4" + "src": "12902:15:6" }, - "scope": 1471, - "src": "12693:172:4", + "scope": 1618, + "src": "12833:172:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1298, + "id": 1445, "nodeType": "Block", - "src": "13117:56:4", + "src": "13257:56:6", "statements": [ { "expression": { @@ -26368,7 +27254,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1295, + "id": 1442, "isConstant": false, "isLValue": false, "isPure": false, @@ -26379,19 +27265,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1291, + "id": 1438, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1289, + "id": 1436, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1284, - "src": "13131:7:4", + "referencedDeclaration": 1431, + "src": "13271:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26402,14 +27288,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1290, + "id": 1437, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "13142:1:4", + "src": "13282:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26417,7 +27303,7 @@ }, "value": "0" }, - "src": "13131:12:4", + "src": "13271:12:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26431,19 +27317,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1294, + "id": 1441, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1292, + "id": 1439, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1284, - "src": "13147:7:4", + "referencedDeclaration": 1431, + "src": "13287:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26453,52 +27339,52 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1293, + "id": 1440, "name": "pollNonce", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 531, - "src": "13158:9:4", + "referencedDeclaration": 651, + "src": "13298:9:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13147:20:4", + "src": "13287:20:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "13131:36:4", + "src": "13271:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1296, + "id": 1443, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "13130:38:4", + "src": "13270:38:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1288, - "id": 1297, + "functionReturnParameters": 1435, + "id": 1444, "nodeType": "Return", - "src": "13123:45:4" + "src": "13263:45:6" } ] }, "documentation": "@dev Checks if a poll exists\n@param _pollID The pollID whose existance is to be evaluated.\n@return Boolean Indicates whether a poll exists for the provided pollID", - "id": 1299, + "id": 1446, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26506,16 +27392,16 @@ "name": "pollExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 1285, + "id": 1432, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1284, + "id": 1431, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1299, - "src": "13069:12:4", + "scope": 1446, + "src": "13209:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26523,10 +27409,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1283, + "id": 1430, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13069:4:4", + "src": "13209:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26536,20 +27422,20 @@ "visibility": "internal" } ], - "src": "13068:14:4" + "src": "13208:14:6" }, "payable": false, "returnParameters": { - "id": 1288, + "id": 1435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1287, + "id": 1434, "name": "exists", "nodeType": "VariableDeclaration", - "scope": 1299, - "src": "13104:11:4", + "scope": 1446, + "src": "13244:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26557,10 +27443,10 @@ "typeString": "bool" }, "typeName": { - "id": 1286, + "id": 1433, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13104:4:4", + "src": "13244:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26570,19 +27456,19 @@ "visibility": "internal" } ], - "src": "13103:13:4" + "src": "13243:13:6" }, - "scope": 1471, - "src": "13049:124:4", + "scope": 1618, + "src": "13189:124:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1319, + "id": 1466, "nodeType": "Block", - "src": "13610:86:4", + "src": "13750:86:6", "statements": [ { "expression": { @@ -26596,12 +27482,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1312, + "id": 1459, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1301, - "src": "13659:6:4", + "referencedDeclaration": 1448, + "src": "13799:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26609,12 +27495,12 @@ }, { "argumentTypes": null, - "id": 1313, + "id": 1460, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1303, - "src": "13667:7:4", + "referencedDeclaration": 1450, + "src": "13807:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26632,18 +27518,18 @@ "typeString": "uint256" } ], - "id": 1311, + "id": 1458, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "13650:8:4", + "referencedDeclaration": 1617, + "src": "13790:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 1314, + "id": 1461, "isConstant": false, "isLValue": false, "isPure": false, @@ -26651,7 +27537,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13650:25:4", + "src": "13790:25:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26660,14 +27546,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697448617368", - "id": 1315, + "id": 1462, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "13677:12:4", + "src": "13817:12:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_207714604a0440a484c6569f8718c59de7b49b2f64c69153d0c80360597b39a3", @@ -26689,18 +27575,18 @@ ], "expression": { "argumentTypes": null, - "id": 1309, + "id": 1456, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "13631:5:4", + "referencedDeclaration": 665, + "src": "13771:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 1310, + "id": 1457, "isConstant": false, "isLValue": true, "isPure": false, @@ -26708,13 +27594,13 @@ "memberName": "getAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 33, - "src": "13631:18:4", + "src": "13771:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory) view returns (uint256)" } }, - "id": 1316, + "id": 1463, "isConstant": false, "isLValue": false, "isPure": false, @@ -26722,7 +27608,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13631:59:4", + "src": "13771:59:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26736,20 +27622,20 @@ "typeString": "uint256" } ], - "id": 1308, + "id": 1455, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "13623:7:4", + "src": "13763:7:6", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes32_$", "typeString": "type(bytes32)" }, "typeName": "bytes32" }, - "id": 1317, + "id": 1464, "isConstant": false, "isLValue": false, "isPure": false, @@ -26757,21 +27643,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13623:68:4", + "src": "13763:68:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1307, - "id": 1318, + "functionReturnParameters": 1454, + "id": 1465, "nodeType": "Return", - "src": "13616:75:4" + "src": "13756:75:6" } ] }, "documentation": "@dev Gets the bytes32 commitHash property of target poll\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Bytes32 hash property attached to target poll", - "id": 1320, + "id": 1467, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26779,16 +27665,16 @@ "name": "getCommitHash", "nodeType": "FunctionDefinition", "parameters": { - "id": 1304, + "id": 1451, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1301, + "id": 1448, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13539:14:4", + "scope": 1467, + "src": "13679:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26796,10 +27682,10 @@ "typeString": "address" }, "typeName": { - "id": 1300, + "id": 1447, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13539:7:4", + "src": "13679:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26810,11 +27696,11 @@ }, { "constant": false, - "id": 1303, + "id": 1450, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13555:12:4", + "scope": 1467, + "src": "13695:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26822,10 +27708,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1302, + "id": 1449, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13555:4:4", + "src": "13695:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26835,20 +27721,20 @@ "visibility": "internal" } ], - "src": "13538:30:4" + "src": "13678:30:6" }, "payable": false, "returnParameters": { - "id": 1307, + "id": 1454, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1306, + "id": 1453, "name": "commitHash", "nodeType": "VariableDeclaration", - "scope": 1320, - "src": "13590:18:4", + "scope": 1467, + "src": "13730:18:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26856,10 +27742,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1305, + "id": 1452, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13590:7:4", + "src": "13730:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26869,19 +27755,19 @@ "visibility": "internal" } ], - "src": "13589:20:4" + "src": "13729:20:6" }, - "scope": 1471, - "src": "13516:180:4", + "scope": 1618, + "src": "13656:180:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1338, + "id": 1485, "nodeType": "Block", - "src": "14043:76:4", + "src": "14183:76:6", "statements": [ { "expression": { @@ -26892,12 +27778,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1332, + "id": 1479, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1322, - "src": "14084:6:4", + "referencedDeclaration": 1469, + "src": "14224:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26905,12 +27791,12 @@ }, { "argumentTypes": null, - "id": 1333, + "id": 1480, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1324, - "src": "14092:7:4", + "referencedDeclaration": 1471, + "src": "14232:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26928,18 +27814,18 @@ "typeString": "uint256" } ], - "id": 1331, + "id": 1478, "name": "attrUUID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1470, - "src": "14075:8:4", + "referencedDeclaration": 1617, + "src": "14215:8:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_address_$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (address,uint256) pure returns (bytes32)" } }, - "id": 1334, + "id": 1481, "isConstant": false, "isLValue": false, "isPure": false, @@ -26947,7 +27833,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14075:25:4", + "src": "14215:25:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26956,14 +27842,14 @@ { "argumentTypes": null, "hexValue": "6e756d546f6b656e73", - "id": 1335, + "id": 1482, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14102:11:4", + "src": "14242:11:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_aaabf4403cd242796b0e69a57762477ad48e1fa250247ff93eeada3e5b75581a", @@ -26985,18 +27871,18 @@ ], "expression": { "argumentTypes": null, - "id": 1329, + "id": 1476, "name": "store", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 545, - "src": "14056:5:4", + "referencedDeclaration": 665, + "src": "14196:5:6", "typeDescriptions": { "typeIdentifier": "t_struct$_Data_$6_storage", "typeString": "struct AttributeStore.Data storage ref" } }, - "id": 1330, + "id": 1477, "isConstant": false, "isLValue": true, "isPure": false, @@ -27004,13 +27890,13 @@ "memberName": "getAttribute", "nodeType": "MemberAccess", "referencedDeclaration": 33, - "src": "14056:18:4", + "src": "14196:18:6", "typeDescriptions": { "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$6_storage_ptr_$_t_bytes32_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_struct$_Data_$6_storage_ptr_$", "typeString": "function (struct AttributeStore.Data storage pointer,bytes32,string memory) view returns (uint256)" } }, - "id": 1336, + "id": 1483, "isConstant": false, "isLValue": false, "isPure": false, @@ -27018,21 +27904,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14056:58:4", + "src": "14196:58:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1328, - "id": 1337, + "functionReturnParameters": 1475, + "id": 1484, "nodeType": "Return", - "src": "14049:65:4" + "src": "14189:65:6" } ] }, "documentation": "@dev Wrapper for getAttribute with attrName=\"numTokens\"\n@param _voter Address of user to check against\n@param _pollID Integer identifier associated with target poll\n@return Number of tokens committed to poll in sorted poll-linked-list", - "id": 1339, + "id": 1486, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27040,16 +27926,16 @@ "name": "getNumTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1325, + "id": 1472, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1322, + "id": 1469, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "13976:14:4", + "scope": 1486, + "src": "14116:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27057,10 +27943,10 @@ "typeString": "address" }, "typeName": { - "id": 1321, + "id": 1468, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13976:7:4", + "src": "14116:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27071,11 +27957,11 @@ }, { "constant": false, - "id": 1324, + "id": 1471, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "13992:12:4", + "scope": 1486, + "src": "14132:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27083,10 +27969,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1323, + "id": 1470, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13992:4:4", + "src": "14132:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27096,20 +27982,20 @@ "visibility": "internal" } ], - "src": "13975:30:4" + "src": "14115:30:6" }, "payable": false, "returnParameters": { - "id": 1328, + "id": 1475, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1327, + "id": 1474, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1339, - "src": "14027:14:4", + "scope": 1486, + "src": "14167:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27117,10 +28003,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1326, + "id": 1473, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14027:4:4", + "src": "14167:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27130,19 +28016,19 @@ "visibility": "internal" } ], - "src": "14026:16:4" + "src": "14166:16:6" }, - "scope": 1471, - "src": "13954:165:4", + "scope": 1618, + "src": "14094:165:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1353, + "id": 1500, "nodeType": "Block", - "src": "14388:43:4", + "src": "14528:43:6", "statements": [ { "expression": { @@ -27151,14 +28037,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1350, + "id": 1497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14424:1:4", + "src": "14564:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -27178,26 +28064,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1346, + "id": 1493, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "14401:6:4", + "referencedDeclaration": 663, + "src": "14541:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1348, + "id": 1495, "indexExpression": { "argumentTypes": null, - "id": 1347, + "id": 1494, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "14408:6:4", + "referencedDeclaration": 1488, + "src": "14548:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27208,27 +28094,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14401:14:4", + "src": "14541:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1349, + "id": 1496, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "14401:22:4", + "referencedDeclaration": 305, + "src": "14541:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1351, + "id": 1498, "isConstant": false, "isLValue": false, "isPure": false, @@ -27236,21 +28122,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14401:25:4", + "src": "14541:25:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1345, - "id": 1352, + "functionReturnParameters": 1492, + "id": 1499, "nodeType": "Return", - "src": "14394:32:4" + "src": "14534:32:6" } ] }, "documentation": "@dev Gets top element of sorted poll-linked-list\n@param _voter Address of user to check against\n@return Integer identifier to poll with maximum number of tokens committed to it", - "id": 1354, + "id": 1501, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27258,16 +28144,16 @@ "name": "getLastNode", "nodeType": "FunctionDefinition", "parameters": { - "id": 1342, + "id": 1489, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1341, + "id": 1488, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1354, - "src": "14338:14:4", + "scope": 1501, + "src": "14478:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27275,10 +28161,10 @@ "typeString": "address" }, "typeName": { - "id": 1340, + "id": 1487, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14338:7:4", + "src": "14478:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27288,20 +28174,20 @@ "visibility": "internal" } ], - "src": "14337:16:4" + "src": "14477:16:6" }, "payable": false, "returnParameters": { - "id": 1345, + "id": 1492, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1344, + "id": 1491, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1354, - "src": "14375:11:4", + "scope": 1501, + "src": "14515:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27309,10 +28195,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1343, + "id": 1490, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14375:4:4", + "src": "14515:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27322,19 +28208,19 @@ "visibility": "internal" } ], - "src": "14374:13:4" + "src": "14514:13:6" }, - "scope": 1471, - "src": "14317:114:4", + "scope": 1618, + "src": "14457:114:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1368, + "id": 1515, "nodeType": "Block", - "src": "14686:59:4", + "src": "14826:59:6", "statements": [ { "expression": { @@ -27342,12 +28228,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1362, + "id": 1509, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "14712:6:4", + "referencedDeclaration": 1503, + "src": "14852:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27358,12 +28244,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1364, + "id": 1511, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "14732:6:4", + "referencedDeclaration": 1503, + "src": "14872:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27377,18 +28263,18 @@ "typeString": "address" } ], - "id": 1363, + "id": 1510, "name": "getLastNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1354, - "src": "14720:11:4", + "referencedDeclaration": 1501, + "src": "14860:11:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 1365, + "id": 1512, "isConstant": false, "isLValue": false, "isPure": false, @@ -27396,7 +28282,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14720:19:4", + "src": "14860:19:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27414,18 +28300,18 @@ "typeString": "uint256" } ], - "id": 1361, + "id": 1508, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "14699:12:4", + "referencedDeclaration": 1486, + "src": "14839:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1366, + "id": 1513, "isConstant": false, "isLValue": false, "isPure": false, @@ -27433,21 +28319,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14699:41:4", + "src": "14839:41:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1360, - "id": 1367, + "functionReturnParameters": 1507, + "id": 1514, "nodeType": "Return", - "src": "14692:48:4" + "src": "14832:48:6" } ] }, "documentation": "@dev Gets the numTokens property of getLastNode\n@param _voter Address of user to check against\n@return Maximum number of tokens committed in poll specified", - "id": 1369, + "id": 1516, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27455,16 +28341,16 @@ "name": "getLockedTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1357, + "id": 1504, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1356, + "id": 1503, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1369, - "src": "14633:14:4", + "scope": 1516, + "src": "14773:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27472,10 +28358,10 @@ "typeString": "address" }, "typeName": { - "id": 1355, + "id": 1502, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14633:7:4", + "src": "14773:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27485,20 +28371,20 @@ "visibility": "internal" } ], - "src": "14632:16:4" + "src": "14772:16:6" }, "payable": false, "returnParameters": { - "id": 1360, + "id": 1507, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1359, + "id": 1506, "name": "numTokens", "nodeType": "VariableDeclaration", - "scope": 1369, - "src": "14670:14:4", + "scope": 1516, + "src": "14810:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27506,10 +28392,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1358, + "id": 1505, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14670:4:4", + "src": "14810:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27519,32 +28405,32 @@ "visibility": "internal" } ], - "src": "14669:16:4" + "src": "14809:16:6" }, - "scope": 1471, - "src": "14608:137:4", + "scope": 1618, + "src": "14748:137:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1437, + "id": 1584, "nodeType": "Block", - "src": "15556:951:4", + "src": "15696:951:6", "statements": [ { "assignments": [ - 1381 + 1528 ], "declarations": [ { "constant": false, - "id": 1381, + "id": 1528, "name": "nodeID", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15637:11:4", + "scope": 1585, + "src": "15777:11:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27552,10 +28438,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1380, + "id": 1527, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15637:4:4", + "src": "15777:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27565,18 +28451,18 @@ "visibility": "internal" } ], - "id": 1385, + "id": 1532, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1383, + "id": 1530, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15663:6:4", + "referencedDeclaration": 1518, + "src": "15803:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27590,18 +28476,18 @@ "typeString": "address" } ], - "id": 1382, + "id": 1529, "name": "getLastNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1354, - "src": "15651:11:4", + "referencedDeclaration": 1501, + "src": "15791:11:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view returns (uint256)" } }, - "id": 1384, + "id": 1531, "isConstant": false, "isLValue": false, "isPure": false, @@ -27609,27 +28495,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15651:19:4", + "src": "15791:19:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15637:33:4" + "src": "15777:33:6" }, { "assignments": [ - 1387 + 1534 ], "declarations": [ { "constant": false, - "id": 1387, + "id": 1534, "name": "tokensInNode", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15676:17:4", + "scope": 1585, + "src": "15816:17:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27637,10 +28523,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1386, + "id": 1533, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15676:4:4", + "src": "15816:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27650,18 +28536,18 @@ "visibility": "internal" } ], - "id": 1392, + "id": 1539, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1389, + "id": 1536, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15709:6:4", + "referencedDeclaration": 1518, + "src": "15849:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27669,12 +28555,12 @@ }, { "argumentTypes": null, - "id": 1390, + "id": 1537, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15717:6:4", + "referencedDeclaration": 1528, + "src": "15857:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27692,18 +28578,18 @@ "typeString": "uint256" } ], - "id": 1388, + "id": 1535, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "15696:12:4", + "referencedDeclaration": 1486, + "src": "15836:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1391, + "id": 1538, "isConstant": false, "isLValue": false, "isPure": false, @@ -27711,37 +28597,37 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15696:28:4", + "src": "15836:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15676:48:4" + "src": "15816:48:6" }, { "body": { - "id": 1433, + "id": 1580, "nodeType": "Block", - "src": "15822:567:4", + "src": "15962:567:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1401, + "id": 1548, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1396, + "id": 1543, "name": "tokensInNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1387, - "src": "15884:12:4", + "referencedDeclaration": 1534, + "src": "16024:12:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27754,12 +28640,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1398, + "id": 1545, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "15912:6:4", + "referencedDeclaration": 1518, + "src": "16052:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27767,12 +28653,12 @@ }, { "argumentTypes": null, - "id": 1399, + "id": 1546, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15920:6:4", + "referencedDeclaration": 1528, + "src": "16060:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27790,18 +28676,18 @@ "typeString": "uint256" } ], - "id": 1397, + "id": 1544, "name": "getNumTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "15899:12:4", + "referencedDeclaration": 1486, + "src": "16039:12:6", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 1400, + "id": 1547, "isConstant": false, "isLValue": false, "isPure": false, @@ -27809,21 +28695,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15899:28:4", + "src": "16039:28:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15884:43:4", + "src": "16024:43:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1402, + "id": 1549, "nodeType": "ExpressionStatement", - "src": "15884:43:4" + "src": "16024:43:6" }, { "condition": { @@ -27832,19 +28718,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1405, + "id": 1552, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1403, + "id": 1550, "name": "tokensInNode", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1387, - "src": "15939:12:4", + "referencedDeclaration": 1534, + "src": "16079:12:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27854,31 +28740,31 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1404, + "id": 1551, "name": "_numTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1373, - "src": "15955:10:4", + "referencedDeclaration": 1520, + "src": "16095:10:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15939:26:4", + "src": "16079:26:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1423, + "id": 1570, "nodeType": "IfStatement", - "src": "15935:312:4", + "src": "16075:312:6", "trueBody": { - "id": 1422, + "id": 1569, "nodeType": "Block", - "src": "15967:280:4", + "src": "16107:280:6", "statements": [ { "condition": { @@ -27887,19 +28773,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1408, + "id": 1555, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1406, + "id": 1553, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16011:6:4", + "referencedDeclaration": 1528, + "src": "16151:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27909,48 +28795,48 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1407, + "id": 1554, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1375, - "src": "16021:7:4", + "referencedDeclaration": 1522, + "src": "16161:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16011:17:4", + "src": "16151:17:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1419, + "id": 1566, "nodeType": "IfStatement", - "src": "16007:173:4", + "src": "16147:173:6", "trueBody": { - "id": 1418, + "id": 1565, "nodeType": "Block", - "src": "16030:150:4", + "src": "16170:150:6", "statements": [ { "expression": { "argumentTypes": null, - "id": 1416, + "id": 1563, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1409, + "id": 1556, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16130:6:4", + "referencedDeclaration": 1528, + "src": "16270:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27963,12 +28849,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1414, + "id": 1561, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16162:6:4", + "referencedDeclaration": 1528, + "src": "16302:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27986,26 +28872,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1410, + "id": 1557, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "16139:6:4", + "referencedDeclaration": 663, + "src": "16279:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1412, + "id": 1559, "indexExpression": { "argumentTypes": null, - "id": 1411, + "id": 1558, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "16146:6:4", + "referencedDeclaration": 1518, + "src": "16286:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28016,27 +28902,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16139:14:4", + "src": "16279:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1413, + "id": 1560, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "16139:22:4", + "referencedDeclaration": 305, + "src": "16279:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1415, + "id": 1562, "isConstant": false, "isLValue": false, "isPure": false, @@ -28044,21 +28930,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16139:30:4", + "src": "16279:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16130:39:4", + "src": "16270:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1417, + "id": 1564, "nodeType": "ExpressionStatement", - "src": "16130:39:4" + "src": "16270:39:6" } ] } @@ -28066,21 +28952,21 @@ { "expression": { "argumentTypes": null, - "id": 1420, + "id": 1567, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16231:6:4", + "referencedDeclaration": 1528, + "src": "16371:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1379, - "id": 1421, + "functionReturnParameters": 1526, + "id": 1568, "nodeType": "Return", - "src": "16224:13:4" + "src": "16364:13:6" } ] } @@ -28088,19 +28974,19 @@ { "expression": { "argumentTypes": null, - "id": 1431, + "id": 1578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1424, + "id": 1571, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16343:6:4", + "referencedDeclaration": 1528, + "src": "16483:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28113,12 +28999,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1429, + "id": 1576, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16375:6:4", + "referencedDeclaration": 1528, + "src": "16515:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28136,26 +29022,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1425, + "id": 1572, "name": "dllMap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 543, - "src": "16352:6:4", + "referencedDeclaration": 663, + "src": "16492:6:6", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$79_storage_$", + "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Data_$199_storage_$", "typeString": "mapping(address => struct DLL.Data storage ref)" } }, - "id": 1427, + "id": 1574, "indexExpression": { "argumentTypes": null, - "id": 1426, + "id": 1573, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1371, - "src": "16359:6:4", + "referencedDeclaration": 1518, + "src": "16499:6:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28166,27 +29052,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16352:14:4", + "src": "16492:14:6", "typeDescriptions": { - "typeIdentifier": "t_struct$_Data_$79_storage", + "typeIdentifier": "t_struct$_Data_$199_storage", "typeString": "struct DLL.Data storage ref" } }, - "id": 1428, + "id": 1575, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "getPrev", "nodeType": "MemberAccess", - "referencedDeclaration": 185, - "src": "16352:22:4", + "referencedDeclaration": 305, + "src": "16492:22:6", "typeDescriptions": { - "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$79_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$79_storage_ptr_$", + "typeIdentifier": "t_function_delegatecall_view$_t_struct$_Data_$199_storage_ptr_$_t_uint256_$returns$_t_uint256_$bound_to$_t_struct$_Data_$199_storage_ptr_$", "typeString": "function (struct DLL.Data storage pointer,uint256) view returns (uint256)" } }, - "id": 1430, + "id": 1577, "isConstant": false, "isLValue": false, "isPure": false, @@ -28194,21 +29080,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16352:30:4", + "src": "16492:30:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16343:39:4", + "src": "16483:39:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1432, + "id": 1579, "nodeType": "ExpressionStatement", - "src": "16343:39:4" + "src": "16483:39:6" } ] }, @@ -28218,19 +29104,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1395, + "id": 1542, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1393, + "id": 1540, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "15809:6:4", + "referencedDeclaration": 1528, + "src": "15949:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28241,14 +29127,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1394, + "id": 1541, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15819:1:4", + "src": "15959:1:6", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -28256,39 +29142,39 @@ }, "value": "0" }, - "src": "15809:11:4", + "src": "15949:11:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1434, + "id": 1581, "nodeType": "WhileStatement", - "src": "15802:587:4" + "src": "15942:587:6" }, { "expression": { "argumentTypes": null, - "id": 1435, + "id": 1582, "name": "nodeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1381, - "src": "16496:6:4", + "referencedDeclaration": 1528, + "src": "16636:6:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1379, - "id": 1436, + "functionReturnParameters": 1526, + "id": 1583, "nodeType": "Return", - "src": "16489:13:4" + "src": "16629:13:6" } ] }, "documentation": null, - "id": 1438, + "id": 1585, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -28296,16 +29182,16 @@ "name": "getInsertPointForNumTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1376, + "id": 1523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1371, + "id": 1518, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15469:14:4", + "scope": 1585, + "src": "15609:14:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28313,10 +29199,10 @@ "typeString": "address" }, "typeName": { - "id": 1370, + "id": 1517, "name": "address", "nodeType": "ElementaryTypeName", - "src": "15469:7:4", + "src": "15609:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28327,11 +29213,11 @@ }, { "constant": false, - "id": 1373, + "id": 1520, "name": "_numTokens", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15485:15:4", + "scope": 1585, + "src": "15625:15:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28339,10 +29225,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1372, + "id": 1519, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15485:4:4", + "src": "15625:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28353,11 +29239,11 @@ }, { "constant": false, - "id": 1375, + "id": 1522, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15502:12:4", + "scope": 1585, + "src": "15642:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28365,10 +29251,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1374, + "id": 1521, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15502:4:4", + "src": "15642:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28378,20 +29264,20 @@ "visibility": "internal" } ], - "src": "15468:47:4" + "src": "15608:47:6" }, "payable": false, "returnParameters": { - "id": 1379, + "id": 1526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1378, + "id": 1525, "name": "prevNode", "nodeType": "VariableDeclaration", - "scope": 1438, - "src": "15539:13:4", + "scope": 1585, + "src": "15679:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28399,10 +29285,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1377, + "id": 1524, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15539:4:4", + "src": "15679:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28412,19 +29298,19 @@ "visibility": "internal" } ], - "src": "15538:15:4" + "src": "15678:15:6" }, - "scope": 1471, - "src": "15433:1074:4", + "scope": 1618, + "src": "15573:1074:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1451, + "id": 1598, "nodeType": "Block", - "src": "16884:54:4", + "src": "17024:54:6", "statements": [ { "expression": { @@ -28436,7 +29322,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1448, + "id": 1595, "isConstant": false, "isLValue": false, "isPure": false, @@ -28445,18 +29331,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1445, + "id": 1592, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "16898:5:4", + "referencedDeclaration": 4143, + "src": "17038:5:6", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1446, + "id": 1593, "isConstant": false, "isLValue": false, "isPure": false, @@ -28464,7 +29350,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "16898:15:4", + "src": "17038:15:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28474,46 +29360,46 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1447, + "id": 1594, "name": "_terminationDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "16916:16:4", + "referencedDeclaration": 1587, + "src": "17056:16:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16898:34:4", + "src": "17038:34:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1449, + "id": 1596, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "16897:36:4", + "src": "17037:36:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1444, - "id": 1450, + "functionReturnParameters": 1591, + "id": 1597, "nodeType": "Return", - "src": "16890:43:4" + "src": "17030:43:6" } ] }, "documentation": "@dev Checks if an expiration date has been reached\n@param _terminationDate Integer timestamp of date to compare current timestamp with\n@return expired Boolean indication of whether the terminationDate has passed", - "id": 1452, + "id": 1599, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -28521,16 +29407,16 @@ "name": "isExpired", "nodeType": "FunctionDefinition", "parameters": { - "id": 1441, + "id": 1588, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1440, + "id": 1587, "name": "_terminationDate", "nodeType": "VariableDeclaration", - "scope": 1452, - "src": "16826:21:4", + "scope": 1599, + "src": "16966:21:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28538,10 +29424,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1439, + "id": 1586, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "16826:4:4", + "src": "16966:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28551,20 +29437,20 @@ "visibility": "internal" } ], - "src": "16825:23:4" + "src": "16965:23:6" }, "payable": false, "returnParameters": { - "id": 1444, + "id": 1591, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1443, + "id": 1590, "name": "expired", "nodeType": "VariableDeclaration", - "scope": 1452, - "src": "16870:12:4", + "scope": 1599, + "src": "17010:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28572,10 +29458,10 @@ "typeString": "bool" }, "typeName": { - "id": 1442, + "id": 1589, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "16870:4:4", + "src": "17010:4:6", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28585,19 +29471,19 @@ "visibility": "internal" } ], - "src": "16869:14:4" + "src": "17009:14:6" }, - "scope": 1471, - "src": "16807:131:4", + "scope": 1618, + "src": "16947:131:6", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1469, + "id": 1616, "nodeType": "Block", - "src": "17240:61:4", + "src": "17380:61:6", "statements": [ { "expression": { @@ -28608,12 +29494,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1464, + "id": 1611, "name": "_user", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1454, - "src": "17280:5:4", + "referencedDeclaration": 1601, + "src": "17420:5:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28621,12 +29507,12 @@ }, { "argumentTypes": null, - "id": 1465, + "id": 1612, "name": "_pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1456, - "src": "17287:7:4", + "referencedDeclaration": 1603, + "src": "17427:7:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28646,18 +29532,18 @@ ], "expression": { "argumentTypes": null, - "id": 1462, + "id": 1609, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "17263:3:4", + "referencedDeclaration": 4140, + "src": "17403:3:6", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1463, + "id": 1610, "isConstant": false, "isLValue": false, "isPure": true, @@ -28665,13 +29551,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17263:16:4", + "src": "17403:16:6", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1466, + "id": 1613, "isConstant": false, "isLValue": false, "isPure": false, @@ -28679,7 +29565,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17263:32:4", + "src": "17403:32:6", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -28693,18 +29579,18 @@ "typeString": "bytes memory" } ], - "id": 1461, + "id": 1608, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "17253:9:4", + "referencedDeclaration": 4147, + "src": "17393:9:6", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1467, + "id": 1614, "isConstant": false, "isLValue": false, "isPure": false, @@ -28712,21 +29598,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17253:43:4", + "src": "17393:43:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1460, - "id": 1468, + "functionReturnParameters": 1607, + "id": 1615, "nodeType": "Return", - "src": "17246:50:4" + "src": "17386:50:6" } ] }, "documentation": "@dev Generates an identifier which associates a user and a poll together\n@param _pollID Integer identifier associated with target poll\n@return UUID Hash which is deterministic from _user and _pollID", - "id": 1470, + "id": 1617, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -28734,16 +29620,16 @@ "name": "attrUUID", "nodeType": "FunctionDefinition", "parameters": { - "id": 1457, + "id": 1604, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1454, + "id": 1601, "name": "_user", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17176:13:4", + "scope": 1617, + "src": "17316:13:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28751,10 +29637,10 @@ "typeString": "address" }, "typeName": { - "id": 1453, + "id": 1600, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17176:7:4", + "src": "17316:7:6", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28765,11 +29651,11 @@ }, { "constant": false, - "id": 1456, + "id": 1603, "name": "_pollID", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17191:12:4", + "scope": 1617, + "src": "17331:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28777,10 +29663,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1455, + "id": 1602, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17191:4:4", + "src": "17331:4:6", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28790,20 +29676,20 @@ "visibility": "internal" } ], - "src": "17175:29:4" + "src": "17315:29:6" }, "payable": false, "returnParameters": { - "id": 1460, + "id": 1607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1459, + "id": 1606, "name": "UUID", "nodeType": "VariableDeclaration", - "scope": 1470, - "src": "17226:12:4", + "scope": 1617, + "src": "17366:12:6", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28811,10 +29697,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1458, + "id": 1605, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17226:7:4", + "src": "17366:7:6", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28824,20 +29710,20 @@ "visibility": "internal" } ], - "src": "17225:14:4" + "src": "17365:14:6" }, - "scope": 1471, - "src": "17158:143:4", + "scope": 1618, + "src": "17298:143:6", "stateMutability": "pure", "superFunction": null, "visibility": "public" } ], - "scope": 1472, - "src": "252:17051:4" + "scope": 1619, + "src": "252:17191:6" } ], - "src": "0:17304:4" + "src": "0:17444:6" }, "compiler": { "name": "solc", @@ -28845,5 +29731,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.356Z" + "updatedAt": "2018-06-26T02:58:22.326Z" } \ No newline at end of file diff --git a/build/contracts/Parameterizer.json b/build/contracts/Parameterizer.json index f81413b..8b31b23 100644 --- a/build/contracts/Parameterizer.json +++ b/build/contracts/Parameterizer.json @@ -602,62 +602,62 @@ "type": "function" } ], - "bytecode": "0x608060405262093a806005553480156200001857600080fd5b506040516101c08062003ce083398101806040528101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291905050508d600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508c600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550620001916040805190810160405280600a81526020017f6d696e4465706f736974000000000000000000000000000000000000000000008152508d62000515640100000000026401000000009004565b620001e16040805190810160405280600b81526020017f704d696e4465706f7369740000000000000000000000000000000000000000008152508c62000515640100000000026401000000009004565b620002316040805190810160405280600d81526020017f6170706c7953746167654c656e000000000000000000000000000000000000008152508b62000515640100000000026401000000009004565b620002816040805190810160405280600e81526020017f704170706c7953746167654c656e0000000000000000000000000000000000008152508a62000515640100000000026401000000009004565b620002d16040805190810160405280600e81526020017f636f6d6d697453746167654c656e0000000000000000000000000000000000008152508962000515640100000000026401000000009004565b620003216040805190810160405280600f81526020017f70436f6d6d697453746167654c656e00000000000000000000000000000000008152508862000515640100000000026401000000009004565b620003716040805190810160405280600e81526020017f72657665616c53746167654c656e0000000000000000000000000000000000008152508762000515640100000000026401000000009004565b620003c16040805190810160405280600f81526020017f7052657665616c53746167654c656e00000000000000000000000000000000008152508662000515640100000000026401000000009004565b620004116040805190810160405280600f81526020017f64697370656e736174696f6e50637400000000000000000000000000000000008152508562000515640100000000026401000000009004565b620004616040805190810160405280601081526020017f7044697370656e736174696f6e506374000000000000000000000000000000008152508462000515640100000000026401000000009004565b620004b16040805190810160405280600a81526020017f766f746551756f72756d000000000000000000000000000000000000000000008152508362000515640100000000026401000000009004565b620005016040805190810160405280600b81526020017f70566f746551756f72756d0000000000000000000000000000000000000000008152508262000515640100000000026401000000009004565b50505050505050505050505050506200060a565b80600080846040516020018082805190602001908083835b6020831015156200055457805182526020820191506020810190506020830392506200052d565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515620005bf578051825260208201915060208101905060208303925062000598565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b6136c6806200061a6000396000f3006080604052600436106100f0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806229514f146100f557806330490e911461012057806332ed5b12146101515780633530099014610251578063504115521461029a578063693ec85e146102db57806377609a41146103585780638240ae4b146103a157806386bb8f37146103e65780638f1d37761461041d578063a5ba3b1e146104aa578063a7aad3db1461050f578063bade1c541461057a578063c51131fb14610609578063dc6ab52714610652578063fc0c546a14610697578063fce1ccca146106ee575b600080fd5b34801561010157600080fd5b5061010a610745565b6040518082815260200191505060405180910390f35b34801561012c57600080fd5b5061014f600480360381019080803560001916906020019092919050505061074b565b005b34801561015d57600080fd5b506101806004803603810190808035600019169060200190929190505050610eb4565b60405180888152602001878152602001868152602001806020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001848152602001838152602001828103825286818151815260200191508051906020019080838360005b838110156102105780820151818401526020810190506101f5565b50505050905090810190601f16801561023d5780820380516001836020036101000a031916815260200191505b509850505050505050505060405180910390f35b34801561025d57600080fd5b506102806004803603810190808035600019169060200190929190505050610fae565b604051808215151515815260200191505060405180910390f35b3480156102a657600080fd5b506102c560048036038101908080359060200190929190505050610fd8565b6040518082815260200191505060405180910390f35b3480156102e757600080fd5b50610342600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050611108565b6040518082815260200191505060405180910390f35b34801561036457600080fd5b5061038760048036038101908080356000191690602001909291905050506111fa565b604051808215151515815260200191505060405180910390f35b3480156103ad57600080fd5b506103d06004803603810190808035600019169060200190929190505050611510565b6040518082815260200191505060405180910390f35b3480156103f257600080fd5b5061041b6004803603810190808035906020019092919080359060200190929190505050611c50565b005b34801561042957600080fd5b5061044860048036038101908080359060200190929190505050612026565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b3480156104b657600080fd5b506104f560048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612089565b604051808215151515815260200191505060405180910390f35b34801561051b57600080fd5b50610564600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291905050506120f4565b6040518082815260200191505060405180910390f35b34801561058657600080fd5b506105eb600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050612250565b60405180826000191660001916815260200191505060405180910390f35b34801561061557600080fd5b506106386004803603810190808035600019169060200190929190505050612b3d565b604051808215151515815260200191505060405180910390f35b34801561065e57600080fd5b506106816004803603810190808035600019169060200190929190505050612cc8565b6040518082815260200191505060405180910390f35b3480156106a357600080fd5b506106ac612ce0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156106fa57600080fd5b50610703612d06565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60055481565b600080600060026000856000191660001916815260200190815260200160002092508260040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506107a484612b3d565b15610aad57610853836003018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108445780601f1061081957610100808354040283529160200191610844565b820191906000526020600020905b81548152906001019060200180831161082757829003601f168201915b50505050508460060154612d2c565b83600019167f37f3986c71e1aa2c470cfc4a92af70820610c3065589d35ef1664ea27f3e73a584600301856006015460405180806020018381526020018281038252848181546001816001161561010002031660029004815260200191508054600181600116156101000203166002900480156109115780601f106108e657610100808354040283529160200191610911565b820191906000526020600020905b8154815290600101906020018083116108f457829003601f168201915b5050935050505060405180910390a2600260008560001916600019168152602001908152602001600020600080820160009055600182016000905560028201600090556003820160006109649190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610a6257600080fd5b505af1158015610a76573d6000803e3d6000fd5b505050506040513d6020811015610a8c57600080fd5b81019080805190602001909291905050501515610aa857600080fd5b610c9a565b610ab6846111fa565b15610ac957610ac484612e1d565b610c99565b8260050154421115610c935783600019167f29026cb2acebe6d0a4b6d593ccadf76e3fc6d0a02254e078b0c4a619608089d760405160405180910390a260026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610b4a9190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610c4857600080fd5b505af1158015610c5c573d6000803e3d6000fd5b505050506040513d6020811015610c7257600080fd5b81019080805190602001909291905050501515610c8e57600080fd5b610c98565b600080fd5b5b5b6064610cda6040805190810160405280600f81526020017f64697370656e736174696f6e5063740000000000000000000000000000000000815250611108565b11151515610ce457fe5b6064610d246040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611108565b11151515610d2e57fe5b610e30600554610e22610d756040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b610e14610db66040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b610e06610df76040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b5060026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610e759190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560058201600090556006820160009055505050505050565b6002602052806000526040600020600091509050806000015490806001015490806002015490806003018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610f725780601f10610f4757610100808354040283529160200191610f72565b820191906000526020600020905b815481529060010190602001808311610f5557829003601f168201915b5050505050908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050154908060060154905087565b60008060026000846000191660001916815260200190815260200160002060050154119050919050565b600080600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561106c57600080fd5b505af1158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b810190808051906020019092919050505014156110ce5760016000838152602001908152602001600020600201546002029050611103565b600160008381526020019081526020016000206000015460016000848152602001908152602001600020600201546002020390505b919050565b6000806000836040516020018082805190602001908083835b6020831015156111465780518252602082019150602081019050602083039250611121565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156111af578051825260208201915060208101905060208303925061118a565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020549050919050565b6000611204613559565b61120c6135ad565b60026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156112ea5780601f106112bf576101008083540402835291602001916112ea565b820191906000526020600020905b8154815290600101906020018083116112cd57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509150600160008360200151815260200190815260200160002060a06040519081016040529081600082015481526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160149054906101000a900460ff161515151581526020016002820154815260200160038201548152505090506000826020015111801561142f57506000151581604001511515145b80156115075750600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee68483083602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156114cb57600080fd5b505af11580156114df573d6000803e3d6000fd5b505050506040513d60208110156114f557600080fd5b81019080805190602001909291905050505b92505050919050565b600061151a613559565b60008060008060026000886000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156115fe5780601f106115d3576101008083540402835291602001916115fe565b820191906000526020600020905b8154815290600101906020018083116115e157829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016005820154815260200160068201548152505094508460400151935061168387610fae565b8015611693575060008560200151145b151561169e57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d6061171a6040805190810160405280600b81526020017f70566f746551756f72756d000000000000000000000000000000000000000000815250611108565b6117586040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b6117966040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b1580156117f657600080fd5b505af115801561180a573d6000803e3d6000fd5b505050506040513d602081101561182057600080fd5b8101908080519060200190929190505050925060a0604051908101604052806118ac606461189e88611890606461188b6040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611108565b6134aa565b6134c390919063ffffffff16565b6134fb90919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020018581526020016000815250600160008581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508260026000896000191660001916815260200190815260200160002060010181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611a9857600080fd5b505af1158015611aac573d6000803e3d6000fd5b505050506040513d6020811015611ac257600080fd5b81019080805190602001909291905050501515611ade57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b158015611b6f57600080fd5b505af1158015611b83573d6000803e3d6000fd5b505050506040513d60a0811015611b9957600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1687600019167fe94e3086c4bfe84acba4437b85a80fca3721dfc419d1f7afe4fa4e470e670b4885858560405180848152602001838152602001828152602001935050505060405180910390a38295505050505050919050565b600080600015156001600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cc657600080fd5b600115156001600086815260200190815260200160002060010160149054906101000a900460ff161515141515611cfc57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611dc957600080fd5b505af1158015611ddd573d6000803e3d6000fd5b505050506040513d6020811015611df357600080fd5b81019080805190602001909291905050509150611e113385856120f4565b9050816001600086815260200190815260200160002060030160008282540392505081905550806001600086815260200190815260200160002060000160008282540392505081905550600180600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611fda57600080fd5b505af1158015611fee573d6000803e3d6000fd5b505050506040513d602081101561200457600080fd5b8101908080519060200190929190505050151561202057600080fd5b50505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b60006001600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000806000806001600087815260200190815260200160002060030154925060016000878152602001908152602001600020600001549150600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b1580156121f957600080fd5b505af115801561220d573d6000803e3d6000fd5b505050506040513d602081101561222357600080fd5b810190808051906020019092919050505090508282820281151561224357fe5b0493505050509392505050565b60008060006122936040805190810160405280600b81526020017f704d696e4465706f736974000000000000000000000000000000000000000000815250611108565b915084846040516020018083805190602001908083835b6020831015156122cf57805182526020820191506020810190506020830392506122aa565b6001836020036101000a038019825116818451168082178552505050505050905001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561233f578051825260208201915060208101905060208303925061231a565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905060405160200180807f64697370656e736174696f6e5063740000000000000000000000000000000000815250600f0190506040516020818303038152906040526040518082805190602001908083835b6020831015156123e357805182526020820191506020810190506020830392506123be565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b60208310151561244d5780518252602082019150602081019050602083039250612428565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156124b65780518252602082019150602081019050602083039250612491565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161480612669575060405160200180807f7044697370656e736174696f6e5063740000000000000000000000000000000081525060100190506040516020818303038152906040526040518082805190602001908083835b602083101515612563578051825260208201915060208101905060208303925061253e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b6020831015156125cd57805182526020820191506020810190506020830392506125a8565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156126365780518252602082019150602081019050602083039250612611565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916145b1561267f576064841115151561267e57600080fd5b5b61268881610fae565b15151561269457600080fd5b8361269e86611108565b141515156126ab57600080fd5b60e0604051908101604052806127076126f86040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b8152602001600081526020018381526020018681526020013373ffffffffffffffffffffffffffffffffffffffff16815260200161283d60055461282f6127826040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b6128216127c36040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b6128136128046040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b815260200185815250600260008360001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020155606082015181600301908051906020019061289b9291906135f5565b5060808201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060a0820151816005015560c08201518160060155905050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156129f357600080fd5b505af1158015612a07573d6000803e3d6000fd5b505050506040513d6020811015612a1d57600080fd5b81019080805190602001909291905050501515612a3957600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167fb25bdef16105f099e5c185f9c7fd969571e8e0caa3f7bd75409512fe0a41a60b868684866002600088600019166000191681526020019081526020016000206000015460405180806020018681526020018560001916600019168152602001848152602001838152602001828103825287818151815260200191508051906020019080838360005b83811015612af4578082015181840152602081019050612ad9565b50505050905090810190601f168015612b215780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a2809250505092915050565b6000612b47613559565b60026000846000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612c255780601f10612bfa57610100808354040283529160200191612c25565b820191906000526020600020905b815481529060010190602001808311612c0857829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509050806000015142118015612cb057508060a0015142105b8015612cc0575060008160200151145b915050919050565b60006020528060005260406000206000915090505481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600080846040516020018082805190602001908083835b602083101515612d695780518252602082019150602081019050602083039250612d44565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515612dd25780518252602082019150602081019050602083039250612dad565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b612e25613559565b60008060026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612f065780601f10612edb57610100808354040283529160200191612f06565b820191906000526020600020905b815481529060010190602001808311612ee957829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200160058201548152602001600682015481525050925060016000846020015181526020019081526020016000209150612fa18360200151610fd8565b9050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a684602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561303857600080fd5b505af115801561304c573d6000803e3d6000fd5b505050506040513d602081101561306257600080fd5b8101908080519060200190929190505050826003018190555060018260010160146101000a81548160ff021916908315150217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16634940318384602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561312d57600080fd5b505af1158015613141573d6000803e3d6000fd5b505050506040513d602081101561315757600080fd5b8101908080519060200190929190505050156132f157428360a00151111561318c5761318b83606001518460c00151612d2c565b5b826020015184600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c184600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8460800151836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156132a657600080fd5b505af11580156132ba573d6000803e3d6000fd5b505050506040513d60208110156132d057600080fd5b810190808051906020019092919050505015156132ec57600080fd5b613488565b826020015184600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe684600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb600160008660200151815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561344157600080fd5b505af1158015613455573d6000803e3d6000fd5b505050506040513d602081101561346b57600080fd5b8101908080519060200190929190505050151561348757600080fd5b5b50505050565b600081830190508281101515156134a157fe5b80905092915050565b60008282111515156134b857fe5b818303905092915050565b6000808314156134d657600090506134f5565b81830290508183828115156134e757fe5b041415156134f157fe5b8090505b92915050565b6000818381151561350857fe5b04905092915050565b50805460018160011615610100020316600290046000825580601f106135375750613556565b601f0160209004906000526020600020908101906135559190613675565b5b50565b60e06040519081016040528060008152602001600081526020016000815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081525090565b60a06040519081016040528060008152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200160008152602001600081525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061363657805160ff1916838001178555613664565b82800160010185558215613664579182015b82811115613663578251825591602001919060010190613648565b5b5090506136719190613675565b5090565b61369791905b8082111561369357600081600090555060010161367b565b5090565b905600a165627a7a72305820b56902304e03050844a67f14400cd7039bc3123b20270b9fd90d5971122555750029", - "deployedBytecode": "0x6080604052600436106100f0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806229514f146100f557806330490e911461012057806332ed5b12146101515780633530099014610251578063504115521461029a578063693ec85e146102db57806377609a41146103585780638240ae4b146103a157806386bb8f37146103e65780638f1d37761461041d578063a5ba3b1e146104aa578063a7aad3db1461050f578063bade1c541461057a578063c51131fb14610609578063dc6ab52714610652578063fc0c546a14610697578063fce1ccca146106ee575b600080fd5b34801561010157600080fd5b5061010a610745565b6040518082815260200191505060405180910390f35b34801561012c57600080fd5b5061014f600480360381019080803560001916906020019092919050505061074b565b005b34801561015d57600080fd5b506101806004803603810190808035600019169060200190929190505050610eb4565b60405180888152602001878152602001868152602001806020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001848152602001838152602001828103825286818151815260200191508051906020019080838360005b838110156102105780820151818401526020810190506101f5565b50505050905090810190601f16801561023d5780820380516001836020036101000a031916815260200191505b509850505050505050505060405180910390f35b34801561025d57600080fd5b506102806004803603810190808035600019169060200190929190505050610fae565b604051808215151515815260200191505060405180910390f35b3480156102a657600080fd5b506102c560048036038101908080359060200190929190505050610fd8565b6040518082815260200191505060405180910390f35b3480156102e757600080fd5b50610342600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050611108565b6040518082815260200191505060405180910390f35b34801561036457600080fd5b5061038760048036038101908080356000191690602001909291905050506111fa565b604051808215151515815260200191505060405180910390f35b3480156103ad57600080fd5b506103d06004803603810190808035600019169060200190929190505050611510565b6040518082815260200191505060405180910390f35b3480156103f257600080fd5b5061041b6004803603810190808035906020019092919080359060200190929190505050611c50565b005b34801561042957600080fd5b5061044860048036038101908080359060200190929190505050612026565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b3480156104b657600080fd5b506104f560048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612089565b604051808215151515815260200191505060405180910390f35b34801561051b57600080fd5b50610564600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291905050506120f4565b6040518082815260200191505060405180910390f35b34801561058657600080fd5b506105eb600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929080359060200190929190505050612250565b60405180826000191660001916815260200191505060405180910390f35b34801561061557600080fd5b506106386004803603810190808035600019169060200190929190505050612b3d565b604051808215151515815260200191505060405180910390f35b34801561065e57600080fd5b506106816004803603810190808035600019169060200190929190505050612cc8565b6040518082815260200191505060405180910390f35b3480156106a357600080fd5b506106ac612ce0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156106fa57600080fd5b50610703612d06565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60055481565b600080600060026000856000191660001916815260200190815260200160002092508260040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506107a484612b3d565b15610aad57610853836003018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108445780601f1061081957610100808354040283529160200191610844565b820191906000526020600020905b81548152906001019060200180831161082757829003601f168201915b50505050508460060154612d2c565b83600019167f37f3986c71e1aa2c470cfc4a92af70820610c3065589d35ef1664ea27f3e73a584600301856006015460405180806020018381526020018281038252848181546001816001161561010002031660029004815260200191508054600181600116156101000203166002900480156109115780601f106108e657610100808354040283529160200191610911565b820191906000526020600020905b8154815290600101906020018083116108f457829003601f168201915b5050935050505060405180910390a2600260008560001916600019168152602001908152602001600020600080820160009055600182016000905560028201600090556003820160006109649190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610a6257600080fd5b505af1158015610a76573d6000803e3d6000fd5b505050506040513d6020811015610a8c57600080fd5b81019080805190602001909291905050501515610aa857600080fd5b610c9a565b610ab6846111fa565b15610ac957610ac484612e1d565b610c99565b8260050154421115610c935783600019167f29026cb2acebe6d0a4b6d593ccadf76e3fc6d0a02254e078b0c4a619608089d760405160405180910390a260026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610b4a9190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610c4857600080fd5b505af1158015610c5c573d6000803e3d6000fd5b505050506040513d6020811015610c7257600080fd5b81019080805190602001909291905050501515610c8e57600080fd5b610c98565b600080fd5b5b5b6064610cda6040805190810160405280600f81526020017f64697370656e736174696f6e5063740000000000000000000000000000000000815250611108565b11151515610ce457fe5b6064610d246040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611108565b11151515610d2e57fe5b610e30600554610e22610d756040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b610e14610db66040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b610e06610df76040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b5060026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610e759190613511565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560058201600090556006820160009055505050505050565b6002602052806000526040600020600091509050806000015490806001015490806002015490806003018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610f725780601f10610f4757610100808354040283529160200191610f72565b820191906000526020600020905b815481529060010190602001808311610f5557829003601f168201915b5050505050908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050154908060060154905087565b60008060026000846000191660001916815260200190815260200160002060050154119050919050565b600080600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561106c57600080fd5b505af1158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b810190808051906020019092919050505014156110ce5760016000838152602001908152602001600020600201546002029050611103565b600160008381526020019081526020016000206000015460016000848152602001908152602001600020600201546002020390505b919050565b6000806000836040516020018082805190602001908083835b6020831015156111465780518252602082019150602081019050602083039250611121565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156111af578051825260208201915060208101905060208303925061118a565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020549050919050565b6000611204613559565b61120c6135ad565b60026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156112ea5780601f106112bf576101008083540402835291602001916112ea565b820191906000526020600020905b8154815290600101906020018083116112cd57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509150600160008360200151815260200190815260200160002060a06040519081016040529081600082015481526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160149054906101000a900460ff161515151581526020016002820154815260200160038201548152505090506000826020015111801561142f57506000151581604001511515145b80156115075750600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee68483083602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156114cb57600080fd5b505af11580156114df573d6000803e3d6000fd5b505050506040513d60208110156114f557600080fd5b81019080805190602001909291905050505b92505050919050565b600061151a613559565b60008060008060026000886000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156115fe5780601f106115d3576101008083540402835291602001916115fe565b820191906000526020600020905b8154815290600101906020018083116115e157829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016005820154815260200160068201548152505094508460400151935061168387610fae565b8015611693575060008560200151145b151561169e57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d6061171a6040805190810160405280600b81526020017f70566f746551756f72756d000000000000000000000000000000000000000000815250611108565b6117586040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b6117966040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b1580156117f657600080fd5b505af115801561180a573d6000803e3d6000fd5b505050506040513d602081101561182057600080fd5b8101908080519060200190929190505050925060a0604051908101604052806118ac606461189e88611890606461188b6040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611108565b6134aa565b6134c390919063ffffffff16565b6134fb90919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020018581526020016000815250600160008581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508260026000896000191660001916815260200190815260200160002060010181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611a9857600080fd5b505af1158015611aac573d6000803e3d6000fd5b505050506040513d6020811015611ac257600080fd5b81019080805190602001909291905050501515611ade57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b158015611b6f57600080fd5b505af1158015611b83573d6000803e3d6000fd5b505050506040513d60a0811015611b9957600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1687600019167fe94e3086c4bfe84acba4437b85a80fca3721dfc419d1f7afe4fa4e470e670b4885858560405180848152602001838152602001828152602001935050505060405180910390a38295505050505050919050565b600080600015156001600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cc657600080fd5b600115156001600086815260200190815260200160002060010160149054906101000a900460ff161515141515611cfc57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611dc957600080fd5b505af1158015611ddd573d6000803e3d6000fd5b505050506040513d6020811015611df357600080fd5b81019080805190602001909291905050509150611e113385856120f4565b9050816001600086815260200190815260200160002060030160008282540392505081905550806001600086815260200190815260200160002060000160008282540392505081905550600180600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611fda57600080fd5b505af1158015611fee573d6000803e3d6000fd5b505050506040513d602081101561200457600080fd5b8101908080519060200190929190505050151561202057600080fd5b50505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b60006001600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000806000806001600087815260200190815260200160002060030154925060016000878152602001908152602001600020600001549150600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b1580156121f957600080fd5b505af115801561220d573d6000803e3d6000fd5b505050506040513d602081101561222357600080fd5b810190808051906020019092919050505090508282820281151561224357fe5b0493505050509392505050565b60008060006122936040805190810160405280600b81526020017f704d696e4465706f736974000000000000000000000000000000000000000000815250611108565b915084846040516020018083805190602001908083835b6020831015156122cf57805182526020820191506020810190506020830392506122aa565b6001836020036101000a038019825116818451168082178552505050505050905001828152602001925050506040516020818303038152906040526040518082805190602001908083835b60208310151561233f578051825260208201915060208101905060208303925061231a565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905060405160200180807f64697370656e736174696f6e5063740000000000000000000000000000000000815250600f0190506040516020818303038152906040526040518082805190602001908083835b6020831015156123e357805182526020820191506020810190506020830392506123be565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b60208310151561244d5780518252602082019150602081019050602083039250612428565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156124b65780518252602082019150602081019050602083039250612491565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161480612669575060405160200180807f7044697370656e736174696f6e5063740000000000000000000000000000000081525060100190506040516020818303038152906040526040518082805190602001908083835b602083101515612563578051825260208201915060208101905060208303925061253e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b6020831015156125cd57805182526020820191506020810190506020830392506125a8565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156126365780518252602082019150602081019050602083039250612611565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916145b1561267f576064841115151561267e57600080fd5b5b61268881610fae565b15151561269457600080fd5b8361269e86611108565b141515156126ab57600080fd5b60e0604051908101604052806127076126f86040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b8152602001600081526020018381526020018681526020013373ffffffffffffffffffffffffffffffffffffffff16815260200161283d60055461282f6127826040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611108565b6128216127c36040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611108565b6128136128046040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611108565b4261348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b61348e90919063ffffffff16565b815260200185815250600260008360001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020155606082015181600301908051906020019061289b9291906135f5565b5060808201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060a0820151816005015560c08201518160060155905050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156129f357600080fd5b505af1158015612a07573d6000803e3d6000fd5b505050506040513d6020811015612a1d57600080fd5b81019080805190602001909291905050501515612a3957600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167fb25bdef16105f099e5c185f9c7fd969571e8e0caa3f7bd75409512fe0a41a60b868684866002600088600019166000191681526020019081526020016000206000015460405180806020018681526020018560001916600019168152602001848152602001838152602001828103825287818151815260200191508051906020019080838360005b83811015612af4578082015181840152602081019050612ad9565b50505050905090810190601f168015612b215780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a2809250505092915050565b6000612b47613559565b60026000846000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612c255780601f10612bfa57610100808354040283529160200191612c25565b820191906000526020600020905b815481529060010190602001808311612c0857829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509050806000015142118015612cb057508060a0015142105b8015612cc0575060008160200151145b915050919050565b60006020528060005260406000206000915090505481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600080846040516020018082805190602001908083835b602083101515612d695780518252602082019150602081019050602083039250612d44565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515612dd25780518252602082019150602081019050602083039250612dad565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b612e25613559565b60008060026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612f065780601f10612edb57610100808354040283529160200191612f06565b820191906000526020600020905b815481529060010190602001808311612ee957829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200160058201548152602001600682015481525050925060016000846020015181526020019081526020016000209150612fa18360200151610fd8565b9050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a684602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561303857600080fd5b505af115801561304c573d6000803e3d6000fd5b505050506040513d602081101561306257600080fd5b8101908080519060200190929190505050826003018190555060018260010160146101000a81548160ff021916908315150217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16634940318384602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561312d57600080fd5b505af1158015613141573d6000803e3d6000fd5b505050506040513d602081101561315757600080fd5b8101908080519060200190929190505050156132f157428360a00151111561318c5761318b83606001518460c00151612d2c565b5b826020015184600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c184600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8460800151836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156132a657600080fd5b505af11580156132ba573d6000803e3d6000fd5b505050506040513d60208110156132d057600080fd5b810190808051906020019092919050505015156132ec57600080fd5b613488565b826020015184600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe684600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb600160008660200151815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561344157600080fd5b505af1158015613455573d6000803e3d6000fd5b505050506040513d602081101561346b57600080fd5b8101908080519060200190929190505050151561348757600080fd5b5b50505050565b600081830190508281101515156134a157fe5b80905092915050565b60008282111515156134b857fe5b818303905092915050565b6000808314156134d657600090506134f5565b81830290508183828115156134e757fe5b041415156134f157fe5b8090505b92915050565b6000818381151561350857fe5b04905092915050565b50805460018160011615610100020316600290046000825580601f106135375750613556565b601f0160209004906000526020600020908101906135559190613675565b5b50565b60e06040519081016040528060008152602001600081526020016000815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081525090565b60a06040519081016040528060008152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200160008152602001600081525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061363657805160ff1916838001178555613664565b82800160010185558215613664579182015b82811115613663578251825591602001919060010190613648565b5b5090506136719190613675565b5090565b61369791905b8082111561369357600081600090555060010161367b565b5090565b905600a165627a7a72305820b56902304e03050844a67f14400cd7039bc3123b20270b9fd90d5971122555750029", - "sourceMap": "101:14625:5:-;;;1964:6;1940:30;;3216:957;8:9:-1;5:2;;;30:1;27;20:12;5:2;3216:957:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3612:10;3598:5;;:25;;;;;;;;;;;;;;;;;;3649:9;3629:6;;:30;;;;;;;;;;;;;;;;;;3666;;;;;;;;;;;;;;;;;;;3684:11;3666:3;;;:30;;;:::i;:::-;3702:32;;;;;;;;;;;;;;;;;;;3721:12;3702:3;;;:32;;;:::i;:::-;3740:36;;;;;;;;;;;;;;;;;;;3761:14;3740:3;;;:36;;;:::i;:::-;3782:38;;;;;;;;;;;;;;;;;;;3804:15;3782:3;;;:38;;;:::i;:::-;3826;;;;;;;;;;;;;;;;;;;3848:15;3826:3;;;:38;;;:::i;:::-;3870:40;;;;;;;;;;;;;;;;;;;3893:16;3870:3;;;:40;;;:::i;:::-;3916:38;;;;;;;;;;;;;;;;;;;3938:15;3916:3;;;:38;;;:::i;:::-;3960:40;;;;;;;;;;;;;;;;;;;3983:16;3960:3;;;:40;;;:::i;:::-;4006;;;;;;;;;;;;;;;;;;;4029:16;4006:3;;;:40;;;:::i;:::-;4052:42;;;;;;;;;;;;;;;;;;;4076:17;4052:3;;;:42;;;:::i;:::-;4100:30;;;;;;;;;;;;;;;;;;;4118:11;4100:3;;;:30;;;:::i;:::-;4136:32;;;;;;;;;;;;;;;;;;;4155:12;4136:3;;;:32;;;:::i;:::-;3216:957;;;;;;;;;;;;;;101:14625;;14614:110;14713:6;14668;:42;14702:5;14685:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14685:23:5;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;14685:23:5;;;14675:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14675:34:5;;;;;;;;;;;;;;;;14668:42;;;;;;;;;;;;;;;;;:51;;;;14614:110;;:::o;101:14625::-;;;;;;;", - "deployedSourceMap": "101:14625:5:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1940:30;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1940:30:5;;;;;;;;;;;;;;;;;;;;;;;7183:1608;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7183:1608:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:50;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1813:50:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;1813:50:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11319:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11319:114:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12069:370;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12069:370:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12595:120;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12595:120:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11600:301;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11600:301:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5829:1059;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5829:1059:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9016:903;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9016:903:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1707:44;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1707:44:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12930:145;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12930:145:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10375:363;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10375:363:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4468:1220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4468:1220:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10955:204;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10955:204:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1612:38;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1612:38:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1890:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1890:18:5;;;;;;;;;;;;;;;;;;;;;;;;;;;1912:24;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1912:24:5;;;;;;;;;;;;;;;;;;;;;;;;;;;1940:30;;;;:::o;7183:1608::-;7238:26;7291:17;7327:16;7267:9;:18;7277:7;7267:18;;;;;;;;;;;;;;;;;7238:47;;7311:4;:10;;;;;;;;;;;;7291:30;;7346:4;:12;;;7327:31;;7539:17;7548:7;7539:8;:17::i;:::-;7535:920;;;7727:26;7731:4;:9;;7727:26;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7742:4;:10;;;7727:3;:26::i;:::-;7784:7;7766:49;;;;7793:4;:9;;7804:4;:10;;;7766:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7830:9;:18;7840:7;7830:18;;;;;;;;;;;;;;;;;;7823:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7864:5;;;;;;;;;;;:14;;;7879:9;7890:11;7864:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7864:38:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7864:38:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7864:38:5;;;;;;;;;;;;;;;;7856:47;;;;;;;;7535:920;;;7920:31;7943:7;7920:22;:31::i;:::-;7916:539;;;8013:25;8030:7;8013:16;:25::i;:::-;7916:539;;;8061:4;:14;;;8055:3;:20;8051:404;;;8195:7;8178:25;;;;;;;;;;;;;8218:9;:18;8228:7;8218:18;;;;;;;;;;;;;;;;;;8211:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8252:5;;;;;;;;;;;:14;;;8267:9;8278:11;8252:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8252:38:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8252:38:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;8252:38:5;;;;;;;;;;;;;;;;8244:47;;;;;;;;8051:404;;;8440:8;;;8051:404;7916:539;7535:920;8494:3;8468:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;:29;;8461:37;;;;;;8538:3;8511:23;;;;;;;;;;;;;;;;;;;:3;:23::i;:::-;:30;;8504:38;;;;;;8632:122;8744:9;;8632:100;8709:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;8632:65;8674:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;8632:30;8640:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;8632:3;:7;;:30;;;;:::i;:::-;:41;;:65;;;;:::i;:::-;:76;;:100;;;;:::i;:::-;:111;;:122;;;;:::i;:::-;;8768:9;:18;8778:7;8768:18;;;;;;;;;;;;;;;;;;8761:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7183:1608;;;;:::o;1813:50::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;11319:114::-;11377:4;11427:1;11396:9;:18;11406:7;11396:18;;;;;;;;;;;;;;;;;:28;;;:32;11389:39;;11319:114;;;:::o;12069:370::-;12140:4;12219:1;12156:6;;;;;;;;;;;:45;;;12202:12;12156:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12156:59:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12156:59:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;12156:59:5;;;;;;;;;;;;;;;;:64;12152:195;;;12310:10;:24;12321:12;12310:24;;;;;;;;;;;:30;;;12306:1;:34;12299:41;;;;12152:195;12399:10;:24;12410:12;12399:24;;;;;;;;;;;:35;;;12365:10;:24;12376:12;12365:24;;;;;;;;;;;:30;;;12361:1;:34;12360:74;12353:81;;12069:370;;;;:::o;12595:120::-;12643:10;12668:6;:42;12702:5;12685:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12685:23:5;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12685:23:5;;;12675:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12675:34:5;;;;;;;;;;;;;;;;12668:42;;;;;;;;;;;;;;;;;;12661:49;;12595:120;;;:::o;11600:301::-;11670:4;11682:25;;:::i;:::-;11734:26;;:::i;:::-;11710:9;:18;11720:7;11710:18;;;;;;;;;;;;;;;;;11682:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11763:10;:28;11774:4;:16;;;11763:28;;;;;;;;;;;11734:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11825:1;11806:4;:16;;;:20;:51;;;;;11852:5;11830:27;;:9;:18;;;:27;;;11806:51;:89;;;;;11861:6;;;;;;;;;;;:16;;;11878:4;:16;;;11861:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11861:34:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11861:34:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11861:34:5;;;;;;;;;;;;;;;;11806:89;11798:98;;11600:301;;;;;:::o;5829:1059::-;5899:16;5923:25;;:::i;:::-;5975:12;6086:11;6639:18;6663;5951:9;:18;5961:7;5951:18;;;;;;;;;;;;;;;;;5923:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5990:4;:12;;;5975:27;;6017:19;6028:7;6017:10;:19::i;:::-;:44;;;;;6060:1;6040:4;:16;;;:21;6017:44;6009:53;;;;;;;;6100:6;;;;;;;;;;;:16;;;6124:18;;;;;;;;;;;;;;;;;;;:3;:18::i;:::-;6150:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;6180;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;6100:108;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6100:108:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6100:108:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6100:108:5;;;;;;;;;;;;;;;;6086:122;;6236:200;;;;;;;;;6296:64;6356:3;6296:55;6343:7;6296:42;6309:3;6314:23;;;;;;;;;;;;;;;;;;;:3;:23::i;:::-;6296:12;:42::i;:::-;:46;;:55;;;;:::i;:::-;:59;;:64;;;;:::i;:::-;6236:200;;;;6266:10;6236:200;;;;;;6400:5;6236:200;;;;;;6375:7;6236:200;;;;6428:1;6236:200;;;6215:10;:18;6226:6;6215:18;;;;;;;;;;;:221;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6476:6;6443:9;:18;6453:7;6443:18;;;;;;;;;;;;;;;;;:30;;:39;;;;6586:5;;;;;;;;;;;:18;;;6605:10;6617:4;6623:7;6586:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6586:45:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6586:45:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6586:45:5;;;;;;;;;;;;;;;;6578:54;;;;;;;;6721:6;;;;;;;;;;;:14;;;6736:6;6721:22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6721:22:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6721:22:5;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;6721:22:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6687:56;;;;;;;;;;;;;;6847:10;6755:108;;6776:7;6755:108;;;;6791:6;6805:13;6826;6755:108;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6877:6;6870:13;;5829:1059;;;;;;;;:::o;9016:903::-;9303:16;9387:11;9234:5;9182:57;;:10;:24;9193:12;9182:24;;;;;;;;;;;:36;;:48;9219:10;9182:48;;;;;;;;;;;;;;;;;;;;;;;;;:57;;;9174:66;;;;;;;;9291:4;9254:41;;:10;:24;9265:12;9254:24;;;;;;;;;;;:33;;;;;;;;;;;;:41;;;9246:50;;;;;;;;9322:6;;;;;;;;;;;:26;;;9349:10;9361:12;9375:5;9322:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9322:59:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9322:59:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9322:59:5;;;;;;;;;;;;;;;;9303:78;;9401:44;9413:10;9425:12;9439:5;9401:11;:44::i;:::-;9387:58;;9632:11;9590:10;:24;9601:12;9590:24;;;;;;;;;;;:38;;;:53;;;;;;;;;;;9688:6;9649:10;:24;9660:12;9649:24;;;;;;;;;;;:35;;;:45;;;;;;;;;;;9801:4;9750:10;:24;9761:12;9750:24;;;;;;;;;;;:36;;:48;9787:10;9750:48;;;;;;;;;;;;;;;;:55;;;;;;;;;;;;;;;;;;9854:10;9817:48;;9832:12;9817:48;9846:6;9817:48;;;;;;;;;;;;;;;;;;9879:5;;;;;;;;;;;:14;;;9894:10;9906:6;9879:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9879:34:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9879:34:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9879:34:5;;;;;;;;;;;;;;;;9871:43;;;;;;;;9016:903;;;;:::o;1707:44::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;12930:145::-;13007:4;13026:10;:24;13037:12;13026:24;;;;;;;;;;;:36;;:44;13063:6;13026:44;;;;;;;;;;;;;;;;;;;;;;;;;13019:51;;12930:145;;;;:::o;10375:363::-;10466:4;10480:18;10545:15;10604:16;10501:10;:24;10512:12;10501:24;;;;;;;;;;;:38;;;10480:59;;10563:10;:24;10574:12;10563:24;;;;;;;;;;;:35;;;10545:53;;10623:6;;;;;;;;;;;:26;;;10650:6;10658:12;10672:5;10623:55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10623:55:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10623:55:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;10623:55:5;;;;;;;;;;;;;;;;10604:74;;10720:13;10706:10;10692:11;:24;10691:42;;;;;;;;10684:49;;10375:363;;;;;;;;:::o;4468:1220::-;4546:7;4561:12;4600:14;4576:18;;;;;;;;;;;;;;;;;;;:3;:18::i;:::-;4561:33;;4644:5;4651:6;4627:31;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4627:31:5;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4627:31:5;;;4617:42;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4617:42:5;;;;;;;;;;;;;;;;4600:59;;4718:35;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4718:35:5;;;4708:46;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4708:46:5;;;;;;;;;;;;;;;;4670:84;;;4697:5;4680:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4680:23:5;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4680:23:5;;;4670:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4670:34:5;;;;;;;;;;;;;;;;:84;;;;:180;;;;4813:36;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4813:36:5;;;4803:47;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4803:47:5;;;;;;;;;;;;;;;;4765:85;;;4792:5;4775:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4775:23:5;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4775:23:5;;;4765:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4765:34:5;;;;;;;;;;;;;;;;:85;;;;4670:180;4666:223;;;4878:3;4868:6;:13;;4860:22;;;;;;;;4666:223;4904:18;4915:6;4904:10;:18::i;:::-;4903:19;4895:28;;;;;;;;4981:6;4967:10;4971:5;4967:3;:10::i;:::-;:20;;4959:29;;;;;;;;5089:328;;;;;;;;;5122:30;5130:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;5122:3;:7;;:30;;;;:::i;:::-;5089:328;;;;5173:1;5089:328;;;;5191:7;5089:328;;;;5212:5;5089:328;;;;5232:10;5089:328;;;;;;5261:128;5379:9;;5261:104;5342:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;5261:67;5305:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;5261:30;5269:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;5261:3;:7;;:30;;;;:::i;:::-;:43;;:67;;;;:::i;:::-;:80;;:104;;;;:::i;:::-;:117;;:128;;;;:::i;:::-;5089:328;;;;5404:6;5089:328;;;5069:9;:17;5079:6;5069:17;;;;;;;;;;;;;;;;;:348;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5432:5;;;;;;;;;;;:18;;;5451:10;5463:4;5469:7;5432:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5432:45:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5432:45:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5432:45:5;;;;;;;;;;;;;;;;5424:54;;;;;;;;5647:10;5521:142;;;5556:5;5569:6;5583;5597:7;5612:9;:17;5622:6;5612:17;;;;;;;;;;;;;;;;;:27;;;5521:142;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;5521:142:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5677:6;5670:13;;4468:1220;;;;;;:::o;10955:204::-;11011:4;11023:25;;:::i;:::-;11051:9;:18;11061:7;11051:18;;;;;;;;;;;;;;;;;11023:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11090:4;:14;;;11084:3;:20;:44;;;;;11114:4;:14;;;11108:3;:20;11084:44;:69;;;;;11152:1;11132:4;:16;;;:21;11084:69;11076:78;;10955:204;;;;:::o;1612:38::-;;;;;;;;;;;;;;;;;:::o;1890:18::-;;;;;;;;;;;;;:::o;1912:24::-;;;;;;;;;;;;;:::o;14614:110::-;14713:6;14668;:42;14702:5;14685:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14685:23:5;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;14685:23:5;;;14675:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14675:34:5;;;;;;;;;;;;;;;;14668:42;;;;;;;;;;;;;;;;;:51;;;;14614:110;;:::o;13352:1076::-;13409:25;;:::i;:::-;13461:27;13611:11;13437:9;:18;13447:7;13437:18;;;;;;;;;;;;;;;;;13409:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13491:10;:28;13502:4;:16;;;13491:28;;;;;;;;;;;13461:58;;13625:39;13647:4;:16;;;13625:21;:39::i;:::-;13611:53;;13697:6;;;;;;;;;;;:45;;;13743:4;:16;;;13697:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13697:63:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13697:63:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13697:63:5;;;;;;;;;;;;;;;;13671:9;:23;;:89;;;;13787:4;13766:9;:18;;;:25;;;;;;;;;;;;;;;;;;13802:6;;;;;;;;;;;:15;;;13818:4;:16;;;13802:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13802:33:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13802:33:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13802:33:5;;;;;;;;;;;;;;;;13798:626;;;13890:3;13873:4;:14;;;:20;13869:71;;;13905:26;13909:4;:9;;;13920:4;:10;;;13905:3;:26::i;:::-;13869:71;13995:4;:16;;;13978:7;13952:130;;;;14021:9;:20;;;14051:9;:23;;;13952:130;;;;;;;;;;;;;;;;;;;;;;;;14099:5;;;;;;;;;;;:14;;;14114:4;:10;;;14126:6;14099:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14099:34:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14099:34:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14099:34:5;;;;;;;;;;;;;;;;14091:43;;;;;;;;13798:626;;;14249:4;:16;;;14232:7;14203:133;;;;14275:9;:20;;;14305:9;:23;;;14203:133;;;;;;;;;;;;;;;;;;;;;;;;14353:5;;;;;;;;;;;:14;;;14368:10;:28;14379:4;:16;;;14368:28;;;;;;;;;;;:39;;;;;;;;;;;;14409:6;14353:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14353:63:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14353:63:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14353:63:5;;;;;;;;;;;;;;;;14345:72;;;;;;;;13798:626;13352:1076;;;;:::o;1213:123:7:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;1041:110::-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;202:373::-;260:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;531:1;527;:5;523:9;;554:1;549;545;:5;;;;;;;;:10;538:18;;;;;;569:1;562:8;;202:373;;;;;:::o;657:272::-;715:7;923:1;919;:5;;;;;;;;912:12;;657:272;;;;:::o;101:14625:5:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o", - "source": "pragma solidity 0.4.24;\n\nimport \"./PLCRVoting.sol\";\nimport \"./ERC20.sol\";\nimport \"./SafeMath.sol\";\n\n\ncontract Parameterizer {\n\n // ------\n // EVENTS\n // ------\n\n event _ReparameterizationProposal(string name, uint value, bytes32 propID, uint deposit, uint appEndDate, address indexed proposer);\n event _NewChallenge(bytes32 indexed propID, uint challengeID, uint commitEndDate, uint revealEndDate, address indexed challenger);\n event _ProposalAccepted(bytes32 indexed propID, string name, uint value);\n event _ProposalExpired(bytes32 indexed propID);\n event _ChallengeSucceeded(bytes32 indexed propID, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _ChallengeFailed(bytes32 indexed propID, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _RewardClaimed(uint indexed challengeID, uint reward, address indexed voter);\n\n\n // ------\n // DATA STRUCTURES\n // ------\n\n using SafeMath for uint;\n\n struct ParamProposal {\n uint appExpiry;\n uint challengeID;\n uint deposit;\n string name;\n address owner;\n uint processBy;\n uint value;\n }\n\n struct Challenge {\n uint rewardPool; // (remaining) pool of tokens distributed amongst winning voters\n address challenger; // owner of Challenge\n bool resolved; // indication of if challenge is resolved\n uint stake; // number of tokens at risk for either party during challenge\n uint winningTokens; // (remaining) amount of tokens used for voting by the winning side\n mapping(address => bool) tokenClaims;\n }\n\n // ------\n // STATE\n // ------\n\n mapping(bytes32 => uint) public params;\n\n // maps challengeIDs to associated challenge data\n mapping(uint => Challenge) public challenges;\n\n // maps pollIDs to intended data change if poll passes\n mapping(bytes32 => ParamProposal) public proposals;\n\n // Global Variables\n ERC20 public token;\n PLCRVoting public voting;\n uint public PROCESSBY = 604800; // 7 days\n\n // ------------\n // CONSTRUCTOR\n // ------------\n\n /**\n @dev constructor\n @param _tokenAddr address of the token which parameterizes this system\n @param _plcrAddr address of a PLCR voting contract for the provided token\n @param _minDeposit minimum deposit for listing to be whitelisted\n @param _pMinDeposit minimum deposit to propose a reparameterization\n @param _applyStageLen period over which applicants wait to be whitelisted\n @param _pApplyStageLen period over which reparmeterization proposals wait to be processed\n @param _dispensationPct percentage of losing party's deposit distributed to winning party\n @param _pDispensationPct percentage of losing party's deposit distributed to winning party in parameterizer\n @param _commitStageLen length of commit period for voting\n @param _pCommitStageLen length of commit period for voting in parameterizer\n @param _revealStageLen length of reveal period for voting\n @param _pRevealStageLen length of reveal period for voting in parameterizer\n @param _voteQuorum type of majority out of 100 necessary for vote success\n @param _pVoteQuorum type of majority out of 100 necessary for vote success in parameterizer\n */\n constructor(\n address _tokenAddr,\n address _plcrAddr,\n uint _minDeposit,\n uint _pMinDeposit,\n uint _applyStageLen,\n uint _pApplyStageLen,\n uint _commitStageLen,\n uint _pCommitStageLen,\n uint _revealStageLen,\n uint _pRevealStageLen,\n uint _dispensationPct,\n uint _pDispensationPct,\n uint _voteQuorum,\n uint _pVoteQuorum\n ) public\n {\n token = ERC20(_tokenAddr);\n voting = PLCRVoting(_plcrAddr);\n\n set(\"minDeposit\", _minDeposit);\n set(\"pMinDeposit\", _pMinDeposit);\n set(\"applyStageLen\", _applyStageLen);\n set(\"pApplyStageLen\", _pApplyStageLen);\n set(\"commitStageLen\", _commitStageLen);\n set(\"pCommitStageLen\", _pCommitStageLen);\n set(\"revealStageLen\", _revealStageLen);\n set(\"pRevealStageLen\", _pRevealStageLen);\n set(\"dispensationPct\", _dispensationPct);\n set(\"pDispensationPct\", _pDispensationPct);\n set(\"voteQuorum\", _voteQuorum);\n set(\"pVoteQuorum\", _pVoteQuorum);\n }\n\n // -----------------------\n // TOKEN HOLDER INTERFACE\n // -----------------------\n\n /**\n @notice propose a reparamaterization of the key _name's value to _value.\n @param _name the name of the proposed param to be set\n @param _value the proposed value to set the param to be set\n */\n function proposeReparameterization(string _name, uint _value) public returns (bytes32) {\n uint deposit = get(\"pMinDeposit\");\n bytes32 propID = keccak256(abi.encodePacked(_name, _value));\n\n if (keccak256(abi.encodePacked(_name)) == keccak256(abi.encodePacked(\"dispensationPct\")) ||\n keccak256(abi.encodePacked(_name)) == keccak256(abi.encodePacked(\"pDispensationPct\"))) {\n require(_value <= 100);\n }\n\n require(!propExists(propID)); // Forbid duplicate proposals\n require(get(_name) != _value); // Forbid NOOP reparameterizations\n\n // attach name and value to pollID\n proposals[propID] = ParamProposal({\n appExpiry: now.add(get(\"pApplyStageLen\")),\n challengeID: 0,\n deposit: deposit,\n name: _name,\n owner: msg.sender,\n processBy: now.add(get(\"pApplyStageLen\"))\n .add(get(\"pCommitStageLen\"))\n .add(get(\"pRevealStageLen\"))\n .add(PROCESSBY),\n value: _value\n });\n\n require(token.transferFrom(msg.sender, this, deposit)); // escrow tokens (deposit amt)\n\n emit _ReparameterizationProposal(\n _name,\n _value,\n propID,\n deposit,\n proposals[propID].appExpiry,\n msg.sender\n );\n\n return propID;\n }\n\n /**\n @notice challenge the provided proposal ID, and put tokens at stake to do so.\n @param _propID the proposal ID to challenge\n */\n function challengeReparameterization(bytes32 _propID) public returns (uint challengeID) {\n ParamProposal memory prop = proposals[_propID];\n uint deposit = prop.deposit;\n\n require(propExists(_propID) && prop.challengeID == 0);\n\n //start poll\n uint pollID = voting.startPoll(\n get(\"pVoteQuorum\"),\n get(\"pCommitStageLen\"),\n get(\"pRevealStageLen\")\n );\n\n challenges[pollID] = Challenge({\n challenger: msg.sender,\n rewardPool: SafeMath.sub(100, get(\"pDispensationPct\")).mul(deposit).div(100),\n stake: deposit,\n resolved: false,\n winningTokens: 0\n });\n\n proposals[_propID].challengeID = pollID; // update listing to store most recent challenge\n\n //take tokens from challenger\n require(token.transferFrom(msg.sender, this, deposit));\n\n uint commitEndDate;\n uint revealEndDate;\n (commitEndDate, revealEndDate,) = voting.pollMap(pollID);\n\n emit _NewChallenge(\n _propID,\n pollID,\n commitEndDate,\n revealEndDate,\n msg.sender\n );\n\n return pollID;\n }\n\n /**\n @notice for the provided proposal ID, set it, resolve its challenge, or delete it depending on whether it can be set, has a challenge which can be resolved, or if its \"process by\" date has passed\n @param _propID the proposal ID to make a determination and state transition for\n */\n function processProposal(bytes32 _propID) public {\n ParamProposal storage prop = proposals[_propID];\n address propOwner = prop.owner;\n uint propDeposit = prop.deposit;\n\n // Before any token transfers, deleting the proposal will ensure that if reentrancy occurs the\n // prop.owner and prop.deposit will be 0, thereby preventing theft\n if (canBeSet(_propID)) {\n // There is no challenge against the proposal. The processBy date for the proposal has not\n // passed, but the proposal's appExpirty date has passed.\n set(prop.name, prop.value);\n emit _ProposalAccepted(_propID, prop.name, prop.value);\n delete proposals[_propID];\n require(token.transfer(propOwner, propDeposit));\n } else if (challengeCanBeResolved(_propID)) {\n // There is a challenge against the proposal.\n resolveChallenge(_propID);\n } else if (now > prop.processBy) {\n // There is no challenge against the proposal, but the processBy date has passed.\n emit _ProposalExpired(_propID);\n delete proposals[_propID];\n require(token.transfer(propOwner, propDeposit));\n } else {\n // There is no challenge against the proposal, and neither the appExpiry date nor the\n // processBy date has passed.\n revert();\n }\n\n assert(get(\"dispensationPct\") <= 100);\n assert(get(\"pDispensationPct\") <= 100);\n\n // verify that future proposal appExpiry and processBy times will not overflow\n now.add(get(\"pApplyStageLen\"))\n .add(get(\"pCommitStageLen\"))\n .add(get(\"pRevealStageLen\"))\n .add(PROCESSBY);\n\n delete proposals[_propID];\n }\n\n /**\n @notice claim the tokens owed for the msg.sender in the provided challenge\n @param _challengeID the challenge ID to claim tokens for\n @param _salt the salt used to vote in the challenge being withdrawn for\n */\n function claimReward(uint _challengeID, uint _salt) public {\n // ensure voter has not already claimed tokens and challenge results have been processed\n require(challenges[_challengeID].tokenClaims[msg.sender] == false);\n require(challenges[_challengeID].resolved == true);\n\n uint voterTokens = voting.getNumPassingTokens(msg.sender, _challengeID, _salt);\n uint reward = voterReward(msg.sender, _challengeID, _salt);\n\n // subtract voter's information to preserve the participation ratios of other voters\n // compared to the remaining pool of rewards\n challenges[_challengeID].winningTokens -= voterTokens;\n challenges[_challengeID].rewardPool -= reward;\n\n // ensures a voter cannot claim tokens again\n challenges[_challengeID].tokenClaims[msg.sender] = true;\n\n emit _RewardClaimed(_challengeID, reward, msg.sender);\n require(token.transfer(msg.sender, reward));\n }\n\n // --------\n // GETTERS\n // --------\n\n /**\n @dev Calculates the provided voter's token reward for the given poll.\n @param _voter The address of the voter whose reward balance is to be returned\n @param _challengeID The ID of the challenge the voter's reward is being calculated for\n @param _salt The salt of the voter's commit hash in the given poll\n @return The uint indicating the voter's reward\n */\n function voterReward(address _voter, uint _challengeID, uint _salt)\n public view returns (uint)\n {\n uint winningTokens = challenges[_challengeID].winningTokens;\n uint rewardPool = challenges[_challengeID].rewardPool;\n uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt);\n return (voterTokens * rewardPool) / winningTokens;\n }\n\n /**\n @notice Determines whether a proposal passed its application stage without a challenge\n @param _propID The proposal ID for which to determine whether its application stage passed without a challenge\n */\n function canBeSet(bytes32 _propID) view public returns (bool) {\n ParamProposal memory prop = proposals[_propID];\n\n return (now > prop.appExpiry && now < prop.processBy && prop.challengeID == 0);\n }\n\n /**\n @notice Determines whether a proposal exists for the provided proposal ID\n @param _propID The proposal ID whose existance is to be determined\n */\n function propExists(bytes32 _propID) view public returns (bool) {\n return proposals[_propID].processBy > 0;\n }\n\n /**\n @notice Determines whether the provided proposal ID has a challenge which can be resolved\n @param _propID The proposal ID whose challenge to inspect\n */\n function challengeCanBeResolved(bytes32 _propID) view public returns (bool) {\n ParamProposal memory prop = proposals[_propID];\n Challenge memory challenge = challenges[prop.challengeID];\n\n return (prop.challengeID > 0 && challenge.resolved == false && voting.pollEnded(prop.challengeID));\n }\n\n /**\n @notice Determines the number of tokens to awarded to the winning party in a challenge\n @param _challengeID The challengeID to determine a reward for\n */\n function challengeWinnerReward(uint _challengeID) public view returns (uint) {\n if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) {\n // Edge case, nobody voted, give all tokens to the challenger.\n return 2 * challenges[_challengeID].stake;\n }\n\n return (2 * challenges[_challengeID].stake) - challenges[_challengeID].rewardPool;\n }\n\n /**\n @notice gets the parameter keyed by the provided name value from the params mapping\n @param _name the key whose value is to be determined\n */\n function get(string _name) public view returns (uint value) {\n return params[keccak256(abi.encodePacked(_name))];\n }\n\n /**\n @dev Getter for Challenge tokenClaims mappings\n @param _challengeID The challengeID to query\n @param _voter The voter whose claim status to query for the provided challengeID\n */\n function tokenClaims(uint _challengeID, address _voter) public view returns (bool) {\n return challenges[_challengeID].tokenClaims[_voter];\n }\n\n // ----------------\n // PRIVATE FUNCTIONS\n // ----------------\n\n /**\n @dev resolves a challenge for the provided _propID. It must be checked in advance whether the _propID has a challenge on it\n @param _propID the proposal ID whose challenge is to be resolved.\n */\n function resolveChallenge(bytes32 _propID) private {\n ParamProposal memory prop = proposals[_propID];\n Challenge storage challenge = challenges[prop.challengeID];\n\n // winner gets back their full staked deposit, and dispensationPct*loser's stake\n uint reward = challengeWinnerReward(prop.challengeID);\n\n challenge.winningTokens = voting.getTotalNumberOfTokensForWinningOption(prop.challengeID);\n challenge.resolved = true;\n\n if (voting.isPassed(prop.challengeID)) { // The challenge failed\n if (prop.processBy > now) {\n set(prop.name, prop.value);\n }\n emit _ChallengeFailed(\n _propID,\n prop.challengeID,\n challenge.rewardPool,\n challenge.winningTokens\n );\n\n require(token.transfer(prop.owner, reward));\n } else { // The challenge succeeded or nobody voted\n emit _ChallengeSucceeded(\n _propID,\n prop.challengeID,\n challenge.rewardPool,\n challenge.winningTokens\n );\n\n require(token.transfer(challenges[prop.challengeID].challenger, reward));\n }\n }\n\n /**\n @dev sets the param keted by the provided name to the provided value\n @param _name the name of the param to be set\n @param _value the value to set the param to be set\n */\n function set(string _name, uint _value) private {\n params[keccak256(abi.encodePacked(_name))] = _value;\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/Parameterizer.sol", + "bytecode": "0x608060405262093a806005553480156200001857600080fd5b506040516101c08062003d6583398101806040528101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291905050508d600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508c600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550620001916040805190810160405280600a81526020017f6d696e4465706f736974000000000000000000000000000000000000000000008152508d62000515640100000000026401000000009004565b620001e16040805190810160405280600b81526020017f704d696e4465706f7369740000000000000000000000000000000000000000008152508c62000515640100000000026401000000009004565b620002316040805190810160405280600d81526020017f6170706c7953746167654c656e000000000000000000000000000000000000008152508b62000515640100000000026401000000009004565b620002816040805190810160405280600e81526020017f704170706c7953746167654c656e0000000000000000000000000000000000008152508a62000515640100000000026401000000009004565b620002d16040805190810160405280600e81526020017f636f6d6d697453746167654c656e0000000000000000000000000000000000008152508962000515640100000000026401000000009004565b620003216040805190810160405280600f81526020017f70436f6d6d697453746167654c656e00000000000000000000000000000000008152508862000515640100000000026401000000009004565b620003716040805190810160405280600e81526020017f72657665616c53746167654c656e0000000000000000000000000000000000008152508762000515640100000000026401000000009004565b620003c16040805190810160405280600f81526020017f7052657665616c53746167654c656e00000000000000000000000000000000008152508662000515640100000000026401000000009004565b620004116040805190810160405280600f81526020017f64697370656e736174696f6e50637400000000000000000000000000000000008152508562000515640100000000026401000000009004565b620004616040805190810160405280601081526020017f7044697370656e736174696f6e506374000000000000000000000000000000008152508462000515640100000000026401000000009004565b620004b16040805190810160405280600a81526020017f766f746551756f72756d000000000000000000000000000000000000000000008152508362000515640100000000026401000000009004565b620005016040805190810160405280600b81526020017f70566f746551756f72756d0000000000000000000000000000000000000000008152508262000515640100000000026401000000009004565b50505050505050505050505050506200060a565b80600080846040516020018082805190602001908083835b6020831015156200055457805182526020820191506020810190506020830392506200052d565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515620005bf578051825260208201915060208101905060208303925062000598565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b61374b806200061a6000396000f3006080604052600436106100f0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806229514f146100f557806330490e911461012057806332ed5b12146101515780633530099014610251578063504115521461029a578063693ec85e146102db57806377609a41146103585780638240ae4b146103a157806386bb8f37146103e65780638f1d37761461041d578063a5ba3b1e146104aa578063a7aad3db1461050f578063bade1c541461057a578063c51131fb14610609578063dc6ab52714610652578063fc0c546a14610697578063fce1ccca146106ee575b600080fd5b34801561010157600080fd5b5061010a610745565b6040518082815260200191505060405180910390f35b34801561012c57600080fd5b5061014f600480360381019080803560001916906020019092919050505061074b565b005b34801561015d57600080fd5b506101806004803603810190808035600019169060200190929190505050610eb4565b60405180888152602001878152602001868152602001806020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001848152602001838152602001828103825286818151815260200191508051906020019080838360005b838110156102105780820151818401526020810190506101f5565b50505050905090810190601f16801561023d5780820380516001836020036101000a031916815260200191505b509850505050505050505060405180910390f35b34801561025d57600080fd5b506102806004803603810190808035600019169060200190929190505050610fae565b604051808215151515815260200191505060405180910390f35b3480156102a657600080fd5b506102c560048036038101908080359060200190929190505050610fd8565b6040518082815260200191505060405180910390f35b3480156102e757600080fd5b50610342600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050611138565b6040518082815260200191505060405180910390f35b34801561036457600080fd5b50610387600480360381019080803560001916906020019092919050505061122a565b604051808215151515815260200191505060405180910390f35b3480156103ad57600080fd5b506103d06004803603810190808035600019169060200190929190505050611540565b6040518082815260200191505060405180910390f35b3480156103f257600080fd5b5061041b6004803603810190808035906020019092919080359060200190929190505050611c80565b005b34801561042957600080fd5b5061044860048036038101908080359060200190929190505050612094565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b3480156104b657600080fd5b506104f560048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506120f7565b604051808215151515815260200191505060405180910390f35b34801561051b57600080fd5b50610564600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612162565b6040518082815260200191505060405180910390f35b34801561058657600080fd5b506105eb600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290803590602001909291905050506122d5565b60405180826000191660001916815260200191505060405180910390f35b34801561061557600080fd5b506106386004803603810190808035600019169060200190929190505050612bc2565b604051808215151515815260200191505060405180910390f35b34801561065e57600080fd5b506106816004803603810190808035600019169060200190929190505050612d4d565b6040518082815260200191505060405180910390f35b3480156106a357600080fd5b506106ac612d65565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156106fa57600080fd5b50610703612d8b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60055481565b600080600060026000856000191660001916815260200190815260200160002092508260040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506107a484612bc2565b15610aad57610853836003018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108445780601f1061081957610100808354040283529160200191610844565b820191906000526020600020905b81548152906001019060200180831161082757829003601f168201915b50505050508460060154612db1565b83600019167f37f3986c71e1aa2c470cfc4a92af70820610c3065589d35ef1664ea27f3e73a584600301856006015460405180806020018381526020018281038252848181546001816001161561010002031660029004815260200191508054600181600116156101000203166002900480156109115780601f106108e657610100808354040283529160200191610911565b820191906000526020600020905b8154815290600101906020018083116108f457829003601f168201915b5050935050505060405180910390a2600260008560001916600019168152602001908152602001600020600080820160009055600182016000905560028201600090556003820160006109649190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610a6257600080fd5b505af1158015610a76573d6000803e3d6000fd5b505050506040513d6020811015610a8c57600080fd5b81019080805190602001909291905050501515610aa857600080fd5b610c9a565b610ab68461122a565b15610ac957610ac484612ea2565b610c99565b8260050154421115610c935783600019167f29026cb2acebe6d0a4b6d593ccadf76e3fc6d0a02254e078b0c4a619608089d760405160405180910390a260026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610b4a9190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610c4857600080fd5b505af1158015610c5c573d6000803e3d6000fd5b505050506040513d6020811015610c7257600080fd5b81019080805190602001909291905050501515610c8e57600080fd5b610c98565b600080fd5b5b5b6064610cda6040805190810160405280600f81526020017f64697370656e736174696f6e5063740000000000000000000000000000000000815250611138565b11151515610ce457fe5b6064610d246040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611138565b11151515610d2e57fe5b610e30600554610e22610d756040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b610e14610db66040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b610e06610df76040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b5060026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610e759190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560058201600090556006820160009055505050505050565b6002602052806000526040600020600091509050806000015490806001015490806002015490806003018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610f725780601f10610f4757610100808354040283529160200191610f72565b820191906000526020600020905b815481529060010190602001808311610f5557829003601f168201915b5050505050908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050154908060060154905087565b60008060026000846000191660001916815260200190815260200160002060050154119050919050565b600080600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561106c57600080fd5b505af1158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b810190808051906020019092919050505014156110de576110d76002600160008581526020019081526020016000206002015461352f90919063ffffffff16565b9050611133565b61113060016000848152602001908152602001600020600001546111226002600160008781526020019081526020016000206002015461352f90919063ffffffff16565b61356790919063ffffffff16565b90505b919050565b6000806000836040516020018082805190602001908083835b6020831015156111765780518252602082019150602081019050602083039250611151565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156111df57805182526020820191506020810190506020830392506111ba565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020549050919050565b60006112346135de565b61123c613632565b60026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561131a5780601f106112ef5761010080835404028352916020019161131a565b820191906000526020600020905b8154815290600101906020018083116112fd57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509150600160008360200151815260200190815260200160002060a06040519081016040529081600082015481526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160149054906101000a900460ff161515151581526020016002820154815260200160038201548152505090506000826020015111801561145f57506000151581604001511515145b80156115375750600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee68483083602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156114fb57600080fd5b505af115801561150f573d6000803e3d6000fd5b505050506040513d602081101561152557600080fd5b81019080805190602001909291905050505b92505050919050565b600061154a6135de565b60008060008060026000886000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561162e5780601f106116035761010080835404028352916020019161162e565b820191906000526020600020905b81548152906001019060200180831161161157829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509450846040015193506116b387610fae565b80156116c3575060008560200151145b15156116ce57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d6061174a6040805190810160405280600b81526020017f70566f746551756f72756d000000000000000000000000000000000000000000815250611138565b6117886040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b6117c66040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561182657600080fd5b505af115801561183a573d6000803e3d6000fd5b505050506040513d602081101561185057600080fd5b8101908080519060200190929190505050925060a0604051908101604052806118dc60646118ce886118c060646118bb6040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611138565b613567565b61352f90919063ffffffff16565b61358090919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020018581526020016000815250600160008581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508260026000896000191660001916815260200190815260200160002060010181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611ac857600080fd5b505af1158015611adc573d6000803e3d6000fd5b505050506040513d6020811015611af257600080fd5b81019080805190602001909291905050501515611b0e57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b158015611b9f57600080fd5b505af1158015611bb3573d6000803e3d6000fd5b505050506040513d60a0811015611bc957600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1687600019167fe94e3086c4bfe84acba4437b85a80fca3721dfc419d1f7afe4fa4e470e670b4885858560405180848152602001838152602001828152602001935050505060405180910390a38295505050505050919050565b600080600015156001600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cf657600080fd5b600115156001600086815260200190815260200160002060010160149054906101000a900460ff161515141515611d2c57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611df957600080fd5b505af1158015611e0d573d6000803e3d6000fd5b505050506040513d6020811015611e2357600080fd5b81019080805190602001909291905050509150611e41338585612162565b9050611e6c82600160008781526020019081526020016000206003015461356790919063ffffffff16565b6001600086815260200190815260200160002060030181905550611eaf81600160008781526020019081526020016000206000015461356790919063ffffffff16565b6001600086815260200190815260200160002060000181905550600180600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561204857600080fd5b505af115801561205c573d6000803e3d6000fd5b505050506040513d602081101561207257600080fd5b8101908080519060200190929190505050151561208e57600080fd5b50505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b60006001600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000806000806001600087815260200190815260200160002060030154925060016000878152602001908152602001600020600001549150600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b15801561226757600080fd5b505af115801561227b573d6000803e3d6000fd5b505050506040513d602081101561229157600080fd5b810190808051906020019092919050505090506122c9836122bb848461352f90919063ffffffff16565b61358090919063ffffffff16565b93505050509392505050565b60008060006123186040805190810160405280600b81526020017f704d696e4465706f736974000000000000000000000000000000000000000000815250611138565b915084846040516020018083805190602001908083835b602083101515612354578051825260208201915060208101905060208303925061232f565b6001836020036101000a038019825116818451168082178552505050505050905001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831015156123c4578051825260208201915060208101905060208303925061239f565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905060405160200180807f64697370656e736174696f6e5063740000000000000000000000000000000000815250600f0190506040516020818303038152906040526040518082805190602001908083835b6020831015156124685780518252602082019150602081019050602083039250612443565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b6020831015156124d257805182526020820191506020810190506020830392506124ad565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b60208310151561253b5780518252602082019150602081019050602083039250612516565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614806126ee575060405160200180807f7044697370656e736174696f6e5063740000000000000000000000000000000081525060100190506040516020818303038152906040526040518082805190602001908083835b6020831015156125e857805182526020820191506020810190506020830392506125c3565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b602083101515612652578051825260208201915060208101905060208303925061262d565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156126bb5780518252602082019150602081019050602083039250612696565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916145b15612704576064841115151561270357600080fd5b5b61270d81610fae565b15151561271957600080fd5b8361272386611138565b1415151561273057600080fd5b60e06040519081016040528061278c61277d6040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b8152602001600081526020018381526020018681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016128c26005546128b46128076040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b6128a66128486040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b6128986128896040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b815260200185815250600260008360001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020155606082015181600301908051906020019061292092919061367a565b5060808201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060a0820151816005015560c08201518160060155905050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015612a7857600080fd5b505af1158015612a8c573d6000803e3d6000fd5b505050506040513d6020811015612aa257600080fd5b81019080805190602001909291905050501515612abe57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167fb25bdef16105f099e5c185f9c7fd969571e8e0caa3f7bd75409512fe0a41a60b868684866002600088600019166000191681526020019081526020016000206000015460405180806020018681526020018560001916600019168152602001848152602001838152602001828103825287818151815260200191508051906020019080838360005b83811015612b79578082015181840152602081019050612b5e565b50505050905090810190601f168015612ba65780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a2809250505092915050565b6000612bcc6135de565b60026000846000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612caa5780601f10612c7f57610100808354040283529160200191612caa565b820191906000526020600020905b815481529060010190602001808311612c8d57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509050806000015142118015612d3557508060a0015142105b8015612d45575060008160200151145b915050919050565b60006020528060005260406000206000915090505481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600080846040516020018082805190602001908083835b602083101515612dee5780518252602082019150602081019050602083039250612dc9565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515612e575780518252602082019150602081019050602083039250612e32565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b612eaa6135de565b60008060026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612f8b5780601f10612f6057610100808354040283529160200191612f8b565b820191906000526020600020905b815481529060010190602001808311612f6e57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509250600160008460200151815260200190815260200160002091506130268360200151610fd8565b9050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a684602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156130bd57600080fd5b505af11580156130d1573d6000803e3d6000fd5b505050506040513d60208110156130e757600080fd5b8101908080519060200190929190505050826003018190555060018260010160146101000a81548160ff021916908315150217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16634940318384602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156131b257600080fd5b505af11580156131c6573d6000803e3d6000fd5b505050506040513d60208110156131dc57600080fd5b81019080805190602001909291905050501561337657428360a0015111156132115761321083606001518460c00151612db1565b5b826020015184600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c184600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8460800151836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561332b57600080fd5b505af115801561333f573d6000803e3d6000fd5b505050506040513d602081101561335557600080fd5b8101908080519060200190929190505050151561337157600080fd5b61350d565b826020015184600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe684600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb600160008660200151815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156134c657600080fd5b505af11580156134da573d6000803e3d6000fd5b505050506040513d60208110156134f057600080fd5b8101908080519060200190929190505050151561350c57600080fd5b5b50505050565b6000818301905082811015151561352657fe5b80905092915050565b6000808314156135425760009050613561565b818302905081838281151561355357fe5b0414151561355d57fe5b8090505b92915050565b600082821115151561357557fe5b818303905092915050565b6000818381151561358d57fe5b04905092915050565b50805460018160011615610100020316600290046000825580601f106135bc57506135db565b601f0160209004906000526020600020908101906135da91906136fa565b5b50565b60e06040519081016040528060008152602001600081526020016000815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081525090565b60a06040519081016040528060008152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200160008152602001600081525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106136bb57805160ff19168380011785556136e9565b828001600101855582156136e9579182015b828111156136e85782518255916020019190600101906136cd565b5b5090506136f691906136fa565b5090565b61371c91905b80821115613718576000816000905550600101613700565b5090565b905600a165627a7a723058202d4fa4d53c3cfbd02e6811edd669baa34da5b236c0ca3fb9b9a4107bc767e37d0029", + "deployedBytecode": "0x6080604052600436106100f0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806229514f146100f557806330490e911461012057806332ed5b12146101515780633530099014610251578063504115521461029a578063693ec85e146102db57806377609a41146103585780638240ae4b146103a157806386bb8f37146103e65780638f1d37761461041d578063a5ba3b1e146104aa578063a7aad3db1461050f578063bade1c541461057a578063c51131fb14610609578063dc6ab52714610652578063fc0c546a14610697578063fce1ccca146106ee575b600080fd5b34801561010157600080fd5b5061010a610745565b6040518082815260200191505060405180910390f35b34801561012c57600080fd5b5061014f600480360381019080803560001916906020019092919050505061074b565b005b34801561015d57600080fd5b506101806004803603810190808035600019169060200190929190505050610eb4565b60405180888152602001878152602001868152602001806020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001848152602001838152602001828103825286818151815260200191508051906020019080838360005b838110156102105780820151818401526020810190506101f5565b50505050905090810190601f16801561023d5780820380516001836020036101000a031916815260200191505b509850505050505050505060405180910390f35b34801561025d57600080fd5b506102806004803603810190808035600019169060200190929190505050610fae565b604051808215151515815260200191505060405180910390f35b3480156102a657600080fd5b506102c560048036038101908080359060200190929190505050610fd8565b6040518082815260200191505060405180910390f35b3480156102e757600080fd5b50610342600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050611138565b6040518082815260200191505060405180910390f35b34801561036457600080fd5b50610387600480360381019080803560001916906020019092919050505061122a565b604051808215151515815260200191505060405180910390f35b3480156103ad57600080fd5b506103d06004803603810190808035600019169060200190929190505050611540565b6040518082815260200191505060405180910390f35b3480156103f257600080fd5b5061041b6004803603810190808035906020019092919080359060200190929190505050611c80565b005b34801561042957600080fd5b5061044860048036038101908080359060200190929190505050612094565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b3480156104b657600080fd5b506104f560048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506120f7565b604051808215151515815260200191505060405180910390f35b34801561051b57600080fd5b50610564600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612162565b6040518082815260200191505060405180910390f35b34801561058657600080fd5b506105eb600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290803590602001909291905050506122d5565b60405180826000191660001916815260200191505060405180910390f35b34801561061557600080fd5b506106386004803603810190808035600019169060200190929190505050612bc2565b604051808215151515815260200191505060405180910390f35b34801561065e57600080fd5b506106816004803603810190808035600019169060200190929190505050612d4d565b6040518082815260200191505060405180910390f35b3480156106a357600080fd5b506106ac612d65565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156106fa57600080fd5b50610703612d8b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60055481565b600080600060026000856000191660001916815260200190815260200160002092508260040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506107a484612bc2565b15610aad57610853836003018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108445780601f1061081957610100808354040283529160200191610844565b820191906000526020600020905b81548152906001019060200180831161082757829003601f168201915b50505050508460060154612db1565b83600019167f37f3986c71e1aa2c470cfc4a92af70820610c3065589d35ef1664ea27f3e73a584600301856006015460405180806020018381526020018281038252848181546001816001161561010002031660029004815260200191508054600181600116156101000203166002900480156109115780601f106108e657610100808354040283529160200191610911565b820191906000526020600020905b8154815290600101906020018083116108f457829003601f168201915b5050935050505060405180910390a2600260008560001916600019168152602001908152602001600020600080820160009055600182016000905560028201600090556003820160006109649190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610a6257600080fd5b505af1158015610a76573d6000803e3d6000fd5b505050506040513d6020811015610a8c57600080fd5b81019080805190602001909291905050501515610aa857600080fd5b610c9a565b610ab68461122a565b15610ac957610ac484612ea2565b610c99565b8260050154421115610c935783600019167f29026cb2acebe6d0a4b6d593ccadf76e3fc6d0a02254e078b0c4a619608089d760405160405180910390a260026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610b4a9190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600582016000905560068201600090555050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610c4857600080fd5b505af1158015610c5c573d6000803e3d6000fd5b505050506040513d6020811015610c7257600080fd5b81019080805190602001909291905050501515610c8e57600080fd5b610c98565b600080fd5b5b5b6064610cda6040805190810160405280600f81526020017f64697370656e736174696f6e5063740000000000000000000000000000000000815250611138565b11151515610ce457fe5b6064610d246040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611138565b11151515610d2e57fe5b610e30600554610e22610d756040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b610e14610db66040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b610e06610df76040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b5060026000856000191660001916815260200190815260200160002060008082016000905560018201600090556002820160009055600382016000610e759190613596565b6004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560058201600090556006820160009055505050505050565b6002602052806000526040600020600091509050806000015490806001015490806002015490806003018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610f725780601f10610f4757610100808354040283529160200191610f72565b820191906000526020600020905b815481529060010190602001808311610f5557829003601f168201915b5050505050908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050154908060060154905087565b60008060026000846000191660001916815260200190815260200160002060050154119050919050565b600080600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561106c57600080fd5b505af1158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b810190808051906020019092919050505014156110de576110d76002600160008581526020019081526020016000206002015461352f90919063ffffffff16565b9050611133565b61113060016000848152602001908152602001600020600001546111226002600160008781526020019081526020016000206002015461352f90919063ffffffff16565b61356790919063ffffffff16565b90505b919050565b6000806000836040516020018082805190602001908083835b6020831015156111765780518252602082019150602081019050602083039250611151565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156111df57805182526020820191506020810190506020830392506111ba565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020549050919050565b60006112346135de565b61123c613632565b60026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561131a5780601f106112ef5761010080835404028352916020019161131a565b820191906000526020600020905b8154815290600101906020018083116112fd57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509150600160008360200151815260200190815260200160002060a06040519081016040529081600082015481526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160149054906101000a900460ff161515151581526020016002820154815260200160038201548152505090506000826020015111801561145f57506000151581604001511515145b80156115375750600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee68483083602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156114fb57600080fd5b505af115801561150f573d6000803e3d6000fd5b505050506040513d602081101561152557600080fd5b81019080805190602001909291905050505b92505050919050565b600061154a6135de565b60008060008060026000886000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561162e5780601f106116035761010080835404028352916020019161162e565b820191906000526020600020905b81548152906001019060200180831161161157829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509450846040015193506116b387610fae565b80156116c3575060008560200151145b15156116ce57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d6061174a6040805190810160405280600b81526020017f70566f746551756f72756d000000000000000000000000000000000000000000815250611138565b6117886040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b6117c66040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561182657600080fd5b505af115801561183a573d6000803e3d6000fd5b505050506040513d602081101561185057600080fd5b8101908080519060200190929190505050925060a0604051908101604052806118dc60646118ce886118c060646118bb6040805190810160405280601081526020017f7044697370656e736174696f6e50637400000000000000000000000000000000815250611138565b613567565b61352f90919063ffffffff16565b61358090919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020018581526020016000815250600160008581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508260026000896000191660001916815260200190815260200160002060010181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611ac857600080fd5b505af1158015611adc573d6000803e3d6000fd5b505050506040513d6020811015611af257600080fd5b81019080805190602001909291905050501515611b0e57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b158015611b9f57600080fd5b505af1158015611bb3573d6000803e3d6000fd5b505050506040513d60a0811015611bc957600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1687600019167fe94e3086c4bfe84acba4437b85a80fca3721dfc419d1f7afe4fa4e470e670b4885858560405180848152602001838152602001828152602001935050505060405180910390a38295505050505050919050565b600080600015156001600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cf657600080fd5b600115156001600086815260200190815260200160002060010160149054906101000a900460ff161515141515611d2c57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611df957600080fd5b505af1158015611e0d573d6000803e3d6000fd5b505050506040513d6020811015611e2357600080fd5b81019080805190602001909291905050509150611e41338585612162565b9050611e6c82600160008781526020019081526020016000206003015461356790919063ffffffff16565b6001600086815260200190815260200160002060030181905550611eaf81600160008781526020019081526020016000206000015461356790919063ffffffff16565b6001600086815260200190815260200160002060000181905550600180600086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055503373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561204857600080fd5b505af115801561205c573d6000803e3d6000fd5b505050506040513d602081101561207257600080fd5b8101908080519060200190929190505050151561208e57600080fd5b50505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b60006001600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000806000806001600087815260200190815260200160002060030154925060016000878152602001908152602001600020600001549150600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b15801561226757600080fd5b505af115801561227b573d6000803e3d6000fd5b505050506040513d602081101561229157600080fd5b810190808051906020019092919050505090506122c9836122bb848461352f90919063ffffffff16565b61358090919063ffffffff16565b93505050509392505050565b60008060006123186040805190810160405280600b81526020017f704d696e4465706f736974000000000000000000000000000000000000000000815250611138565b915084846040516020018083805190602001908083835b602083101515612354578051825260208201915060208101905060208303925061232f565b6001836020036101000a038019825116818451168082178552505050505050905001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831015156123c4578051825260208201915060208101905060208303925061239f565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020905060405160200180807f64697370656e736174696f6e5063740000000000000000000000000000000000815250600f0190506040516020818303038152906040526040518082805190602001908083835b6020831015156124685780518252602082019150602081019050602083039250612443565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b6020831015156124d257805182526020820191506020810190506020830392506124ad565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b60208310151561253b5780518252602082019150602081019050602083039250612516565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614806126ee575060405160200180807f7044697370656e736174696f6e5063740000000000000000000000000000000081525060100190506040516020818303038152906040526040518082805190602001908083835b6020831015156125e857805182526020820191506020810190506020830392506125c3565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916856040516020018082805190602001908083835b602083101515612652578051825260208201915060208101905060208303925061262d565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156126bb5780518252602082019150602081019050602083039250612696565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916145b15612704576064841115151561270357600080fd5b5b61270d81610fae565b15151561271957600080fd5b8361272386611138565b1415151561273057600080fd5b60e06040519081016040528061278c61277d6040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b8152602001600081526020018381526020018681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020016128c26005546128b46128076040805190810160405280600f81526020017f7052657665616c53746167654c656e0000000000000000000000000000000000815250611138565b6128a66128486040805190810160405280600f81526020017f70436f6d6d697453746167654c656e0000000000000000000000000000000000815250611138565b6128986128896040805190810160405280600e81526020017f704170706c7953746167654c656e000000000000000000000000000000000000815250611138565b4261351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b61351390919063ffffffff16565b815260200185815250600260008360001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020155606082015181600301908051906020019061292092919061367a565b5060808201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060a0820151816005015560c08201518160060155905050600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015612a7857600080fd5b505af1158015612a8c573d6000803e3d6000fd5b505050506040513d6020811015612aa257600080fd5b81019080805190602001909291905050501515612abe57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167fb25bdef16105f099e5c185f9c7fd969571e8e0caa3f7bd75409512fe0a41a60b868684866002600088600019166000191681526020019081526020016000206000015460405180806020018681526020018560001916600019168152602001848152602001838152602001828103825287818151815260200191508051906020019080838360005b83811015612b79578082015181840152602081019050612b5e565b50505050905090810190601f168015612ba65780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a2809250505092915050565b6000612bcc6135de565b60026000846000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612caa5780601f10612c7f57610100808354040283529160200191612caa565b820191906000526020600020905b815481529060010190602001808311612c8d57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509050806000015142118015612d3557508060a0015142105b8015612d45575060008160200151145b915050919050565b60006020528060005260406000206000915090505481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600080846040516020018082805190602001908083835b602083101515612dee5780518252602082019150602081019050602083039250612dc9565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b602083101515612e575780518252602082019150602081019050602083039250612e32565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916600019168152602001908152602001600020819055505050565b612eaa6135de565b60008060026000856000191660001916815260200190815260200160002060e06040519081016040529081600082015481526020016001820154815260200160028201548152602001600382018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015612f8b5780601f10612f6057610100808354040283529160200191612f8b565b820191906000526020600020905b815481529060010190602001808311612f6e57829003601f168201915b505050505081526020016004820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001600582015481526020016006820154815250509250600160008460200151815260200190815260200160002091506130268360200151610fd8565b9050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a684602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156130bd57600080fd5b505af11580156130d1573d6000803e3d6000fd5b505050506040513d60208110156130e757600080fd5b8101908080519060200190929190505050826003018190555060018260010160146101000a81548160ff021916908315150217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16634940318384602001516040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156131b257600080fd5b505af11580156131c6573d6000803e3d6000fd5b505050506040513d60208110156131dc57600080fd5b81019080805190602001909291905050501561337657428360a0015111156132115761321083606001518460c00151612db1565b5b826020015184600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c184600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8460800151836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561332b57600080fd5b505af115801561333f573d6000803e3d6000fd5b505050506040513d602081101561335557600080fd5b8101908080519060200190929190505050151561337157600080fd5b61350d565b826020015184600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe684600001548560030154604051808381526020018281526020019250505060405180910390a3600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb600160008660200151815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156134c657600080fd5b505af11580156134da573d6000803e3d6000fd5b505050506040513d60208110156134f057600080fd5b8101908080519060200190929190505050151561350c57600080fd5b5b50505050565b6000818301905082811015151561352657fe5b80905092915050565b6000808314156135425760009050613561565b818302905081838281151561355357fe5b0414151561355d57fe5b8090505b92915050565b600082821115151561357557fe5b818303905092915050565b6000818381151561358d57fe5b04905092915050565b50805460018160011615610100020316600290046000825580601f106135bc57506135db565b601f0160209004906000526020600020908101906135da91906136fa565b5b50565b60e06040519081016040528060008152602001600081526020016000815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081525090565b60a06040519081016040528060008152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200160008152602001600081525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106136bb57805160ff19168380011785556136e9565b828001600101855582156136e9579182015b828111156136e85782518255916020019190600101906136cd565b5b5090506136f691906136fa565b5090565b61371c91905b80821115613718576000816000905550600101613700565b5090565b905600a165627a7a723058202d4fa4d53c3cfbd02e6811edd669baa34da5b236c0ca3fb9b9a4107bc767e37d0029", + "sourceMap": "101:14721:7:-;;;1964:6;1940:30;;3216:957;8:9:-1;5:2;;;30:1;27;20:12;5:2;3216:957:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3612:10;3598:5;;:25;;;;;;;;;;;;;;;;;;3649:9;3629:6;;:30;;;;;;;;;;;;;;;;;;3666;;;;;;;;;;;;;;;;;;;3684:11;3666:3;;;:30;;;:::i;:::-;3702:32;;;;;;;;;;;;;;;;;;;3721:12;3702:3;;;:32;;;:::i;:::-;3740:36;;;;;;;;;;;;;;;;;;;3761:14;3740:3;;;:36;;;:::i;:::-;3782:38;;;;;;;;;;;;;;;;;;;3804:15;3782:3;;;:38;;;:::i;:::-;3826;;;;;;;;;;;;;;;;;;;3848:15;3826:3;;;:38;;;:::i;:::-;3870:40;;;;;;;;;;;;;;;;;;;3893:16;3870:3;;;:40;;;:::i;:::-;3916:38;;;;;;;;;;;;;;;;;;;3938:15;3916:3;;;:38;;;:::i;:::-;3960:40;;;;;;;;;;;;;;;;;;;3983:16;3960:3;;;:40;;;:::i;:::-;4006;;;;;;;;;;;;;;;;;;;4029:16;4006:3;;;:40;;;:::i;:::-;4052:42;;;;;;;;;;;;;;;;;;;4076:17;4052:3;;;:42;;;:::i;:::-;4100:30;;;;;;;;;;;;;;;;;;;4118:11;4100:3;;;:30;;;:::i;:::-;4136:32;;;;;;;;;;;;;;;;;;;4155:12;4136:3;;;:32;;;:::i;:::-;3216:957;;;;;;;;;;;;;;101:14721;;14710:110;14809:6;14764;:42;14798:5;14781:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14781:23:7;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;14781:23:7;;;14771:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14771:34:7;;;;;;;;;;;;;;;;14764:42;;;;;;;;;;;;;;;;;:51;;;;14710:110;;:::o;101:14721::-;;;;;;;", + "deployedSourceMap": "101:14721:7:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1940:30;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1940:30:7;;;;;;;;;;;;;;;;;;;;;;;7183:1608;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7183:1608:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:50;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1813:50:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;1813:50:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11406:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11406:114:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12156:379;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12156:379:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12691:120;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12691:120:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11687:301;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11687:301:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5829:1059;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5829:1059:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9016:986;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9016:986:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1707:44;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1707:44:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13026:145;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13026:145:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10458:367;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10458:367:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4468:1220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4468:1220:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11042:204;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11042:204:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1612:38;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1612:38:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1890:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1890:18:7;;;;;;;;;;;;;;;;;;;;;;;;;;;1912:24;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1912:24:7;;;;;;;;;;;;;;;;;;;;;;;;;;;1940:30;;;;:::o;7183:1608::-;7238:26;7291:17;7327:16;7267:9;:18;7277:7;7267:18;;;;;;;;;;;;;;;;;7238:47;;7311:4;:10;;;;;;;;;;;;7291:30;;7346:4;:12;;;7327:31;;7539:17;7548:7;7539:8;:17::i;:::-;7535:920;;;7727:26;7731:4;:9;;7727:26;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7742:4;:10;;;7727:3;:26::i;:::-;7784:7;7766:49;;;;7793:4;:9;;7804:4;:10;;;7766:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7830:9;:18;7840:7;7830:18;;;;;;;;;;;;;;;;;;7823:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7864:5;;;;;;;;;;;:14;;;7879:9;7890:11;7864:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7864:38:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7864:38:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7864:38:7;;;;;;;;;;;;;;;;7856:47;;;;;;;;7535:920;;;7920:31;7943:7;7920:22;:31::i;:::-;7916:539;;;8013:25;8030:7;8013:16;:25::i;:::-;7916:539;;;8061:4;:14;;;8055:3;:20;8051:404;;;8195:7;8178:25;;;;;;;;;;;;;8218:9;:18;8228:7;8218:18;;;;;;;;;;;;;;;;;;8211:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8252:5;;;;;;;;;;;:14;;;8267:9;8278:11;8252:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8252:38:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8252:38:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;8252:38:7;;;;;;;;;;;;;;;;8244:47;;;;;;;;8051:404;;;8440:8;;;8051:404;7916:539;7535:920;8494:3;8468:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;:29;;8461:37;;;;;;8538:3;8511:23;;;;;;;;;;;;;;;;;;;:3;:23::i;:::-;:30;;8504:38;;;;;;8632:122;8744:9;;8632:100;8709:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;8632:65;8674:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;8632:30;8640:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;8632:3;:7;;:30;;;;:::i;:::-;:41;;:65;;;;:::i;:::-;:76;;:100;;;;:::i;:::-;:111;;:122;;;;:::i;:::-;;8768:9;:18;8778:7;8768:18;;;;;;;;;;;;;;;;;;8761:25;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7183:1608;;;;:::o;1813:50::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;11406:114::-;11464:4;11514:1;11483:9;:18;11493:7;11483:18;;;;;;;;;;;;;;;;;:28;;;:32;11476:39;;11406:114;;;:::o;12156:379::-;12227:4;12306:1;12243:6;;;;;;;;;;;:45;;;12289:12;12243:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12243:59:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12243:59:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;12243:59:7;;;;;;;;;;;;;;;;:64;12239:198;;;12393:37;12428:1;12393:10;:24;12404:12;12393:24;;;;;;;;;;;:30;;;:34;;:37;;;;:::i;:::-;12386:44;;;;12239:198;12450:80;12494:10;:24;12505:12;12494:24;;;;;;;;;;;:35;;;12451:37;12486:1;12451:10;:24;12462:12;12451:24;;;;;;;;;;;:30;;;:34;;:37;;;;:::i;:::-;12450:43;;:80;;;;:::i;:::-;12443:87;;12156:379;;;;:::o;12691:120::-;12739:10;12764:6;:42;12798:5;12781:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12781:23:7;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12781:23:7;;;12771:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12771:34:7;;;;;;;;;;;;;;;;12764:42;;;;;;;;;;;;;;;;;;12757:49;;12691:120;;;:::o;11687:301::-;11757:4;11769:25;;:::i;:::-;11821:26;;:::i;:::-;11797:9;:18;11807:7;11797:18;;;;;;;;;;;;;;;;;11769:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11850:10;:28;11861:4;:16;;;11850:28;;;;;;;;;;;11821:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11912:1;11893:4;:16;;;:20;:51;;;;;11939:5;11917:27;;:9;:18;;;:27;;;11893:51;:89;;;;;11948:6;;;;;;;;;;;:16;;;11965:4;:16;;;11948:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11948:34:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11948:34:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11948:34:7;;;;;;;;;;;;;;;;11893:89;11885:98;;11687:301;;;;;:::o;5829:1059::-;5899:16;5923:25;;:::i;:::-;5975:12;6086:11;6639:18;6663;5951:9;:18;5961:7;5951:18;;;;;;;;;;;;;;;;;5923:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5990:4;:12;;;5975:27;;6017:19;6028:7;6017:10;:19::i;:::-;:44;;;;;6060:1;6040:4;:16;;;:21;6017:44;6009:53;;;;;;;;6100:6;;;;;;;;;;;:16;;;6124:18;;;;;;;;;;;;;;;;;;;:3;:18::i;:::-;6150:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;6180;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;6100:108;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6100:108:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6100:108:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6100:108:7;;;;;;;;;;;;;;;;6086:122;;6236:200;;;;;;;;;6296:64;6356:3;6296:55;6343:7;6296:42;6309:3;6314:23;;;;;;;;;;;;;;;;;;;:3;:23::i;:::-;6296:12;:42::i;:::-;:46;;:55;;;;:::i;:::-;:59;;:64;;;;:::i;:::-;6236:200;;;;6266:10;6236:200;;;;;;6400:5;6236:200;;;;;;6375:7;6236:200;;;;6428:1;6236:200;;;6215:10;:18;6226:6;6215:18;;;;;;;;;;;:221;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6476:6;6443:9;:18;6453:7;6443:18;;;;;;;;;;;;;;;;;:30;;:39;;;;6586:5;;;;;;;;;;;:18;;;6605:10;6617:4;6623:7;6586:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6586:45:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6586:45:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6586:45:7;;;;;;;;;;;;;;;;6578:54;;;;;;;;6721:6;;;;;;;;;;;:14;;;6736:6;6721:22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6721:22:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6721:22:7;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;6721:22:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6687:56;;;;;;;;;;;;;;6847:10;6755:108;;6776:7;6755:108;;;;6791:6;6805:13;6826;6755:108;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6877:6;6870:13;;5829:1059;;;;;;;;:::o;9016:986::-;9303:16;9387:11;9234:5;9182:57;;:10;:24;9193:12;9182:24;;;;;;;;;;;:36;;:48;9219:10;9182:48;;;;;;;;;;;;;;;;;;;;;;;;;:57;;;9174:66;;;;;;;;9291:4;9254:41;;:10;:24;9265:12;9254:24;;;;;;;;;;;:33;;;;;;;;;;;;:41;;;9246:50;;;;;;;;9322:6;;;;;;;;;;;:26;;;9349:10;9361:12;9375:5;9322:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9322:59:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9322:59:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9322:59:7;;;;;;;;;;;;;;;;9303:78;;9401:44;9413:10;9425:12;9439:5;9401:11;:44::i;:::-;9387:58;;9631:55;9674:11;9631:10;:24;9642:12;9631:24;;;;;;;;;;;:38;;;:42;;:55;;;;:::i;:::-;9590:10;:24;9601:12;9590:24;;;;;;;;;;;:38;;:96;;;;9730:47;9770:6;9730:10;:24;9741:12;9730:24;;;;;;;;;;;:35;;;:39;;:47;;;;:::i;:::-;9692:10;:24;9703:12;9692:24;;;;;;;;;;;:35;;:85;;;;9884:4;9833:10;:24;9844:12;9833:24;;;;;;;;;;;:36;;:48;9870:10;9833:48;;;;;;;;;;;;;;;;:55;;;;;;;;;;;;;;;;;;9937:10;9900:48;;9915:12;9900:48;9929:6;9900:48;;;;;;;;;;;;;;;;;;9962:5;;;;;;;;;;;:14;;;9977:10;9989:6;9962:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9962:34:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9962:34:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9962:34:7;;;;;;;;;;;;;;;;9954:43;;;;;;;;9016:986;;;;:::o;1707:44::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;13026:145::-;13103:4;13122:10;:24;13133:12;13122:24;;;;;;;;;;;:36;;:44;13159:6;13122:44;;;;;;;;;;;;;;;;;;;;;;;;;13115:51;;13026:145;;;;:::o;10458:367::-;10549:4;10563:18;10628:15;10687:16;10584:10;:24;10595:12;10584:24;;;;;;;;;;;:38;;;10563:59;;10646:10;:24;10657:12;10646:24;;;;;;;;;;;:35;;;10628:53;;10706:6;;;;;;;;;;;:26;;;10733:6;10741:12;10755:5;10706:55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10706:55:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10706:55:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;10706:55:7;;;;;;;;;;;;;;;;10687:74;;10774:46;10806:13;10774:27;10790:10;10774:11;:15;;:27;;;;:::i;:::-;:31;;:46;;;;:::i;:::-;10767:53;;10458:367;;;;;;;;:::o;4468:1220::-;4546:7;4561:12;4600:14;4576:18;;;;;;;;;;;;;;;;;;;:3;:18::i;:::-;4561:33;;4644:5;4651:6;4627:31;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4627:31:7;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4627:31:7;;;4617:42;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4617:42:7;;;;;;;;;;;;;;;;4600:59;;4718:35;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4718:35:7;;;4708:46;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4708:46:7;;;;;;;;;;;;;;;;4670:84;;;4697:5;4680:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4680:23:7;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4680:23:7;;;4670:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4670:34:7;;;;;;;;;;;;;;;;:84;;;;:180;;;;4813:36;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4813:36:7;;;4803:47;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4803:47:7;;;;;;;;;;;;;;;;4765:85;;;4792:5;4775:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4775:23:7;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;4775:23:7;;;4765:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;4765:34:7;;;;;;;;;;;;;;;;:85;;;;4670:180;4666:223;;;4878:3;4868:6;:13;;4860:22;;;;;;;;4666:223;4904:18;4915:6;4904:10;:18::i;:::-;4903:19;4895:28;;;;;;;;4981:6;4967:10;4971:5;4967:3;:10::i;:::-;:20;;4959:29;;;;;;;;5089:328;;;;;;;;;5122:30;5130:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;5122:3;:7;;:30;;;;:::i;:::-;5089:328;;;;5173:1;5089:328;;;;5191:7;5089:328;;;;5212:5;5089:328;;;;5232:10;5089:328;;;;;;5261:128;5379:9;;5261:104;5342:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;5261:67;5305:22;;;;;;;;;;;;;;;;;;;:3;:22::i;:::-;5261:30;5269:21;;;;;;;;;;;;;;;;;;;:3;:21::i;:::-;5261:3;:7;;:30;;;;:::i;:::-;:43;;:67;;;;:::i;:::-;:80;;:104;;;;:::i;:::-;:117;;:128;;;;:::i;:::-;5089:328;;;;5404:6;5089:328;;;5069:9;:17;5079:6;5069:17;;;;;;;;;;;;;;;;;:348;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5432:5;;;;;;;;;;;:18;;;5451:10;5463:4;5469:7;5432:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5432:45:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5432:45:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5432:45:7;;;;;;;;;;;;;;;;5424:54;;;;;;;;5647:10;5521:142;;;5556:5;5569:6;5583;5597:7;5612:9;:17;5622:6;5612:17;;;;;;;;;;;;;;;;;:27;;;5521:142;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;5521:142:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5677:6;5670:13;;4468:1220;;;;;;:::o;11042:204::-;11098:4;11110:25;;:::i;:::-;11138:9;:18;11148:7;11138:18;;;;;;;;;;;;;;;;;11110:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11177:4;:14;;;11171:3;:20;:44;;;;;11201:4;:14;;;11195:3;:20;11171:44;:69;;;;;11239:1;11219:4;:16;;;:21;11171:69;11163:78;;11042:204;;;;:::o;1612:38::-;;;;;;;;;;;;;;;;;:::o;1890:18::-;;;;;;;;;;;;;:::o;1912:24::-;;;;;;;;;;;;;:::o;14710:110::-;14809:6;14764;:42;14798:5;14781:23;;;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14781:23:7;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;14781:23:7;;;14771:34;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;14771:34:7;;;;;;;;;;;;;;;;14764:42;;;;;;;;;;;;;;;;;:51;;;;14710:110;;:::o;13448:1076::-;13505:25;;:::i;:::-;13557:27;13707:11;13533:9;:18;13543:7;13533:18;;;;;;;;;;;;;;;;;13505:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13587:10;:28;13598:4;:16;;;13587:28;;;;;;;;;;;13557:58;;13721:39;13743:4;:16;;;13721:21;:39::i;:::-;13707:53;;13793:6;;;;;;;;;;;:45;;;13839:4;:16;;;13793:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13793:63:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13793:63:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13793:63:7;;;;;;;;;;;;;;;;13767:9;:23;;:89;;;;13883:4;13862:9;:18;;;:25;;;;;;;;;;;;;;;;;;13898:6;;;;;;;;;;;:15;;;13914:4;:16;;;13898:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13898:33:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13898:33:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13898:33:7;;;;;;;;;;;;;;;;13894:626;;;13986:3;13969:4;:14;;;:20;13965:71;;;14001:26;14005:4;:9;;;14016:4;:10;;;14001:3;:26::i;:::-;13965:71;14091:4;:16;;;14074:7;14048:130;;;;14117:9;:20;;;14147:9;:23;;;14048:130;;;;;;;;;;;;;;;;;;;;;;;;14195:5;;;;;;;;;;;:14;;;14210:4;:10;;;14222:6;14195:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14195:34:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14195:34:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14195:34:7;;;;;;;;;;;;;;;;14187:43;;;;;;;;13894:626;;;14345:4;:16;;;14328:7;14299:133;;;;14371:9;:20;;;14401:9;:23;;;14299:133;;;;;;;;;;;;;;;;;;;;;;;;14449:5;;;;;;;;;;;:14;;;14464:10;:28;14475:4;:16;;;14464:28;;;;;;;;;;;:39;;;;;;;;;;;;14505:6;14449:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14449:63:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14449:63:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14449:63:7;;;;;;;;;;;;;;;;14441:72;;;;;;;;13894:626;13448:1076;;;;:::o;1213:123:9:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;202:373::-;260:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;531:1;527;:5;523:9;;554:1;549;545;:5;;;;;;;;:10;538:18;;;;;;569:1;562:8;;202:373;;;;;:::o;1041:110::-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;657:272::-;715:7;923:1;919;:5;;;;;;;;912:12;;657:272;;;;:::o;101:14721:7:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o", + "source": "pragma solidity 0.4.24;\n\nimport \"./PLCRVoting.sol\";\nimport \"./ERC20.sol\";\nimport \"./SafeMath.sol\";\n\n\ncontract Parameterizer {\n\n // ------\n // EVENTS\n // ------\n\n event _ReparameterizationProposal(string name, uint value, bytes32 propID, uint deposit, uint appEndDate, address indexed proposer);\n event _NewChallenge(bytes32 indexed propID, uint challengeID, uint commitEndDate, uint revealEndDate, address indexed challenger);\n event _ProposalAccepted(bytes32 indexed propID, string name, uint value);\n event _ProposalExpired(bytes32 indexed propID);\n event _ChallengeSucceeded(bytes32 indexed propID, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _ChallengeFailed(bytes32 indexed propID, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _RewardClaimed(uint indexed challengeID, uint reward, address indexed voter);\n\n\n // ------\n // DATA STRUCTURES\n // ------\n\n using SafeMath for uint;\n\n struct ParamProposal {\n uint appExpiry;\n uint challengeID;\n uint deposit;\n string name;\n address owner;\n uint processBy;\n uint value;\n }\n\n struct Challenge {\n uint rewardPool; // (remaining) pool of tokens distributed amongst winning voters\n address challenger; // owner of Challenge\n bool resolved; // indication of if challenge is resolved\n uint stake; // number of tokens at risk for either party during challenge\n uint winningTokens; // (remaining) amount of tokens used for voting by the winning side\n mapping(address => bool) tokenClaims;\n }\n\n // ------\n // STATE\n // ------\n\n mapping(bytes32 => uint) public params;\n\n // maps challengeIDs to associated challenge data\n mapping(uint => Challenge) public challenges;\n\n // maps pollIDs to intended data change if poll passes\n mapping(bytes32 => ParamProposal) public proposals;\n\n // Global Variables\n ERC20 public token;\n PLCRVoting public voting;\n uint public PROCESSBY = 604800; // 7 days\n\n // ------------\n // CONSTRUCTOR\n // ------------\n\n /**\n @dev constructor\n @param _tokenAddr address of the token which parameterizes this system\n @param _plcrAddr address of a PLCR voting contract for the provided token\n @param _minDeposit minimum deposit for listing to be whitelisted\n @param _pMinDeposit minimum deposit to propose a reparameterization\n @param _applyStageLen period over which applicants wait to be whitelisted\n @param _pApplyStageLen period over which reparmeterization proposals wait to be processed\n @param _dispensationPct percentage of losing party's deposit distributed to winning party\n @param _pDispensationPct percentage of losing party's deposit distributed to winning party in parameterizer\n @param _commitStageLen length of commit period for voting\n @param _pCommitStageLen length of commit period for voting in parameterizer\n @param _revealStageLen length of reveal period for voting\n @param _pRevealStageLen length of reveal period for voting in parameterizer\n @param _voteQuorum type of majority out of 100 necessary for vote success\n @param _pVoteQuorum type of majority out of 100 necessary for vote success in parameterizer\n */\n constructor(\n address _tokenAddr,\n address _plcrAddr,\n uint _minDeposit,\n uint _pMinDeposit,\n uint _applyStageLen,\n uint _pApplyStageLen,\n uint _commitStageLen,\n uint _pCommitStageLen,\n uint _revealStageLen,\n uint _pRevealStageLen,\n uint _dispensationPct,\n uint _pDispensationPct,\n uint _voteQuorum,\n uint _pVoteQuorum\n ) public\n {\n token = ERC20(_tokenAddr);\n voting = PLCRVoting(_plcrAddr);\n\n set(\"minDeposit\", _minDeposit);\n set(\"pMinDeposit\", _pMinDeposit);\n set(\"applyStageLen\", _applyStageLen);\n set(\"pApplyStageLen\", _pApplyStageLen);\n set(\"commitStageLen\", _commitStageLen);\n set(\"pCommitStageLen\", _pCommitStageLen);\n set(\"revealStageLen\", _revealStageLen);\n set(\"pRevealStageLen\", _pRevealStageLen);\n set(\"dispensationPct\", _dispensationPct);\n set(\"pDispensationPct\", _pDispensationPct);\n set(\"voteQuorum\", _voteQuorum);\n set(\"pVoteQuorum\", _pVoteQuorum);\n }\n\n // -----------------------\n // TOKEN HOLDER INTERFACE\n // -----------------------\n\n /**\n @notice propose a reparamaterization of the key _name's value to _value.\n @param _name the name of the proposed param to be set\n @param _value the proposed value to set the param to be set\n */\n function proposeReparameterization(string _name, uint _value) public returns (bytes32) {\n uint deposit = get(\"pMinDeposit\");\n bytes32 propID = keccak256(abi.encodePacked(_name, _value));\n\n if (keccak256(abi.encodePacked(_name)) == keccak256(abi.encodePacked(\"dispensationPct\")) ||\n keccak256(abi.encodePacked(_name)) == keccak256(abi.encodePacked(\"pDispensationPct\"))) {\n require(_value <= 100);\n }\n\n require(!propExists(propID)); // Forbid duplicate proposals\n require(get(_name) != _value); // Forbid NOOP reparameterizations\n\n // attach name and value to pollID\n proposals[propID] = ParamProposal({\n appExpiry: now.add(get(\"pApplyStageLen\")),\n challengeID: 0,\n deposit: deposit,\n name: _name,\n owner: msg.sender,\n processBy: now.add(get(\"pApplyStageLen\"))\n .add(get(\"pCommitStageLen\"))\n .add(get(\"pRevealStageLen\"))\n .add(PROCESSBY),\n value: _value\n });\n\n require(token.transferFrom(msg.sender, this, deposit)); // escrow tokens (deposit amt)\n\n emit _ReparameterizationProposal(\n _name,\n _value,\n propID,\n deposit,\n proposals[propID].appExpiry,\n msg.sender\n );\n\n return propID;\n }\n\n /**\n @notice challenge the provided proposal ID, and put tokens at stake to do so.\n @param _propID the proposal ID to challenge\n */\n function challengeReparameterization(bytes32 _propID) public returns (uint challengeID) {\n ParamProposal memory prop = proposals[_propID];\n uint deposit = prop.deposit;\n\n require(propExists(_propID) && prop.challengeID == 0);\n\n //start poll\n uint pollID = voting.startPoll(\n get(\"pVoteQuorum\"),\n get(\"pCommitStageLen\"),\n get(\"pRevealStageLen\")\n );\n\n challenges[pollID] = Challenge({\n challenger: msg.sender,\n rewardPool: SafeMath.sub(100, get(\"pDispensationPct\")).mul(deposit).div(100),\n stake: deposit,\n resolved: false,\n winningTokens: 0\n });\n\n proposals[_propID].challengeID = pollID; // update listing to store most recent challenge\n\n //take tokens from challenger\n require(token.transferFrom(msg.sender, this, deposit));\n\n uint commitEndDate;\n uint revealEndDate;\n (commitEndDate, revealEndDate,) = voting.pollMap(pollID);\n\n emit _NewChallenge(\n _propID,\n pollID,\n commitEndDate,\n revealEndDate,\n msg.sender\n );\n\n return pollID;\n }\n\n /**\n @notice for the provided proposal ID, set it, resolve its challenge, or delete it depending on whether it can be set, has a challenge which can be resolved, or if its \"process by\" date has passed\n @param _propID the proposal ID to make a determination and state transition for\n */\n function processProposal(bytes32 _propID) public {\n ParamProposal storage prop = proposals[_propID];\n address propOwner = prop.owner;\n uint propDeposit = prop.deposit;\n\n // Before any token transfers, deleting the proposal will ensure that if reentrancy occurs the\n // prop.owner and prop.deposit will be 0, thereby preventing theft\n if (canBeSet(_propID)) {\n // There is no challenge against the proposal. The processBy date for the proposal has not\n // passed, but the proposal's appExpirty date has passed.\n set(prop.name, prop.value);\n emit _ProposalAccepted(_propID, prop.name, prop.value);\n delete proposals[_propID];\n require(token.transfer(propOwner, propDeposit));\n } else if (challengeCanBeResolved(_propID)) {\n // There is a challenge against the proposal.\n resolveChallenge(_propID);\n } else if (now > prop.processBy) {\n // There is no challenge against the proposal, but the processBy date has passed.\n emit _ProposalExpired(_propID);\n delete proposals[_propID];\n require(token.transfer(propOwner, propDeposit));\n } else {\n // There is no challenge against the proposal, and neither the appExpiry date nor the\n // processBy date has passed.\n revert();\n }\n\n assert(get(\"dispensationPct\") <= 100);\n assert(get(\"pDispensationPct\") <= 100);\n\n // verify that future proposal appExpiry and processBy times will not overflow\n now.add(get(\"pApplyStageLen\"))\n .add(get(\"pCommitStageLen\"))\n .add(get(\"pRevealStageLen\"))\n .add(PROCESSBY);\n\n delete proposals[_propID];\n }\n\n /**\n @notice claim the tokens owed for the msg.sender in the provided challenge\n @param _challengeID the challenge ID to claim tokens for\n @param _salt the salt used to vote in the challenge being withdrawn for\n */\n function claimReward(uint _challengeID, uint _salt) public {\n // ensure voter has not already claimed tokens and challenge results have been processed\n require(challenges[_challengeID].tokenClaims[msg.sender] == false);\n require(challenges[_challengeID].resolved == true);\n\n uint voterTokens = voting.getNumPassingTokens(msg.sender, _challengeID, _salt);\n uint reward = voterReward(msg.sender, _challengeID, _salt);\n\n // subtract voter's information to preserve the participation ratios of other voters\n // compared to the remaining pool of rewards\n challenges[_challengeID].winningTokens = challenges[_challengeID].winningTokens.sub(voterTokens);\n challenges[_challengeID].rewardPool = challenges[_challengeID].rewardPool.sub(reward);\n\n // ensures a voter cannot claim tokens again\n challenges[_challengeID].tokenClaims[msg.sender] = true;\n\n emit _RewardClaimed(_challengeID, reward, msg.sender);\n require(token.transfer(msg.sender, reward));\n }\n\n // --------\n // GETTERS\n // --------\n\n /**\n @dev Calculates the provided voter's token reward for the given poll.\n @param _voter The address of the voter whose reward balance is to be returned\n @param _challengeID The ID of the challenge the voter's reward is being calculated for\n @param _salt The salt of the voter's commit hash in the given poll\n @return The uint indicating the voter's reward\n */\n function voterReward(address _voter, uint _challengeID, uint _salt)\n public view returns (uint)\n {\n uint winningTokens = challenges[_challengeID].winningTokens;\n uint rewardPool = challenges[_challengeID].rewardPool;\n uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt);\n return voterTokens.mul(rewardPool).div(winningTokens);\n }\n\n /**\n @notice Determines whether a proposal passed its application stage without a challenge\n @param _propID The proposal ID for which to determine whether its application stage passed without a challenge\n */\n function canBeSet(bytes32 _propID) view public returns (bool) {\n ParamProposal memory prop = proposals[_propID];\n\n return (now > prop.appExpiry && now < prop.processBy && prop.challengeID == 0);\n }\n\n /**\n @notice Determines whether a proposal exists for the provided proposal ID\n @param _propID The proposal ID whose existance is to be determined\n */\n function propExists(bytes32 _propID) view public returns (bool) {\n return proposals[_propID].processBy > 0;\n }\n\n /**\n @notice Determines whether the provided proposal ID has a challenge which can be resolved\n @param _propID The proposal ID whose challenge to inspect\n */\n function challengeCanBeResolved(bytes32 _propID) view public returns (bool) {\n ParamProposal memory prop = proposals[_propID];\n Challenge memory challenge = challenges[prop.challengeID];\n\n return (prop.challengeID > 0 && challenge.resolved == false && voting.pollEnded(prop.challengeID));\n }\n\n /**\n @notice Determines the number of tokens to awarded to the winning party in a challenge\n @param _challengeID The challengeID to determine a reward for\n */\n function challengeWinnerReward(uint _challengeID) public view returns (uint) {\n if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) {\n // Edge case, nobody voted, give all tokens to the challenger.\n return challenges[_challengeID].stake.mul(2);\n }\n\n return (challenges[_challengeID].stake.mul(2)).sub(challenges[_challengeID].rewardPool);\n }\n\n /**\n @notice gets the parameter keyed by the provided name value from the params mapping\n @param _name the key whose value is to be determined\n */\n function get(string _name) public view returns (uint value) {\n return params[keccak256(abi.encodePacked(_name))];\n }\n\n /**\n @dev Getter for Challenge tokenClaims mappings\n @param _challengeID The challengeID to query\n @param _voter The voter whose claim status to query for the provided challengeID\n */\n function tokenClaims(uint _challengeID, address _voter) public view returns (bool) {\n return challenges[_challengeID].tokenClaims[_voter];\n }\n\n // ----------------\n // PRIVATE FUNCTIONS\n // ----------------\n\n /**\n @dev resolves a challenge for the provided _propID. It must be checked in advance whether the _propID has a challenge on it\n @param _propID the proposal ID whose challenge is to be resolved.\n */\n function resolveChallenge(bytes32 _propID) private {\n ParamProposal memory prop = proposals[_propID];\n Challenge storage challenge = challenges[prop.challengeID];\n\n // winner gets back their full staked deposit, and dispensationPct*loser's stake\n uint reward = challengeWinnerReward(prop.challengeID);\n\n challenge.winningTokens = voting.getTotalNumberOfTokensForWinningOption(prop.challengeID);\n challenge.resolved = true;\n\n if (voting.isPassed(prop.challengeID)) { // The challenge failed\n if (prop.processBy > now) {\n set(prop.name, prop.value);\n }\n emit _ChallengeFailed(\n _propID,\n prop.challengeID,\n challenge.rewardPool,\n challenge.winningTokens\n );\n\n require(token.transfer(prop.owner, reward));\n } else { // The challenge succeeded or nobody voted\n emit _ChallengeSucceeded(\n _propID,\n prop.challengeID,\n challenge.rewardPool,\n challenge.winningTokens\n );\n\n require(token.transfer(challenges[prop.challengeID].challenger, reward));\n }\n }\n\n /**\n @dev sets the param keted by the provided name to the provided value\n @param _name the name of the param to be set\n @param _value the value to set the param to be set\n */\n function set(string _name, uint _value) private {\n params[keccak256(abi.encodePacked(_name))] = _value;\n }\n}\n", + "sourcePath": "/home/bharath/computable/contracts/Parameterizer.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/Parameterizer.sol", + "absolutePath": "/home/bharath/computable/contracts/Parameterizer.sol", "exportedSymbols": { "Parameterizer": [ - 2490 + 2653 ] }, - "id": 2491, + "id": 2654, "nodeType": "SourceUnit", "nodes": [ { - "id": 1473, + "id": 1620, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:7" }, { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "file": "./PLCRVoting.sol", - "id": 1474, + "id": 1621, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 1472, - "src": "25:26:5", + "scope": 2654, + "sourceUnit": 1619, + "src": "25:26:7", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 1475, + "id": 1622, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 409, - "src": "52:21:5", + "scope": 2654, + "sourceUnit": 529, + "src": "52:21:7", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 1476, + "id": 1623, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 3688, - "src": "74:24:5", + "scope": 2654, + "sourceUnit": 3892, + "src": "74:24:7", "symbolAliases": [], "unitAlias": "" }, @@ -667,9 +667,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2490, + "id": 2653, "linearizedBaseContracts": [ - 2490 + 2653 ], "name": "Parameterizer", "nodeType": "ContractDefinition", @@ -677,21 +677,21 @@ { "anonymous": false, "documentation": null, - "id": 1490, + "id": 1637, "name": "_ReparameterizationProposal", "nodeType": "EventDefinition", "parameters": { - "id": 1489, + "id": 1636, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1478, + "id": 1625, "indexed": false, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "200:11:5", + "scope": 1637, + "src": "200:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -699,10 +699,10 @@ "typeString": "string" }, "typeName": { - "id": 1477, + "id": 1624, "name": "string", "nodeType": "ElementaryTypeName", - "src": "200:6:5", + "src": "200:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -713,12 +713,12 @@ }, { "constant": false, - "id": 1480, + "id": 1627, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "213:10:5", + "scope": 1637, + "src": "213:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -726,10 +726,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1479, + "id": 1626, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "213:4:5", + "src": "213:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -740,12 +740,12 @@ }, { "constant": false, - "id": 1482, + "id": 1629, "indexed": false, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "225:14:5", + "scope": 1637, + "src": "225:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -753,10 +753,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1481, + "id": 1628, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "225:7:5", + "src": "225:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -767,12 +767,12 @@ }, { "constant": false, - "id": 1484, + "id": 1631, "indexed": false, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "241:12:5", + "scope": 1637, + "src": "241:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -780,10 +780,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1483, + "id": 1630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "241:4:5", + "src": "241:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -794,12 +794,12 @@ }, { "constant": false, - "id": 1486, + "id": 1633, "indexed": false, "name": "appEndDate", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "255:15:5", + "scope": 1637, + "src": "255:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -807,10 +807,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1485, + "id": 1632, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "255:4:5", + "src": "255:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -821,12 +821,12 @@ }, { "constant": false, - "id": 1488, + "id": 1635, "indexed": true, "name": "proposer", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "272:24:5", + "scope": 1637, + "src": "272:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -834,10 +834,10 @@ "typeString": "address" }, "typeName": { - "id": 1487, + "id": 1634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "272:7:5", + "src": "272:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -847,28 +847,28 @@ "visibility": "internal" } ], - "src": "199:98:5" + "src": "199:98:7" }, - "src": "166:132:5" + "src": "166:132:7" }, { "anonymous": false, "documentation": null, - "id": 1502, + "id": 1649, "name": "_NewChallenge", "nodeType": "EventDefinition", "parameters": { - "id": 1501, + "id": 1648, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1492, + "id": 1639, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "321:22:5", + "scope": 1649, + "src": "321:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -876,10 +876,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1491, + "id": 1638, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "321:7:5", + "src": "321:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -890,12 +890,12 @@ }, { "constant": false, - "id": 1494, + "id": 1641, "indexed": false, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "345:16:5", + "scope": 1649, + "src": "345:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -903,10 +903,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1493, + "id": 1640, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "345:4:5", + "src": "345:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -917,12 +917,12 @@ }, { "constant": false, - "id": 1496, + "id": 1643, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "363:18:5", + "scope": 1649, + "src": "363:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -930,10 +930,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1495, + "id": 1642, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "363:4:5", + "src": "363:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -944,12 +944,12 @@ }, { "constant": false, - "id": 1498, + "id": 1645, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "383:18:5", + "scope": 1649, + "src": "383:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -957,10 +957,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1497, + "id": 1644, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "383:4:5", + "src": "383:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -971,12 +971,12 @@ }, { "constant": false, - "id": 1500, + "id": 1647, "indexed": true, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "403:26:5", + "scope": 1649, + "src": "403:26:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -984,10 +984,10 @@ "typeString": "address" }, "typeName": { - "id": 1499, + "id": 1646, "name": "address", "nodeType": "ElementaryTypeName", - "src": "403:7:5", + "src": "403:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -997,28 +997,28 @@ "visibility": "internal" } ], - "src": "320:110:5" + "src": "320:110:7" }, - "src": "301:130:5" + "src": "301:130:7" }, { "anonymous": false, "documentation": null, - "id": 1510, + "id": 1657, "name": "_ProposalAccepted", "nodeType": "EventDefinition", "parameters": { - "id": 1509, + "id": 1656, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1504, + "id": 1651, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "458:22:5", + "scope": 1657, + "src": "458:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1026,10 +1026,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1503, + "id": 1650, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "458:7:5", + "src": "458:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1040,12 +1040,12 @@ }, { "constant": false, - "id": 1506, + "id": 1653, "indexed": false, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "482:11:5", + "scope": 1657, + "src": "482:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1053,10 +1053,10 @@ "typeString": "string" }, "typeName": { - "id": 1505, + "id": 1652, "name": "string", "nodeType": "ElementaryTypeName", - "src": "482:6:5", + "src": "482:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -1067,12 +1067,12 @@ }, { "constant": false, - "id": 1508, + "id": 1655, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "495:10:5", + "scope": 1657, + "src": "495:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1080,10 +1080,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1507, + "id": 1654, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "495:4:5", + "src": "495:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1093,28 +1093,28 @@ "visibility": "internal" } ], - "src": "457:49:5" + "src": "457:49:7" }, - "src": "434:73:5" + "src": "434:73:7" }, { "anonymous": false, "documentation": null, - "id": 1514, + "id": 1661, "name": "_ProposalExpired", "nodeType": "EventDefinition", "parameters": { - "id": 1513, + "id": 1660, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1512, + "id": 1659, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1514, - "src": "533:22:5", + "scope": 1661, + "src": "533:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1122,10 +1122,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1511, + "id": 1658, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "533:7:5", + "src": "533:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1135,28 +1135,28 @@ "visibility": "internal" } ], - "src": "532:24:5" + "src": "532:24:7" }, - "src": "510:47:5" + "src": "510:47:7" }, { "anonymous": false, "documentation": null, - "id": 1524, + "id": 1671, "name": "_ChallengeSucceeded", "nodeType": "EventDefinition", "parameters": { - "id": 1523, + "id": 1670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1516, + "id": 1663, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "586:22:5", + "scope": 1671, + "src": "586:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1164,10 +1164,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1515, + "id": 1662, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "586:7:5", + "src": "586:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1178,12 +1178,12 @@ }, { "constant": false, - "id": 1518, + "id": 1665, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "610:24:5", + "scope": 1671, + "src": "610:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1191,10 +1191,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1517, + "id": 1664, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "610:4:5", + "src": "610:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1205,12 +1205,12 @@ }, { "constant": false, - "id": 1520, + "id": 1667, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "636:15:5", + "scope": 1671, + "src": "636:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1218,10 +1218,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1519, + "id": 1666, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "636:4:5", + "src": "636:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1232,12 +1232,12 @@ }, { "constant": false, - "id": 1522, + "id": 1669, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "653:16:5", + "scope": 1671, + "src": "653:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1245,10 +1245,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1521, + "id": 1668, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "653:4:5", + "src": "653:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1258,28 +1258,28 @@ "visibility": "internal" } ], - "src": "585:85:5" + "src": "585:85:7" }, - "src": "560:111:5" + "src": "560:111:7" }, { "anonymous": false, "documentation": null, - "id": 1534, + "id": 1681, "name": "_ChallengeFailed", "nodeType": "EventDefinition", "parameters": { - "id": 1533, + "id": 1680, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1526, + "id": 1673, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "697:22:5", + "scope": 1681, + "src": "697:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1287,10 +1287,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1525, + "id": 1672, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "697:7:5", + "src": "697:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1301,12 +1301,12 @@ }, { "constant": false, - "id": 1528, + "id": 1675, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "721:24:5", + "scope": 1681, + "src": "721:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1314,10 +1314,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1527, + "id": 1674, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "721:4:5", + "src": "721:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1328,12 +1328,12 @@ }, { "constant": false, - "id": 1530, + "id": 1677, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "747:15:5", + "scope": 1681, + "src": "747:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1341,10 +1341,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1529, + "id": 1676, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "747:4:5", + "src": "747:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1355,12 +1355,12 @@ }, { "constant": false, - "id": 1532, + "id": 1679, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "764:16:5", + "scope": 1681, + "src": "764:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1368,10 +1368,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1531, + "id": 1678, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "764:4:5", + "src": "764:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1381,28 +1381,28 @@ "visibility": "internal" } ], - "src": "696:85:5" + "src": "696:85:7" }, - "src": "674:108:5" + "src": "674:108:7" }, { "anonymous": false, "documentation": null, - "id": 1542, + "id": 1689, "name": "_RewardClaimed", "nodeType": "EventDefinition", "parameters": { - "id": 1541, + "id": 1688, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1536, + "id": 1683, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "806:24:5", + "scope": 1689, + "src": "806:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1410,10 +1410,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1535, + "id": 1682, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "806:4:5", + "src": "806:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1424,12 +1424,12 @@ }, { "constant": false, - "id": 1538, + "id": 1685, "indexed": false, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "832:11:5", + "scope": 1689, + "src": "832:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1437,10 +1437,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1537, + "id": 1684, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "832:4:5", + "src": "832:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1451,12 +1451,12 @@ }, { "constant": false, - "id": 1540, + "id": 1687, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "845:21:5", + "scope": 1689, + "src": "845:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1464,10 +1464,10 @@ "typeString": "address" }, "typeName": { - "id": 1539, + "id": 1686, "name": "address", "nodeType": "ElementaryTypeName", - "src": "845:7:5", + "src": "845:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1477,31 +1477,31 @@ "visibility": "internal" } ], - "src": "805:62:5" + "src": "805:62:7" }, - "src": "785:83:5" + "src": "785:83:7" }, { - "id": 1545, + "id": 1692, "libraryName": { "contractScope": null, - "id": 1543, + "id": 1690, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "925:8:5", + "referencedDeclaration": 3891, + "src": "925:8:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "919:24:5", + "src": "919:24:7", "typeName": { - "id": 1544, + "id": 1691, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "938:4:5", + "src": "938:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1510,15 +1510,15 @@ }, { "canonicalName": "Parameterizer.ParamProposal", - "id": 1560, + "id": 1707, "members": [ { "constant": false, - "id": 1547, + "id": 1694, "name": "appExpiry", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "974:14:5", + "scope": 1707, + "src": "974:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1526,10 +1526,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1546, + "id": 1693, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "974:4:5", + "src": "974:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1540,11 +1540,11 @@ }, { "constant": false, - "id": 1549, + "id": 1696, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "994:16:5", + "scope": 1707, + "src": "994:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1552,10 +1552,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1548, + "id": 1695, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "994:4:5", + "src": "994:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1566,11 +1566,11 @@ }, { "constant": false, - "id": 1551, + "id": 1698, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1016:12:5", + "scope": 1707, + "src": "1016:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1578,10 +1578,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1550, + "id": 1697, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1016:4:5", + "src": "1016:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1592,11 +1592,11 @@ }, { "constant": false, - "id": 1553, + "id": 1700, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1034:11:5", + "scope": 1707, + "src": "1034:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1604,10 +1604,10 @@ "typeString": "string" }, "typeName": { - "id": 1552, + "id": 1699, "name": "string", "nodeType": "ElementaryTypeName", - "src": "1034:6:5", + "src": "1034:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -1618,11 +1618,11 @@ }, { "constant": false, - "id": 1555, + "id": 1702, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1051:13:5", + "scope": 1707, + "src": "1051:13:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1630,10 +1630,10 @@ "typeString": "address" }, "typeName": { - "id": 1554, + "id": 1701, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1051:7:5", + "src": "1051:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1644,11 +1644,11 @@ }, { "constant": false, - "id": 1557, + "id": 1704, "name": "processBy", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1070:14:5", + "scope": 1707, + "src": "1070:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1656,10 +1656,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1556, + "id": 1703, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1070:4:5", + "src": "1070:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1670,11 +1670,11 @@ }, { "constant": false, - "id": 1559, + "id": 1706, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1090:10:5", + "scope": 1707, + "src": "1090:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1682,10 +1682,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1558, + "id": 1705, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1090:4:5", + "src": "1090:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1697,21 +1697,21 @@ ], "name": "ParamProposal", "nodeType": "StructDefinition", - "scope": 2490, - "src": "947:158:5", + "scope": 2653, + "src": "947:158:7", "visibility": "public" }, { "canonicalName": "Parameterizer.Challenge", - "id": 1575, + "id": 1722, "members": [ { "constant": false, - "id": 1562, + "id": 1709, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1132:15:5", + "scope": 1722, + "src": "1132:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1719,10 +1719,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1561, + "id": 1708, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1132:4:5", + "src": "1132:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1733,11 +1733,11 @@ }, { "constant": false, - "id": 1564, + "id": 1711, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1225:18:5", + "scope": 1722, + "src": "1225:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1745,10 +1745,10 @@ "typeString": "address" }, "typeName": { - "id": 1563, + "id": 1710, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1225:7:5", + "src": "1225:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1759,11 +1759,11 @@ }, { "constant": false, - "id": 1566, + "id": 1713, "name": "resolved", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1275:13:5", + "scope": 1722, + "src": "1275:13:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1771,10 +1771,10 @@ "typeString": "bool" }, "typeName": { - "id": 1565, + "id": 1712, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1275:4:5", + "src": "1275:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1785,11 +1785,11 @@ }, { "constant": false, - "id": 1568, + "id": 1715, "name": "stake", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1345:10:5", + "scope": 1722, + "src": "1345:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1797,10 +1797,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1567, + "id": 1714, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1345:4:5", + "src": "1345:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1811,11 +1811,11 @@ }, { "constant": false, - "id": 1570, + "id": 1717, "name": "winningTokens", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1435:18:5", + "scope": 1722, + "src": "1435:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1823,10 +1823,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1569, + "id": 1716, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1435:4:5", + "src": "1435:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1837,11 +1837,11 @@ }, { "constant": false, - "id": 1574, + "id": 1721, "name": "tokenClaims", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1531:36:5", + "scope": 1722, + "src": "1531:36:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1849,28 +1849,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 1573, + "id": 1720, "keyType": { - "id": 1571, + "id": 1718, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1539:7:5", + "src": "1539:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1531:24:5", + "src": "1531:24:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 1572, + "id": 1719, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1550:4:5", + "src": "1550:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1883,17 +1883,17 @@ ], "name": "Challenge", "nodeType": "StructDefinition", - "scope": 2490, - "src": "1109:463:5", + "scope": 2653, + "src": "1109:463:7", "visibility": "public" }, { "constant": false, - "id": 1579, + "id": 1726, "name": "params", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1612:38:5", + "scope": 2653, + "src": "1612:38:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1901,28 +1901,28 @@ "typeString": "mapping(bytes32 => uint256)" }, "typeName": { - "id": 1578, + "id": 1725, "keyType": { - "id": 1576, + "id": 1723, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1620:7:5", + "src": "1620:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1612:24:5", + "src": "1612:24:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" }, "valueType": { - "id": 1577, + "id": 1724, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1631:4:5", + "src": "1631:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1934,44 +1934,44 @@ }, { "constant": false, - "id": 1583, + "id": 1730, "name": "challenges", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1707:44:5", + "scope": 2653, + "src": "1707:44:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge)" }, "typeName": { - "id": 1582, + "id": 1729, "keyType": { - "id": 1580, + "id": 1727, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1715:4:5", + "src": "1715:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "1707:26:5", + "src": "1707:26:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge)" }, "valueType": { "contractScope": null, - "id": 1581, + "id": 1728, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "1723:9:5", + "referencedDeclaration": 1722, + "src": "1723:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } } @@ -1981,44 +1981,44 @@ }, { "constant": false, - "id": 1587, + "id": 1734, "name": "proposals", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1813:50:5", + "scope": 2653, + "src": "1813:50:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal)" }, "typeName": { - "id": 1586, + "id": 1733, "keyType": { - "id": 1584, + "id": 1731, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1821:7:5", + "src": "1821:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1813:33:5", + "src": "1813:33:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal)" }, "valueType": { "contractScope": null, - "id": 1585, + "id": 1732, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "1832:13:5", + "referencedDeclaration": 1707, + "src": "1832:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } } @@ -2028,26 +2028,26 @@ }, { "constant": false, - "id": 1589, + "id": 1736, "name": "token", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1890:18:5", + "scope": 2653, + "src": "1890:18:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 1588, + "id": 1735, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "1890:5:5", + "referencedDeclaration": 528, + "src": "1890:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2056,26 +2056,26 @@ }, { "constant": false, - "id": 1591, + "id": 1738, "name": "voting", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1912:24:5", + "scope": 2653, + "src": "1912:24:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, "typeName": { "contractScope": null, - "id": 1590, + "id": 1737, "name": "PLCRVoting", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1471, - "src": "1912:10:5", + "referencedDeclaration": 1618, + "src": "1912:10:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -2084,11 +2084,11 @@ }, { "constant": false, - "id": 1594, + "id": 1741, "name": "PROCESSBY", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1940:30:5", + "scope": 2653, + "src": "1940:30:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -2096,10 +2096,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1592, + "id": 1739, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1940:4:5", + "src": "1940:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2108,14 +2108,14 @@ "value": { "argumentTypes": null, "hexValue": "363034383030", - "id": 1593, + "id": 1740, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1964:6:5", + "src": "1964:6:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_604800_by_1", @@ -2127,28 +2127,28 @@ }, { "body": { - "id": 1697, + "id": 1844, "nodeType": "Block", - "src": "3592:581:5", + "src": "3592:581:7", "statements": [ { "expression": { "argumentTypes": null, - "id": 1629, + "id": 1776, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1625, + "id": 1772, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "3598:5:5", + "referencedDeclaration": 1736, + "src": "3598:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2159,12 +2159,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1627, + "id": 1774, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1596, - "src": "3612:10:5", + "referencedDeclaration": 1743, + "src": "3612:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2178,18 +2178,18 @@ "typeString": "address" } ], - "id": 1626, + "id": 1773, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "3606:5:5", + "referencedDeclaration": 528, + "src": "3606:5:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 1628, + "id": 1775, "isConstant": false, "isLValue": false, "isPure": false, @@ -2197,40 +2197,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3606:17:5", + "src": "3606:17:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "3598:25:5", + "src": "3598:25:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1630, + "id": 1777, "nodeType": "ExpressionStatement", - "src": "3598:25:5" + "src": "3598:25:7" }, { "expression": { "argumentTypes": null, - "id": 1635, + "id": 1782, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1631, + "id": 1778, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "3629:6:5", + "referencedDeclaration": 1738, + "src": "3629:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -2241,12 +2241,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1633, + "id": 1780, "name": "_plcrAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1598, - "src": "3649:9:5", + "referencedDeclaration": 1745, + "src": "3649:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2260,18 +2260,18 @@ "typeString": "address" } ], - "id": 1632, + "id": 1779, "name": "PLCRVoting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1471, - "src": "3638:10:5", + "referencedDeclaration": 1618, + "src": "3638:10:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1471_$", + "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1618_$", "typeString": "type(contract PLCRVoting)" } }, - "id": 1634, + "id": 1781, "isConstant": false, "isLValue": false, "isPure": false, @@ -2279,21 +2279,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3638:21:5", + "src": "3638:21:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "src": "3629:30:5", + "src": "3629:30:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1636, + "id": 1783, "nodeType": "ExpressionStatement", - "src": "3629:30:5" + "src": "3629:30:7" }, { "expression": { @@ -2302,14 +2302,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 1638, + "id": 1785, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3670:12:5", + "src": "3670:12:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -2319,12 +2319,12 @@ }, { "argumentTypes": null, - "id": 1639, + "id": 1786, "name": "_minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1600, - "src": "3684:11:5", + "referencedDeclaration": 1747, + "src": "3684:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2342,18 +2342,18 @@ "typeString": "uint256" } ], - "id": 1637, + "id": 1784, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3666:3:5", + "referencedDeclaration": 2652, + "src": "3666:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1640, + "id": 1787, "isConstant": false, "isLValue": false, "isPure": false, @@ -2361,15 +2361,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3666:30:5", + "src": "3666:30:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1641, + "id": 1788, "nodeType": "ExpressionStatement", - "src": "3666:30:5" + "src": "3666:30:7" }, { "expression": { @@ -2378,14 +2378,14 @@ { "argumentTypes": null, "hexValue": "704d696e4465706f736974", - "id": 1643, + "id": 1790, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3706:13:5", + "src": "3706:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_79b35b6e30f7c782e133dcfa06a825d420ec880f4036bf04dd005fe368978200", @@ -2395,12 +2395,12 @@ }, { "argumentTypes": null, - "id": 1644, + "id": 1791, "name": "_pMinDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1602, - "src": "3721:12:5", + "referencedDeclaration": 1749, + "src": "3721:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2418,18 +2418,18 @@ "typeString": "uint256" } ], - "id": 1642, + "id": 1789, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3702:3:5", + "referencedDeclaration": 2652, + "src": "3702:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1645, + "id": 1792, "isConstant": false, "isLValue": false, "isPure": false, @@ -2437,15 +2437,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3702:32:5", + "src": "3702:32:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1646, + "id": 1793, "nodeType": "ExpressionStatement", - "src": "3702:32:5" + "src": "3702:32:7" }, { "expression": { @@ -2454,14 +2454,14 @@ { "argumentTypes": null, "hexValue": "6170706c7953746167654c656e", - "id": 1648, + "id": 1795, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3744:15:5", + "src": "3744:15:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8c03b11eba3b2d069479ae0d3837927171e72e193c0acb726bbd53bdd5902da", @@ -2471,12 +2471,12 @@ }, { "argumentTypes": null, - "id": 1649, + "id": 1796, "name": "_applyStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1604, - "src": "3761:14:5", + "referencedDeclaration": 1751, + "src": "3761:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2494,18 +2494,18 @@ "typeString": "uint256" } ], - "id": 1647, + "id": 1794, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3740:3:5", + "referencedDeclaration": 2652, + "src": "3740:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1650, + "id": 1797, "isConstant": false, "isLValue": false, "isPure": false, @@ -2513,15 +2513,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3740:36:5", + "src": "3740:36:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1651, + "id": 1798, "nodeType": "ExpressionStatement", - "src": "3740:36:5" + "src": "3740:36:7" }, { "expression": { @@ -2530,14 +2530,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1653, + "id": 1800, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3786:16:5", + "src": "3786:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -2547,12 +2547,12 @@ }, { "argumentTypes": null, - "id": 1654, + "id": 1801, "name": "_pApplyStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1606, - "src": "3804:15:5", + "referencedDeclaration": 1753, + "src": "3804:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2570,18 +2570,18 @@ "typeString": "uint256" } ], - "id": 1652, + "id": 1799, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3782:3:5", + "referencedDeclaration": 2652, + "src": "3782:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1655, + "id": 1802, "isConstant": false, "isLValue": false, "isPure": false, @@ -2589,15 +2589,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3782:38:5", + "src": "3782:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1656, + "id": 1803, "nodeType": "ExpressionStatement", - "src": "3782:38:5" + "src": "3782:38:7" }, { "expression": { @@ -2606,14 +2606,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697453746167654c656e", - "id": 1658, + "id": 1805, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3830:16:5", + "src": "3830:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22aa10f6207ed6245b2e23bddfcdfa1a542b375f7cf45082a1a75b9304a6150d", @@ -2623,12 +2623,12 @@ }, { "argumentTypes": null, - "id": 1659, + "id": 1806, "name": "_commitStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1608, - "src": "3848:15:5", + "referencedDeclaration": 1755, + "src": "3848:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2646,18 +2646,18 @@ "typeString": "uint256" } ], - "id": 1657, + "id": 1804, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3826:3:5", + "referencedDeclaration": 2652, + "src": "3826:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1660, + "id": 1807, "isConstant": false, "isLValue": false, "isPure": false, @@ -2665,15 +2665,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3826:38:5", + "src": "3826:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1661, + "id": 1808, "nodeType": "ExpressionStatement", - "src": "3826:38:5" + "src": "3826:38:7" }, { "expression": { @@ -2682,14 +2682,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1663, + "id": 1810, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3874:17:5", + "src": "3874:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -2699,12 +2699,12 @@ }, { "argumentTypes": null, - "id": 1664, + "id": 1811, "name": "_pCommitStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1610, - "src": "3893:16:5", + "referencedDeclaration": 1757, + "src": "3893:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2722,18 +2722,18 @@ "typeString": "uint256" } ], - "id": 1662, + "id": 1809, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3870:3:5", + "referencedDeclaration": 2652, + "src": "3870:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1665, + "id": 1812, "isConstant": false, "isLValue": false, "isPure": false, @@ -2741,15 +2741,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3870:40:5", + "src": "3870:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1666, + "id": 1813, "nodeType": "ExpressionStatement", - "src": "3870:40:5" + "src": "3870:40:7" }, { "expression": { @@ -2758,14 +2758,14 @@ { "argumentTypes": null, "hexValue": "72657665616c53746167654c656e", - "id": 1668, + "id": 1815, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3920:16:5", + "src": "3920:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8858300ed02b4242350c6412c69b3951ae8f1d10eb49beafb9ecebaba7a0af1", @@ -2775,12 +2775,12 @@ }, { "argumentTypes": null, - "id": 1669, + "id": 1816, "name": "_revealStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1612, - "src": "3938:15:5", + "referencedDeclaration": 1759, + "src": "3938:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2798,18 +2798,18 @@ "typeString": "uint256" } ], - "id": 1667, + "id": 1814, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3916:3:5", + "referencedDeclaration": 2652, + "src": "3916:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1670, + "id": 1817, "isConstant": false, "isLValue": false, "isPure": false, @@ -2817,15 +2817,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3916:38:5", + "src": "3916:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1671, + "id": 1818, "nodeType": "ExpressionStatement", - "src": "3916:38:5" + "src": "3916:38:7" }, { "expression": { @@ -2834,14 +2834,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1673, + "id": 1820, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3964:17:5", + "src": "3964:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -2851,12 +2851,12 @@ }, { "argumentTypes": null, - "id": 1674, + "id": 1821, "name": "_pRevealStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1614, - "src": "3983:16:5", + "referencedDeclaration": 1761, + "src": "3983:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2874,18 +2874,18 @@ "typeString": "uint256" } ], - "id": 1672, + "id": 1819, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3960:3:5", + "referencedDeclaration": 2652, + "src": "3960:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1675, + "id": 1822, "isConstant": false, "isLValue": false, "isPure": false, @@ -2893,15 +2893,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3960:40:5", + "src": "3960:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1676, + "id": 1823, "nodeType": "ExpressionStatement", - "src": "3960:40:5" + "src": "3960:40:7" }, { "expression": { @@ -2910,14 +2910,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 1678, + "id": 1825, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4010:17:5", + "src": "4010:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -2927,12 +2927,12 @@ }, { "argumentTypes": null, - "id": 1679, + "id": 1826, "name": "_dispensationPct", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1616, - "src": "4029:16:5", + "referencedDeclaration": 1763, + "src": "4029:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2950,18 +2950,18 @@ "typeString": "uint256" } ], - "id": 1677, + "id": 1824, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4006:3:5", + "referencedDeclaration": 2652, + "src": "4006:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1680, + "id": 1827, "isConstant": false, "isLValue": false, "isPure": false, @@ -2969,15 +2969,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4006:40:5", + "src": "4006:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1681, + "id": 1828, "nodeType": "ExpressionStatement", - "src": "4006:40:5" + "src": "4006:40:7" }, { "expression": { @@ -2986,14 +2986,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1683, + "id": 1830, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4056:18:5", + "src": "4056:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -3003,12 +3003,12 @@ }, { "argumentTypes": null, - "id": 1684, + "id": 1831, "name": "_pDispensationPct", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1618, - "src": "4076:17:5", + "referencedDeclaration": 1765, + "src": "4076:17:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3026,18 +3026,18 @@ "typeString": "uint256" } ], - "id": 1682, + "id": 1829, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4052:3:5", + "referencedDeclaration": 2652, + "src": "4052:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1685, + "id": 1832, "isConstant": false, "isLValue": false, "isPure": false, @@ -3045,15 +3045,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4052:42:5", + "src": "4052:42:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1686, + "id": 1833, "nodeType": "ExpressionStatement", - "src": "4052:42:5" + "src": "4052:42:7" }, { "expression": { @@ -3062,14 +3062,14 @@ { "argumentTypes": null, "hexValue": "766f746551756f72756d", - "id": 1688, + "id": 1835, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4104:12:5", + "src": "4104:12:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9b01c2212638b995654bf3d584befbb3576184e03cd1a9ae5693a18a1f559878", @@ -3079,12 +3079,12 @@ }, { "argumentTypes": null, - "id": 1689, + "id": 1836, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1620, - "src": "4118:11:5", + "referencedDeclaration": 1767, + "src": "4118:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3102,18 +3102,18 @@ "typeString": "uint256" } ], - "id": 1687, + "id": 1834, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4100:3:5", + "referencedDeclaration": 2652, + "src": "4100:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1690, + "id": 1837, "isConstant": false, "isLValue": false, "isPure": false, @@ -3121,15 +3121,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4100:30:5", + "src": "4100:30:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1691, + "id": 1838, "nodeType": "ExpressionStatement", - "src": "4100:30:5" + "src": "4100:30:7" }, { "expression": { @@ -3138,14 +3138,14 @@ { "argumentTypes": null, "hexValue": "70566f746551756f72756d", - "id": 1693, + "id": 1840, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4140:13:5", + "src": "4140:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1cd8ca3a1baaf24ca4431f7b59b78854d08ce96815f9b5677de2c92385fb9138", @@ -3155,12 +3155,12 @@ }, { "argumentTypes": null, - "id": 1694, + "id": 1841, "name": "_pVoteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1622, - "src": "4155:12:5", + "referencedDeclaration": 1769, + "src": "4155:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3178,18 +3178,18 @@ "typeString": "uint256" } ], - "id": 1692, + "id": 1839, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4136:3:5", + "referencedDeclaration": 2652, + "src": "4136:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1695, + "id": 1842, "isConstant": false, "isLValue": false, "isPure": false, @@ -3197,20 +3197,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4136:32:5", + "src": "4136:32:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1696, + "id": 1843, "nodeType": "ExpressionStatement", - "src": "4136:32:5" + "src": "4136:32:7" } ] }, "documentation": "@dev constructor\n@param _tokenAddr address of the token which parameterizes this system\n@param _plcrAddr address of a PLCR voting contract for the provided token\n@param _minDeposit minimum deposit for listing to be whitelisted\n@param _pMinDeposit minimum deposit to propose a reparameterization\n@param _applyStageLen period over which applicants wait to be whitelisted\n@param _pApplyStageLen period over which reparmeterization proposals wait to be processed\n@param _dispensationPct percentage of losing party's deposit distributed to winning party\n@param _pDispensationPct percentage of losing party's deposit distributed to winning party in parameterizer\n@param _commitStageLen length of commit period for voting\n@param _pCommitStageLen length of commit period for voting in parameterizer\n@param _revealStageLen length of reveal period for voting\n@param _pRevealStageLen length of reveal period for voting in parameterizer\n@param _voteQuorum type of majority out of 100 necessary for vote success\n@param _pVoteQuorum type of majority out of 100 necessary for vote success in parameterizer", - "id": 1698, + "id": 1845, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -3218,16 +3218,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1623, + "id": 1770, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1596, + "id": 1743, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3233:18:5", + "scope": 1845, + "src": "3233:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3235,10 +3235,10 @@ "typeString": "address" }, "typeName": { - "id": 1595, + "id": 1742, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3233:7:5", + "src": "3233:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3249,11 +3249,11 @@ }, { "constant": false, - "id": 1598, + "id": 1745, "name": "_plcrAddr", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3257:17:5", + "scope": 1845, + "src": "3257:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3261,10 +3261,10 @@ "typeString": "address" }, "typeName": { - "id": 1597, + "id": 1744, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3257:7:5", + "src": "3257:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3275,11 +3275,11 @@ }, { "constant": false, - "id": 1600, + "id": 1747, "name": "_minDeposit", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3280:16:5", + "scope": 1845, + "src": "3280:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3287,10 +3287,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1599, + "id": 1746, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3280:4:5", + "src": "3280:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3301,11 +3301,11 @@ }, { "constant": false, - "id": 1602, + "id": 1749, "name": "_pMinDeposit", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3302:17:5", + "scope": 1845, + "src": "3302:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3313,10 +3313,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1601, + "id": 1748, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3302:4:5", + "src": "3302:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3327,11 +3327,11 @@ }, { "constant": false, - "id": 1604, + "id": 1751, "name": "_applyStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3325:19:5", + "scope": 1845, + "src": "3325:19:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3339,10 +3339,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1603, + "id": 1750, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3325:4:5", + "src": "3325:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3353,11 +3353,11 @@ }, { "constant": false, - "id": 1606, + "id": 1753, "name": "_pApplyStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3350:20:5", + "scope": 1845, + "src": "3350:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3365,10 +3365,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1605, + "id": 1752, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3350:4:5", + "src": "3350:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3379,11 +3379,11 @@ }, { "constant": false, - "id": 1608, + "id": 1755, "name": "_commitStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3376:20:5", + "scope": 1845, + "src": "3376:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3391,10 +3391,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1607, + "id": 1754, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3376:4:5", + "src": "3376:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3405,11 +3405,11 @@ }, { "constant": false, - "id": 1610, + "id": 1757, "name": "_pCommitStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3402:21:5", + "scope": 1845, + "src": "3402:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3417,10 +3417,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1609, + "id": 1756, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3402:4:5", + "src": "3402:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3431,11 +3431,11 @@ }, { "constant": false, - "id": 1612, + "id": 1759, "name": "_revealStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3429:20:5", + "scope": 1845, + "src": "3429:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3443,10 +3443,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1611, + "id": 1758, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3429:4:5", + "src": "3429:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3457,11 +3457,11 @@ }, { "constant": false, - "id": 1614, + "id": 1761, "name": "_pRevealStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3455:21:5", + "scope": 1845, + "src": "3455:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3469,10 +3469,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1613, + "id": 1760, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3455:4:5", + "src": "3455:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3483,11 +3483,11 @@ }, { "constant": false, - "id": 1616, + "id": 1763, "name": "_dispensationPct", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3482:21:5", + "scope": 1845, + "src": "3482:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3495,10 +3495,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1615, + "id": 1762, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3482:4:5", + "src": "3482:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3509,11 +3509,11 @@ }, { "constant": false, - "id": 1618, + "id": 1765, "name": "_pDispensationPct", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3509:22:5", + "scope": 1845, + "src": "3509:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3521,10 +3521,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1617, + "id": 1764, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3509:4:5", + "src": "3509:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3535,11 +3535,11 @@ }, { "constant": false, - "id": 1620, + "id": 1767, "name": "_voteQuorum", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3537:16:5", + "scope": 1845, + "src": "3537:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3547,10 +3547,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1619, + "id": 1766, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3537:4:5", + "src": "3537:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3561,11 +3561,11 @@ }, { "constant": false, - "id": 1622, + "id": 1769, "name": "_pVoteQuorum", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3559:17:5", + "scope": 1845, + "src": "3559:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3573,10 +3573,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1621, + "id": 1768, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3559:4:5", + "src": "3559:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3586,39 +3586,39 @@ "visibility": "internal" } ], - "src": "3227:355:5" + "src": "3227:355:7" }, "payable": false, "returnParameters": { - "id": 1624, + "id": 1771, "nodeType": "ParameterList", "parameters": [], - "src": "3592:0:5" + "src": "3592:0:7" }, - "scope": 2490, - "src": "3216:957:5", + "scope": 2653, + "src": "3216:957:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1836, + "id": 1983, "nodeType": "Block", - "src": "4555:1133:5", + "src": "4555:1133:7", "statements": [ { "assignments": [ - 1708 + 1855 ], "declarations": [ { "constant": false, - "id": 1708, + "id": 1855, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4561:12:5", + "scope": 1984, + "src": "4561:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3626,10 +3626,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1707, + "id": 1854, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4561:4:5", + "src": "4561:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3639,21 +3639,21 @@ "visibility": "internal" } ], - "id": 1712, + "id": 1859, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "704d696e4465706f736974", - "id": 1710, + "id": 1857, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4580:13:5", + "src": "4580:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_79b35b6e30f7c782e133dcfa06a825d420ec880f4036bf04dd005fe368978200", @@ -3669,18 +3669,18 @@ "typeString": "literal_string \"pMinDeposit\"" } ], - "id": 1709, + "id": 1856, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "4576:3:5", + "referencedDeclaration": 2512, + "src": "4576:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1711, + "id": 1858, "isConstant": false, "isLValue": false, "isPure": false, @@ -3688,27 +3688,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4576:18:5", + "src": "4576:18:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "4561:33:5" + "src": "4561:33:7" }, { "assignments": [ - 1714 + 1861 ], "declarations": [ { "constant": false, - "id": 1714, + "id": 1861, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4600:14:5", + "scope": 1984, + "src": "4600:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3716,10 +3716,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1713, + "id": 1860, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4600:7:5", + "src": "4600:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3729,7 +3729,7 @@ "visibility": "internal" } ], - "id": 1722, + "id": 1869, "initialValue": { "argumentTypes": null, "arguments": [ @@ -3738,12 +3738,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1718, + "id": 1865, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4644:5:5", + "referencedDeclaration": 1847, + "src": "4644:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -3751,12 +3751,12 @@ }, { "argumentTypes": null, - "id": 1719, + "id": 1866, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4651:6:5", + "referencedDeclaration": 1849, + "src": "4651:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3776,18 +3776,18 @@ ], "expression": { "argumentTypes": null, - "id": 1716, + "id": 1863, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4627:3:5", + "referencedDeclaration": 4140, + "src": "4627:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1717, + "id": 1864, "isConstant": false, "isLValue": false, "isPure": true, @@ -3795,13 +3795,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4627:16:5", + "src": "4627:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1720, + "id": 1867, "isConstant": false, "isLValue": false, "isPure": false, @@ -3809,7 +3809,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4627:31:5", + "src": "4627:31:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -3823,18 +3823,18 @@ "typeString": "bytes memory" } ], - "id": 1715, + "id": 1862, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4617:9:5", + "referencedDeclaration": 4147, + "src": "4617:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1721, + "id": 1868, "isConstant": false, "isLValue": false, "isPure": false, @@ -3842,14 +3842,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4617:42:5", + "src": "4617:42:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "4600:59:5" + "src": "4600:59:7" }, { "condition": { @@ -3858,7 +3858,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1749, + "id": 1896, "isConstant": false, "isLValue": false, "isPure": false, @@ -3869,7 +3869,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1735, + "id": 1882, "isConstant": false, "isLValue": false, "isPure": false, @@ -3882,12 +3882,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1726, + "id": 1873, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4697:5:5", + "referencedDeclaration": 1847, + "src": "4697:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -3903,18 +3903,18 @@ ], "expression": { "argumentTypes": null, - "id": 1724, + "id": 1871, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4680:3:5", + "referencedDeclaration": 4140, + "src": "4680:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1725, + "id": 1872, "isConstant": false, "isLValue": false, "isPure": true, @@ -3922,13 +3922,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4680:16:5", + "src": "4680:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1727, + "id": 1874, "isConstant": false, "isLValue": false, "isPure": false, @@ -3936,7 +3936,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4680:23:5", + "src": "4680:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -3950,18 +3950,18 @@ "typeString": "bytes memory" } ], - "id": 1723, + "id": 1870, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4670:9:5", + "referencedDeclaration": 4147, + "src": "4670:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1728, + "id": 1875, "isConstant": false, "isLValue": false, "isPure": false, @@ -3969,7 +3969,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4670:34:5", + "src": "4670:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3986,14 +3986,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 1732, + "id": 1879, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4735:17:5", + "src": "4735:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -4011,18 +4011,18 @@ ], "expression": { "argumentTypes": null, - "id": 1730, + "id": 1877, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4718:3:5", + "referencedDeclaration": 4140, + "src": "4718:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1731, + "id": 1878, "isConstant": false, "isLValue": false, "isPure": true, @@ -4030,13 +4030,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4718:16:5", + "src": "4718:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1733, + "id": 1880, "isConstant": false, "isLValue": false, "isPure": true, @@ -4044,7 +4044,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4718:35:5", + "src": "4718:35:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -4058,18 +4058,18 @@ "typeString": "bytes memory" } ], - "id": 1729, + "id": 1876, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4708:9:5", + "referencedDeclaration": 4147, + "src": "4708:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1734, + "id": 1881, "isConstant": false, "isLValue": false, "isPure": true, @@ -4077,13 +4077,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4708:46:5", + "src": "4708:46:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "4670:84:5", + "src": "4670:84:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4097,7 +4097,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1748, + "id": 1895, "isConstant": false, "isLValue": false, "isPure": false, @@ -4110,12 +4110,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1739, + "id": 1886, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4792:5:5", + "referencedDeclaration": 1847, + "src": "4792:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -4131,18 +4131,18 @@ ], "expression": { "argumentTypes": null, - "id": 1737, + "id": 1884, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4775:3:5", + "referencedDeclaration": 4140, + "src": "4775:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1738, + "id": 1885, "isConstant": false, "isLValue": false, "isPure": true, @@ -4150,13 +4150,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4775:16:5", + "src": "4775:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1740, + "id": 1887, "isConstant": false, "isLValue": false, "isPure": false, @@ -4164,7 +4164,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4775:23:5", + "src": "4775:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -4178,18 +4178,18 @@ "typeString": "bytes memory" } ], - "id": 1736, + "id": 1883, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4765:9:5", + "referencedDeclaration": 4147, + "src": "4765:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1741, + "id": 1888, "isConstant": false, "isLValue": false, "isPure": false, @@ -4197,7 +4197,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4765:34:5", + "src": "4765:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4214,14 +4214,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1745, + "id": 1892, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4830:18:5", + "src": "4830:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -4239,18 +4239,18 @@ ], "expression": { "argumentTypes": null, - "id": 1743, + "id": 1890, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4813:3:5", + "referencedDeclaration": 4140, + "src": "4813:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1744, + "id": 1891, "isConstant": false, "isLValue": false, "isPure": true, @@ -4258,13 +4258,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4813:16:5", + "src": "4813:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1746, + "id": 1893, "isConstant": false, "isLValue": false, "isPure": true, @@ -4272,7 +4272,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4813:36:5", + "src": "4813:36:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -4286,18 +4286,18 @@ "typeString": "bytes memory" } ], - "id": 1742, + "id": 1889, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4803:9:5", + "referencedDeclaration": 4147, + "src": "4803:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1747, + "id": 1894, "isConstant": false, "isLValue": false, "isPure": true, @@ -4305,32 +4305,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4803:47:5", + "src": "4803:47:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "4765:85:5", + "src": "4765:85:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "4670:180:5", + "src": "4670:180:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1757, + "id": 1904, "nodeType": "IfStatement", - "src": "4666:223:5", + "src": "4666:223:7", "trueBody": { - "id": 1756, + "id": 1903, "nodeType": "Block", - "src": "4852:37:5", + "src": "4852:37:7", "statements": [ { "expression": { @@ -4342,19 +4342,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1753, + "id": 1900, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1751, + "id": 1898, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4868:6:5", + "referencedDeclaration": 1849, + "src": "4868:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4365,14 +4365,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 1752, + "id": 1899, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4878:3:5", + "src": "4878:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -4380,7 +4380,7 @@ }, "value": "100" }, - "src": "4868:13:5", + "src": "4868:13:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4394,21 +4394,21 @@ "typeString": "bool" } ], - "id": 1750, + "id": 1897, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4860:7:5", + "referencedDeclaration": 4156, + "src": "4860:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1754, + "id": 1901, "isConstant": false, "isLValue": false, "isPure": false, @@ -4416,15 +4416,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4860:22:5", + "src": "4860:22:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1755, + "id": 1902, "nodeType": "ExpressionStatement", - "src": "4860:22:5" + "src": "4860:22:7" } ] } @@ -4435,7 +4435,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1762, + "id": 1909, "isConstant": false, "isLValue": false, "isPure": false, @@ -4443,18 +4443,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "4903:19:5", + "src": "4903:19:7", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1760, + "id": 1907, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "4915:6:5", + "referencedDeclaration": 1861, + "src": "4915:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4468,18 +4468,18 @@ "typeString": "bytes32" } ], - "id": 1759, + "id": 1906, "name": "propExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2258, - "src": "4904:10:5", + "referencedDeclaration": 2418, + "src": "4904:10:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1761, + "id": 1908, "isConstant": false, "isLValue": false, "isPure": false, @@ -4487,7 +4487,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4904:18:5", + "src": "4904:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4506,21 +4506,21 @@ "typeString": "bool" } ], - "id": 1758, + "id": 1905, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4895:7:5", + "referencedDeclaration": 4156, + "src": "4895:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1763, + "id": 1910, "isConstant": false, "isLValue": false, "isPure": false, @@ -4528,15 +4528,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4895:28:5", + "src": "4895:28:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1764, + "id": 1911, "nodeType": "ExpressionStatement", - "src": "4895:28:5" + "src": "4895:28:7" }, { "expression": { @@ -4548,7 +4548,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1770, + "id": 1917, "isConstant": false, "isLValue": false, "isPure": false, @@ -4558,12 +4558,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1767, + "id": 1914, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4971:5:5", + "referencedDeclaration": 1847, + "src": "4971:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -4577,18 +4577,18 @@ "typeString": "string memory" } ], - "id": 1766, + "id": 1913, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "4967:3:5", + "referencedDeclaration": 2512, + "src": "4967:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1768, + "id": 1915, "isConstant": false, "isLValue": false, "isPure": false, @@ -4596,7 +4596,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4967:10:5", + "src": "4967:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4606,18 +4606,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 1769, + "id": 1916, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4981:6:5", + "referencedDeclaration": 1849, + "src": "4981:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4967:20:5", + "src": "4967:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4631,21 +4631,21 @@ "typeString": "bool" } ], - "id": 1765, + "id": 1912, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4959:7:5", + "referencedDeclaration": 4156, + "src": "4959:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1771, + "id": 1918, "isConstant": false, "isLValue": false, "isPure": false, @@ -4653,20 +4653,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4959:29:5", + "src": "4959:29:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1772, + "id": 1919, "nodeType": "ExpressionStatement", - "src": "4959:29:5" + "src": "4959:29:7" }, { "expression": { "argumentTypes": null, - "id": 1809, + "id": 1956, "isConstant": false, "isLValue": false, "isPure": false, @@ -4675,26 +4675,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1773, + "id": 1920, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5069:9:5", + "referencedDeclaration": 1734, + "src": "5069:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1775, + "id": 1922, "indexExpression": { "argumentTypes": null, - "id": 1774, + "id": 1921, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5079:6:5", + "referencedDeclaration": 1861, + "src": "5079:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4705,9 +4705,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5069:17:5", + "src": "5069:17:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -4725,14 +4725,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1780, + "id": 1927, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5134:16:5", + "src": "5134:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -4748,18 +4748,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 1779, + "id": 1926, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5130:3:5", + "referencedDeclaration": 2512, + "src": "5130:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1781, + "id": 1928, "isConstant": false, "isLValue": false, "isPure": false, @@ -4767,7 +4767,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5130:21:5", + "src": "5130:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4783,32 +4783,32 @@ ], "expression": { "argumentTypes": null, - "id": 1777, + "id": 1924, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "5122:3:5", + "referencedDeclaration": 4155, + "src": "5122:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1778, + "id": 1925, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5122:7:5", + "referencedDeclaration": 3890, + "src": "5122:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1782, + "id": 1929, "isConstant": false, "isLValue": false, "isPure": false, @@ -4816,7 +4816,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5122:30:5", + "src": "5122:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4825,14 +4825,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1783, + "id": 1930, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5173:1:5", + "src": "5173:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4842,12 +4842,12 @@ }, { "argumentTypes": null, - "id": 1784, + "id": 1931, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5191:7:5", + "referencedDeclaration": 1855, + "src": "5191:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4855,12 +4855,12 @@ }, { "argumentTypes": null, - "id": 1785, + "id": 1932, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "5212:5:5", + "referencedDeclaration": 1847, + "src": "5212:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -4870,18 +4870,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1786, + "id": 1933, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5232:3:5", + "referencedDeclaration": 4153, + "src": "5232:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1787, + "id": 1934, "isConstant": false, "isLValue": false, "isPure": false, @@ -4889,7 +4889,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5232:10:5", + "src": "5232:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4900,12 +4900,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1805, + "id": 1952, "name": "PROCESSBY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1594, - "src": "5379:9:5", + "referencedDeclaration": 1741, + "src": "5379:9:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4928,14 +4928,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1801, + "id": 1948, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5346:17:5", + "src": "5346:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -4951,18 +4951,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 1800, + "id": 1947, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5342:3:5", + "referencedDeclaration": 2512, + "src": "5342:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1802, + "id": 1949, "isConstant": false, "isLValue": false, "isPure": false, @@ -4970,7 +4970,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5342:22:5", + "src": "5342:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4993,14 +4993,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1796, + "id": 1943, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5309:17:5", + "src": "5309:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -5016,18 +5016,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 1795, + "id": 1942, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5305:3:5", + "referencedDeclaration": 2512, + "src": "5305:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1797, + "id": 1944, "isConstant": false, "isLValue": false, "isPure": false, @@ -5035,7 +5035,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5305:22:5", + "src": "5305:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5058,14 +5058,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1791, + "id": 1938, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5273:16:5", + "src": "5273:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -5081,18 +5081,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 1790, + "id": 1937, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5269:3:5", + "referencedDeclaration": 2512, + "src": "5269:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1792, + "id": 1939, "isConstant": false, "isLValue": false, "isPure": false, @@ -5100,7 +5100,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5269:21:5", + "src": "5269:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5116,32 +5116,32 @@ ], "expression": { "argumentTypes": null, - "id": 1788, + "id": 1935, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "5261:3:5", + "referencedDeclaration": 4155, + "src": "5261:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1789, + "id": 1936, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:7:5", + "referencedDeclaration": 3890, + "src": "5261:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1793, + "id": 1940, "isConstant": false, "isLValue": false, "isPure": false, @@ -5149,27 +5149,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:30:5", + "src": "5261:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1794, + "id": 1941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:43:5", + "referencedDeclaration": 3890, + "src": "5261:43:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1798, + "id": 1945, "isConstant": false, "isLValue": false, "isPure": false, @@ -5177,27 +5177,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:67:5", + "src": "5261:67:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1799, + "id": 1946, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:80:5", + "referencedDeclaration": 3890, + "src": "5261:80:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1803, + "id": 1950, "isConstant": false, "isLValue": false, "isPure": false, @@ -5205,27 +5205,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:104:5", + "src": "5261:104:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1804, + "id": 1951, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:117:5", + "referencedDeclaration": 3890, + "src": "5261:117:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1806, + "id": 1953, "isConstant": false, "isLValue": false, "isPure": false, @@ -5233,7 +5233,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:128:5", + "src": "5261:128:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5241,12 +5241,12 @@ }, { "argumentTypes": null, - "id": 1807, + "id": 1954, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "5404:6:5", + "referencedDeclaration": 1849, + "src": "5404:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5255,18 +5255,18 @@ ], "expression": { "argumentTypes": null, - "id": 1776, + "id": 1923, "name": "ParamProposal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1560, - "src": "5089:13:5", + "referencedDeclaration": 1707, + "src": "5089:13:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ParamProposal_$1560_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ParamProposal_$1707_storage_ptr_$", "typeString": "type(struct Parameterizer.ParamProposal storage pointer)" } }, - "id": 1808, + "id": 1955, "isConstant": false, "isLValue": false, "isPure": false, @@ -5282,21 +5282,21 @@ "value" ], "nodeType": "FunctionCall", - "src": "5089:328:5", + "src": "5089:328:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "src": "5069:348:5", + "src": "5069:348:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1810, + "id": 1957, "nodeType": "ExpressionStatement", - "src": "5069:348:5" + "src": "5069:348:7" }, { "expression": { @@ -5309,18 +5309,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1814, + "id": 1961, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5451:3:5", + "referencedDeclaration": 4153, + "src": "5451:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1815, + "id": 1962, "isConstant": false, "isLValue": false, "isPure": false, @@ -5328,7 +5328,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5451:10:5", + "src": "5451:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5336,25 +5336,25 @@ }, { "argumentTypes": null, - "id": 1816, + "id": 1963, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3727, - "src": "5463:4:5", + "referencedDeclaration": 4184, + "src": "5463:4:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, { "argumentTypes": null, - "id": 1817, + "id": 1964, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5469:7:5", + "referencedDeclaration": 1855, + "src": "5469:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5368,7 +5368,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, { @@ -5378,32 +5378,32 @@ ], "expression": { "argumentTypes": null, - "id": 1812, + "id": 1959, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "5432:5:5", + "referencedDeclaration": 1736, + "src": "5432:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1813, + "id": 1960, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "5432:18:5", + "referencedDeclaration": 510, + "src": "5432:18:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 1818, + "id": 1965, "isConstant": false, "isLValue": false, "isPure": false, @@ -5411,7 +5411,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5432:45:5", + "src": "5432:45:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5425,21 +5425,21 @@ "typeString": "bool" } ], - "id": 1811, + "id": 1958, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5424:7:5", + "referencedDeclaration": 4156, + "src": "5424:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1819, + "id": 1966, "isConstant": false, "isLValue": false, "isPure": false, @@ -5447,15 +5447,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5424:54:5", + "src": "5424:54:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1820, + "id": 1967, "nodeType": "ExpressionStatement", - "src": "5424:54:5" + "src": "5424:54:7" }, { "eventCall": { @@ -5463,12 +5463,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1822, + "id": 1969, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "5556:5:5", + "referencedDeclaration": 1847, + "src": "5556:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -5476,12 +5476,12 @@ }, { "argumentTypes": null, - "id": 1823, + "id": 1970, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "5569:6:5", + "referencedDeclaration": 1849, + "src": "5569:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5489,12 +5489,12 @@ }, { "argumentTypes": null, - "id": 1824, + "id": 1971, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5583:6:5", + "referencedDeclaration": 1861, + "src": "5583:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5502,12 +5502,12 @@ }, { "argumentTypes": null, - "id": 1825, + "id": 1972, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5597:7:5", + "referencedDeclaration": 1855, + "src": "5597:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5519,26 +5519,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1826, + "id": 1973, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5612:9:5", + "referencedDeclaration": 1734, + "src": "5612:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1828, + "id": 1975, "indexExpression": { "argumentTypes": null, - "id": 1827, + "id": 1974, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5622:6:5", + "referencedDeclaration": 1861, + "src": "5622:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5549,21 +5549,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5612:17:5", + "src": "5612:17:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1829, + "id": 1976, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "appExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 1547, - "src": "5612:27:5", + "referencedDeclaration": 1694, + "src": "5612:27:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5573,18 +5573,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1830, + "id": 1977, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5647:3:5", + "referencedDeclaration": 4153, + "src": "5647:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1831, + "id": 1978, "isConstant": false, "isLValue": false, "isPure": false, @@ -5592,7 +5592,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5647:10:5", + "src": "5647:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5626,18 +5626,18 @@ "typeString": "address" } ], - "id": 1821, + "id": 1968, "name": "_ReparameterizationProposal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1490, - "src": "5521:27:5", + "referencedDeclaration": 1637, + "src": "5521:27:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_string_memory_ptr_$_t_uint256_$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (string memory,uint256,bytes32,uint256,uint256,address)" } }, - "id": 1832, + "id": 1979, "isConstant": false, "isLValue": false, "isPure": false, @@ -5645,39 +5645,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5521:142:5", + "src": "5521:142:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1833, + "id": 1980, "nodeType": "EmitStatement", - "src": "5516:147:5" + "src": "5516:147:7" }, { "expression": { "argumentTypes": null, - "id": 1834, + "id": 1981, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5677:6:5", + "referencedDeclaration": 1861, + "src": "5677:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1706, - "id": 1835, + "functionReturnParameters": 1853, + "id": 1982, "nodeType": "Return", - "src": "5670:13:5" + "src": "5670:13:7" } ] }, "documentation": "@notice propose a reparamaterization of the key _name's value to _value.\n@param _name the name of the proposed param to be set\n@param _value the proposed value to set the param to be set", - "id": 1837, + "id": 1984, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5685,16 +5685,16 @@ "name": "proposeReparameterization", "nodeType": "FunctionDefinition", "parameters": { - "id": 1703, + "id": 1850, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1700, + "id": 1847, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4503:12:5", + "scope": 1984, + "src": "4503:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5702,10 +5702,10 @@ "typeString": "string" }, "typeName": { - "id": 1699, + "id": 1846, "name": "string", "nodeType": "ElementaryTypeName", - "src": "4503:6:5", + "src": "4503:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -5716,11 +5716,11 @@ }, { "constant": false, - "id": 1702, + "id": 1849, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4517:11:5", + "scope": 1984, + "src": "4517:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5728,10 +5728,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1701, + "id": 1848, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4517:4:5", + "src": "4517:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5741,20 +5741,20 @@ "visibility": "internal" } ], - "src": "4502:27:5" + "src": "4502:27:7" }, "payable": false, "returnParameters": { - "id": 1706, + "id": 1853, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1705, + "id": 1852, "name": "", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4546:7:5", + "scope": 1984, + "src": "4546:7:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5762,10 +5762,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1704, + "id": 1851, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4546:7:5", + "src": "4546:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5775,47 +5775,47 @@ "visibility": "internal" } ], - "src": "4545:9:5" + "src": "4545:9:7" }, - "scope": 2490, - "src": "4468:1220:5", + "scope": 2653, + "src": "4468:1220:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1949, + "id": 2096, "nodeType": "Block", - "src": "5917:971:5", + "src": "5917:971:7", "statements": [ { "assignments": [ - 1845 + 1992 ], "declarations": [ { "constant": false, - "id": 1845, + "id": 1992, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5923:25:5", + "scope": 2097, + "src": "5923:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 1844, + "id": 1991, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "5923:13:5", + "referencedDeclaration": 1707, + "src": "5923:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -5823,31 +5823,31 @@ "visibility": "internal" } ], - "id": 1849, + "id": 1996, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1846, + "id": 1993, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5951:9:5", + "referencedDeclaration": 1734, + "src": "5951:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1848, + "id": 1995, "indexExpression": { "argumentTypes": null, - "id": 1847, + "id": 1994, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "5961:7:5", + "referencedDeclaration": 1986, + "src": "5961:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5858,27 +5858,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5951:18:5", + "src": "5951:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "5923:46:5" + "src": "5923:46:7" }, { "assignments": [ - 1851 + 1998 ], "declarations": [ { "constant": false, - "id": 1851, + "id": 1998, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5975:12:5", + "scope": 2097, + "src": "5975:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5886,10 +5886,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1850, + "id": 1997, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5975:4:5", + "src": "5975:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5899,38 +5899,38 @@ "visibility": "internal" } ], - "id": 1854, + "id": 2001, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1852, + "id": 1999, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1845, - "src": "5990:4:5", + "referencedDeclaration": 1992, + "src": "5990:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 1853, + "id": 2000, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "deposit", "nodeType": "MemberAccess", - "referencedDeclaration": 1551, - "src": "5990:12:5", + "referencedDeclaration": 1698, + "src": "5990:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5975:27:5" + "src": "5975:27:7" }, { "expression": { @@ -5942,7 +5942,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1863, + "id": 2010, "isConstant": false, "isLValue": false, "isPure": false, @@ -5952,12 +5952,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1857, + "id": 2004, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6028:7:5", + "referencedDeclaration": 1986, + "src": "6028:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5971,18 +5971,18 @@ "typeString": "bytes32" } ], - "id": 1856, + "id": 2003, "name": "propExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2258, - "src": "6017:10:5", + "referencedDeclaration": 2418, + "src": "6017:10:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1858, + "id": 2005, "isConstant": false, "isLValue": false, "isPure": false, @@ -5990,7 +5990,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6017:19:5", + "src": "6017:19:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6004,7 +6004,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1862, + "id": 2009, "isConstant": false, "isLValue": false, "isPure": false, @@ -6013,26 +6013,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1859, + "id": 2006, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1845, - "src": "6040:4:5", + "referencedDeclaration": 1992, + "src": "6040:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 1860, + "id": 2007, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "6040:16:5", + "referencedDeclaration": 1696, + "src": "6040:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6043,14 +6043,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1861, + "id": 2008, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6060:1:5", + "src": "6060:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6058,13 +6058,13 @@ }, "value": "0" }, - "src": "6040:21:5", + "src": "6040:21:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6017:44:5", + "src": "6017:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6078,21 +6078,21 @@ "typeString": "bool" } ], - "id": 1855, + "id": 2002, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6009:7:5", + "referencedDeclaration": 4156, + "src": "6009:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1864, + "id": 2011, "isConstant": false, "isLValue": false, "isPure": false, @@ -6100,28 +6100,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6009:53:5", + "src": "6009:53:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1865, + "id": 2012, "nodeType": "ExpressionStatement", - "src": "6009:53:5" + "src": "6009:53:7" }, { "assignments": [ - 1867 + 2014 ], "declarations": [ { "constant": false, - "id": 1867, + "id": 2014, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6086:11:5", + "scope": 2097, + "src": "6086:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6129,10 +6129,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1866, + "id": 2013, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6086:4:5", + "src": "6086:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6142,7 +6142,7 @@ "visibility": "internal" } ], - "id": 1880, + "id": 2027, "initialValue": { "argumentTypes": null, "arguments": [ @@ -6152,14 +6152,14 @@ { "argumentTypes": null, "hexValue": "70566f746551756f72756d", - "id": 1871, + "id": 2018, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6128:13:5", + "src": "6128:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1cd8ca3a1baaf24ca4431f7b59b78854d08ce96815f9b5677de2c92385fb9138", @@ -6175,18 +6175,18 @@ "typeString": "literal_string \"pVoteQuorum\"" } ], - "id": 1870, + "id": 2017, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6124:3:5", + "referencedDeclaration": 2512, + "src": "6124:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1872, + "id": 2019, "isConstant": false, "isLValue": false, "isPure": false, @@ -6194,7 +6194,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6124:18:5", + "src": "6124:18:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6206,14 +6206,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1874, + "id": 2021, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6154:17:5", + "src": "6154:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -6229,18 +6229,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 1873, + "id": 2020, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6150:3:5", + "referencedDeclaration": 2512, + "src": "6150:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1875, + "id": 2022, "isConstant": false, "isLValue": false, "isPure": false, @@ -6248,7 +6248,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6150:22:5", + "src": "6150:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6260,14 +6260,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1877, + "id": 2024, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6184:17:5", + "src": "6184:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -6283,18 +6283,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 1876, + "id": 2023, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6180:3:5", + "referencedDeclaration": 2512, + "src": "6180:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1878, + "id": 2025, "isConstant": false, "isLValue": false, "isPure": false, @@ -6302,7 +6302,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6180:22:5", + "src": "6180:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6326,32 +6326,32 @@ ], "expression": { "argumentTypes": null, - "id": 1868, + "id": 2015, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "6100:6:5", + "referencedDeclaration": 1738, + "src": "6100:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1869, + "id": 2016, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "startPoll", "nodeType": "MemberAccess", - "referencedDeclaration": 1101, - "src": "6100:16:5", + "referencedDeclaration": 1246, + "src": "6100:16:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 1879, + "id": 2026, "isConstant": false, "isLValue": false, "isPure": false, @@ -6359,19 +6359,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6100:108:5", + "src": "6100:108:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "6086:122:5" + "src": "6086:122:7" }, { "expression": { "argumentTypes": null, - "id": 1904, + "id": 2051, "isConstant": false, "isLValue": false, "isPure": false, @@ -6380,26 +6380,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1881, + "id": 2028, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "6215:10:5", + "referencedDeclaration": 1730, + "src": "6215:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 1883, + "id": 2030, "indexExpression": { "argumentTypes": null, - "id": 1882, + "id": 2029, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6226:6:5", + "referencedDeclaration": 2014, + "src": "6226:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6410,9 +6410,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "6215:18:5", + "src": "6215:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, @@ -6425,18 +6425,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1885, + "id": 2032, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6266:3:5", + "referencedDeclaration": 4153, + "src": "6266:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1886, + "id": 2033, "isConstant": false, "isLValue": false, "isPure": false, @@ -6444,7 +6444,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6266:10:5", + "src": "6266:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6456,14 +6456,14 @@ { "argumentTypes": null, "hexValue": "313030", - "id": 1898, + "id": 2045, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6356:3:5", + "src": "6356:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -6484,12 +6484,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1895, + "id": 2042, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6343:7:5", + "referencedDeclaration": 1998, + "src": "6343:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6509,14 +6509,14 @@ { "argumentTypes": null, "hexValue": "313030", - "id": 1889, + "id": 2036, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6309:3:5", + "src": "6309:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -6530,14 +6530,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1891, + "id": 2038, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6318:18:5", + "src": "6318:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -6553,18 +6553,18 @@ "typeString": "literal_string \"pDispensationPct\"" } ], - "id": 1890, + "id": 2037, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6314:3:5", + "referencedDeclaration": 2512, + "src": "6314:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1892, + "id": 2039, "isConstant": false, "isLValue": false, "isPure": false, @@ -6572,7 +6572,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6314:23:5", + "src": "6314:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6592,32 +6592,32 @@ ], "expression": { "argumentTypes": null, - "id": 1887, + "id": 2034, "name": "SafeMath", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3687, - "src": "6296:8:5", + "referencedDeclaration": 3891, + "src": "6296:8:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_SafeMath_$3687_$", + "typeIdentifier": "t_type$_t_contract$_SafeMath_$3891_$", "typeString": "type(library SafeMath)" } }, - "id": 1888, + "id": 2035, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3662, - "src": "6296:12:5", + "referencedDeclaration": 3866, + "src": "6296:12:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1893, + "id": 2040, "isConstant": false, "isLValue": false, "isPure": false, @@ -6625,27 +6625,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:42:5", + "src": "6296:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1894, + "id": 2041, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 3628, - "src": "6296:46:5", + "referencedDeclaration": 3832, + "src": "6296:46:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1896, + "id": 2043, "isConstant": false, "isLValue": false, "isPure": false, @@ -6653,27 +6653,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:55:5", + "src": "6296:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1897, + "id": 2044, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 3642, - "src": "6296:59:5", + "referencedDeclaration": 3846, + "src": "6296:59:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1899, + "id": 2046, "isConstant": false, "isLValue": false, "isPure": false, @@ -6681,7 +6681,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:64:5", + "src": "6296:64:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6689,12 +6689,12 @@ }, { "argumentTypes": null, - "id": 1900, + "id": 2047, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6375:7:5", + "referencedDeclaration": 1998, + "src": "6375:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6703,14 +6703,14 @@ { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1901, + "id": 2048, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "6400:5:5", + "src": "6400:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -6721,14 +6721,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1902, + "id": 2049, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6428:1:5", + "src": "6428:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6739,18 +6739,18 @@ ], "expression": { "argumentTypes": null, - "id": 1884, + "id": 2031, "name": "Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1575, - "src": "6236:9:5", + "referencedDeclaration": 1722, + "src": "6236:9:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Challenge_$1575_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Challenge_$1722_storage_ptr_$", "typeString": "type(struct Parameterizer.Challenge storage pointer)" } }, - "id": 1903, + "id": 2050, "isConstant": false, "isLValue": false, "isPure": false, @@ -6764,26 +6764,26 @@ "winningTokens" ], "nodeType": "FunctionCall", - "src": "6236:200:5", + "src": "6236:200:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory", + "typeIdentifier": "t_struct$_Challenge_$1722_memory", "typeString": "struct Parameterizer.Challenge memory" } }, - "src": "6215:221:5", + "src": "6215:221:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 1905, + "id": 2052, "nodeType": "ExpressionStatement", - "src": "6215:221:5" + "src": "6215:221:7" }, { "expression": { "argumentTypes": null, - "id": 1911, + "id": 2058, "isConstant": false, "isLValue": false, "isPure": false, @@ -6794,26 +6794,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1906, + "id": 2053, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "6443:9:5", + "referencedDeclaration": 1734, + "src": "6443:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1908, + "id": 2055, "indexExpression": { "argumentTypes": null, - "id": 1907, + "id": 2054, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6453:7:5", + "referencedDeclaration": 1986, + "src": "6453:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6824,21 +6824,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6443:18:5", + "src": "6443:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1909, + "id": 2056, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "6443:30:5", + "referencedDeclaration": 1696, + "src": "6443:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6848,26 +6848,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1910, + "id": 2057, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6476:6:5", + "referencedDeclaration": 2014, + "src": "6476:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6443:39:5", + "src": "6443:39:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1912, + "id": 2059, "nodeType": "ExpressionStatement", - "src": "6443:39:5" + "src": "6443:39:7" }, { "expression": { @@ -6880,18 +6880,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1916, + "id": 2063, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6605:3:5", + "referencedDeclaration": 4153, + "src": "6605:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1917, + "id": 2064, "isConstant": false, "isLValue": false, "isPure": false, @@ -6899,7 +6899,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6605:10:5", + "src": "6605:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6907,25 +6907,25 @@ }, { "argumentTypes": null, - "id": 1918, + "id": 2065, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3727, - "src": "6617:4:5", + "referencedDeclaration": 4184, + "src": "6617:4:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, { "argumentTypes": null, - "id": 1919, + "id": 2066, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6623:7:5", + "referencedDeclaration": 1998, + "src": "6623:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6939,7 +6939,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, { @@ -6949,32 +6949,32 @@ ], "expression": { "argumentTypes": null, - "id": 1914, + "id": 2061, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "6586:5:5", + "referencedDeclaration": 1736, + "src": "6586:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1915, + "id": 2062, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "6586:18:5", + "referencedDeclaration": 510, + "src": "6586:18:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 1920, + "id": 2067, "isConstant": false, "isLValue": false, "isPure": false, @@ -6982,7 +6982,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6586:45:5", + "src": "6586:45:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6996,21 +6996,21 @@ "typeString": "bool" } ], - "id": 1913, + "id": 2060, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6578:7:5", + "referencedDeclaration": 4156, + "src": "6578:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1921, + "id": 2068, "isConstant": false, "isLValue": false, "isPure": false, @@ -7018,26 +7018,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6578:54:5", + "src": "6578:54:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1922, + "id": 2069, "nodeType": "ExpressionStatement", - "src": "6578:54:5" + "src": "6578:54:7" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 1924, + "id": 2071, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6639:18:5", + "scope": 2097, + "src": "6639:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7045,10 +7045,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1923, + "id": 2070, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6639:4:5", + "src": "6639:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7058,21 +7058,21 @@ "visibility": "internal" } ], - "id": 1925, + "id": 2072, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "6639:18:5" + "src": "6639:18:7" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 1927, + "id": 2074, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6663:18:5", + "scope": 2097, + "src": "6663:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7080,10 +7080,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1926, + "id": 2073, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6663:4:5", + "src": "6663:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7093,15 +7093,15 @@ "visibility": "internal" } ], - "id": 1928, + "id": 2075, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "6663:18:5" + "src": "6663:18:7" }, { "expression": { "argumentTypes": null, - "id": 1936, + "id": 2083, "isConstant": false, "isLValue": false, "isPure": false, @@ -7111,12 +7111,12 @@ "components": [ { "argumentTypes": null, - "id": 1929, + "id": 2076, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1924, - "src": "6688:13:5", + "referencedDeclaration": 2071, + "src": "6688:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7124,12 +7124,12 @@ }, { "argumentTypes": null, - "id": 1930, + "id": 2077, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1927, - "src": "6703:13:5", + "referencedDeclaration": 2074, + "src": "6703:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7137,14 +7137,14 @@ }, null ], - "id": 1931, + "id": 2078, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "6687:31:5", + "src": "6687:31:7", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$__$", "typeString": "tuple(uint256,uint256,)" @@ -7157,12 +7157,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1934, + "id": 2081, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6736:6:5", + "referencedDeclaration": 2014, + "src": "6736:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7178,32 +7178,32 @@ ], "expression": { "argumentTypes": null, - "id": 1932, + "id": 2079, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "6721:6:5", + "referencedDeclaration": 1738, + "src": "6721:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1933, + "id": 2080, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollMap", "nodeType": "MemberAccess", - "referencedDeclaration": 535, - "src": "6721:14:5", + "referencedDeclaration": 655, + "src": "6721:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 1935, + "id": 2082, "isConstant": false, "isLValue": false, "isPure": false, @@ -7211,21 +7211,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6721:22:5", + "src": "6721:22:7", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "tuple(uint256,uint256,uint256,uint256,uint256)" } }, - "src": "6687:56:5", + "src": "6687:56:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1937, + "id": 2084, "nodeType": "ExpressionStatement", - "src": "6687:56:5" + "src": "6687:56:7" }, { "eventCall": { @@ -7233,12 +7233,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1939, + "id": 2086, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6776:7:5", + "referencedDeclaration": 1986, + "src": "6776:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7246,12 +7246,12 @@ }, { "argumentTypes": null, - "id": 1940, + "id": 2087, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6791:6:5", + "referencedDeclaration": 2014, + "src": "6791:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7259,12 +7259,12 @@ }, { "argumentTypes": null, - "id": 1941, + "id": 2088, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1924, - "src": "6805:13:5", + "referencedDeclaration": 2071, + "src": "6805:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7272,12 +7272,12 @@ }, { "argumentTypes": null, - "id": 1942, + "id": 2089, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1927, - "src": "6826:13:5", + "referencedDeclaration": 2074, + "src": "6826:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7287,18 +7287,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1943, + "id": 2090, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6847:3:5", + "referencedDeclaration": 4153, + "src": "6847:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1944, + "id": 2091, "isConstant": false, "isLValue": false, "isPure": false, @@ -7306,7 +7306,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6847:10:5", + "src": "6847:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7336,18 +7336,18 @@ "typeString": "address" } ], - "id": 1938, + "id": 2085, "name": "_NewChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "6755:13:5", + "referencedDeclaration": 1649, + "src": "6755:13:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256,address)" } }, - "id": 1945, + "id": 2092, "isConstant": false, "isLValue": false, "isPure": false, @@ -7355,39 +7355,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6755:108:5", + "src": "6755:108:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1946, + "id": 2093, "nodeType": "EmitStatement", - "src": "6750:113:5" + "src": "6750:113:7" }, { "expression": { "argumentTypes": null, - "id": 1947, + "id": 2094, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6877:6:5", + "referencedDeclaration": 2014, + "src": "6877:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1843, - "id": 1948, + "functionReturnParameters": 1990, + "id": 2095, "nodeType": "Return", - "src": "6870:13:5" + "src": "6870:13:7" } ] }, "documentation": "@notice challenge the provided proposal ID, and put tokens at stake to do so.\n@param _propID the proposal ID to challenge", - "id": 1950, + "id": 2097, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -7395,16 +7395,16 @@ "name": "challengeReparameterization", "nodeType": "FunctionDefinition", "parameters": { - "id": 1840, + "id": 1987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1839, + "id": 1986, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5866:15:5", + "scope": 2097, + "src": "5866:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7412,10 +7412,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1838, + "id": 1985, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5866:7:5", + "src": "5866:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7425,20 +7425,20 @@ "visibility": "internal" } ], - "src": "5865:17:5" + "src": "5865:17:7" }, "payable": false, "returnParameters": { - "id": 1843, + "id": 1990, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1842, + "id": 1989, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5899:16:5", + "scope": 2097, + "src": "5899:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7446,10 +7446,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1841, + "id": 1988, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5899:4:5", + "src": "5899:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7459,47 +7459,47 @@ "visibility": "internal" } ], - "src": "5898:18:5" + "src": "5898:18:7" }, - "scope": 2490, - "src": "5829:1059:5", + "scope": 2653, + "src": "5829:1059:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2082, + "id": 2229, "nodeType": "Block", - "src": "7232:1559:5", + "src": "7232:1559:7", "statements": [ { "assignments": [ - 1956 + 2103 ], "declarations": [ { "constant": false, - "id": 1956, + "id": 2103, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7238:26:5", + "scope": 2230, + "src": "7238:26:7", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 1955, + "id": 2102, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "7238:13:5", + "referencedDeclaration": 1707, + "src": "7238:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -7507,31 +7507,31 @@ "visibility": "internal" } ], - "id": 1960, + "id": 2107, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1957, + "id": 2104, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "7267:9:5", + "referencedDeclaration": 1734, + "src": "7267:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1959, + "id": 2106, "indexExpression": { "argumentTypes": null, - "id": 1958, + "id": 2105, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7277:7:5", + "referencedDeclaration": 2099, + "src": "7277:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7542,27 +7542,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7267:18:5", + "src": "7267:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "7238:47:5" + "src": "7238:47:7" }, { "assignments": [ - 1962 + 2109 ], "declarations": [ { "constant": false, - "id": 1962, + "id": 2109, "name": "propOwner", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7291:17:5", + "scope": 2230, + "src": "7291:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7570,10 +7570,10 @@ "typeString": "address" }, "typeName": { - "id": 1961, + "id": 2108, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7291:7:5", + "src": "7291:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7583,51 +7583,51 @@ "visibility": "internal" } ], - "id": 1965, + "id": 2112, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1963, + "id": 2110, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7311:4:5", + "referencedDeclaration": 2103, + "src": "7311:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1964, + "id": 2111, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 1555, - "src": "7311:10:5", + "referencedDeclaration": 1702, + "src": "7311:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "7291:30:5" + "src": "7291:30:7" }, { "assignments": [ - 1967 + 2114 ], "declarations": [ { "constant": false, - "id": 1967, + "id": 2114, "name": "propDeposit", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7327:16:5", + "scope": 2230, + "src": "7327:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7635,10 +7635,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1966, + "id": 2113, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7327:4:5", + "src": "7327:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7648,38 +7648,38 @@ "visibility": "internal" } ], - "id": 1970, + "id": 2117, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1968, + "id": 2115, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7346:4:5", + "referencedDeclaration": 2103, + "src": "7346:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1969, + "id": 2116, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "deposit", "nodeType": "MemberAccess", - "referencedDeclaration": 1551, - "src": "7346:12:5", + "referencedDeclaration": 1698, + "src": "7346:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7327:31:5" + "src": "7327:31:7" }, { "condition": { @@ -7687,12 +7687,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1972, + "id": 2119, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7548:7:5", + "referencedDeclaration": 2099, + "src": "7548:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7706,18 +7706,18 @@ "typeString": "bytes32" } ], - "id": 1971, + "id": 2118, "name": "canBeSet", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2243, - "src": "7539:8:5", + "referencedDeclaration": 2403, + "src": "7539:8:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1973, + "id": 2120, "isConstant": false, "isLValue": false, "isPure": false, @@ -7725,7 +7725,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7539:17:5", + "src": "7539:17:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7737,12 +7737,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2004, + "id": 2151, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7943:7:5", + "referencedDeclaration": 2099, + "src": "7943:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7756,18 +7756,18 @@ "typeString": "bytes32" } ], - "id": 2003, + "id": 2150, "name": "challengeCanBeResolved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2296, - "src": "7920:22:5", + "referencedDeclaration": 2456, + "src": "7920:22:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2005, + "id": 2152, "isConstant": false, "isLValue": false, "isPure": false, @@ -7775,7 +7775,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7920:31:5", + "src": "7920:31:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7788,19 +7788,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2014, + "id": 2161, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2011, + "id": 2158, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "8055:3:5", + "referencedDeclaration": 4155, + "src": "8055:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7812,41 +7812,41 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2012, + "id": 2159, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "8061:4:5", + "referencedDeclaration": 2103, + "src": "8061:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 2013, + "id": 2160, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "8061:14:5", + "referencedDeclaration": 1704, + "src": "8061:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8055:20:5", + "src": "8055:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2036, + "id": 2183, "nodeType": "Block", - "src": "8304:151:5", + "src": "8304:151:7", "statements": [ { "expression": { @@ -7854,21 +7854,21 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 2033, + "id": 2180, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 3707, - 3708 + 4158, + 4159 ], - "referencedDeclaration": 3707, - "src": "8440:6:5", + "referencedDeclaration": 4158, + "src": "8440:6:7", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 2034, + "id": 2181, "isConstant": false, "isLValue": false, "isPure": false, @@ -7876,25 +7876,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8440:8:5", + "src": "8440:8:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2035, + "id": 2182, "nodeType": "ExpressionStatement", - "src": "8440:8:5" + "src": "8440:8:7" } ] }, - "id": 2037, + "id": 2184, "nodeType": "IfStatement", - "src": "8051:404:5", + "src": "8051:404:7", "trueBody": { - "id": 2032, + "id": 2179, "nodeType": "Block", - "src": "8077:221:5", + "src": "8077:221:7", "statements": [ { "eventCall": { @@ -7902,12 +7902,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2016, + "id": 2163, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8195:7:5", + "referencedDeclaration": 2099, + "src": "8195:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7921,18 +7921,18 @@ "typeString": "bytes32" } ], - "id": 2015, + "id": 2162, "name": "_ProposalExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1514, - "src": "8178:16:5", + "referencedDeclaration": 1661, + "src": "8178:16:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2017, + "id": 2164, "isConstant": false, "isLValue": false, "isPure": false, @@ -7940,20 +7940,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8178:25:5", + "src": "8178:25:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2018, + "id": 2165, "nodeType": "EmitStatement", - "src": "8173:30:5" + "src": "8173:30:7" }, { "expression": { "argumentTypes": null, - "id": 2022, + "id": 2169, "isConstant": false, "isLValue": false, "isPure": false, @@ -7961,31 +7961,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "8211:25:5", + "src": "8211:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2019, + "id": 2166, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "8218:9:5", + "referencedDeclaration": 1734, + "src": "8218:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2021, + "id": 2168, "indexExpression": { "argumentTypes": null, - "id": 2020, + "id": 2167, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8228:7:5", + "referencedDeclaration": 2099, + "src": "8228:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7996,9 +7996,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "8218:18:5", + "src": "8218:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -8007,9 +8007,9 @@ "typeString": "tuple()" } }, - "id": 2023, + "id": 2170, "nodeType": "ExpressionStatement", - "src": "8211:25:5" + "src": "8211:25:7" }, { "expression": { @@ -8020,12 +8020,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2027, + "id": 2174, "name": "propOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1962, - "src": "8267:9:5", + "referencedDeclaration": 2109, + "src": "8267:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8033,12 +8033,12 @@ }, { "argumentTypes": null, - "id": 2028, + "id": 2175, "name": "propDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1967, - "src": "8278:11:5", + "referencedDeclaration": 2114, + "src": "8278:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8058,32 +8058,32 @@ ], "expression": { "argumentTypes": null, - "id": 2025, + "id": 2172, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "8252:5:5", + "referencedDeclaration": 1736, + "src": "8252:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2026, + "id": 2173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "8252:14:5", + "referencedDeclaration": 551, + "src": "8252:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2029, + "id": 2176, "isConstant": false, "isLValue": false, "isPure": false, @@ -8091,7 +8091,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8252:38:5", + "src": "8252:38:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8105,21 +8105,21 @@ "typeString": "bool" } ], - "id": 2024, + "id": 2171, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8244:7:5", + "referencedDeclaration": 4156, + "src": "8244:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2030, + "id": 2177, "isConstant": false, "isLValue": false, "isPure": false, @@ -8127,26 +8127,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8244:47:5", + "src": "8244:47:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2031, + "id": 2178, "nodeType": "ExpressionStatement", - "src": "8244:47:5" + "src": "8244:47:7" } ] } }, - "id": 2038, + "id": 2185, "nodeType": "IfStatement", - "src": "7916:539:5", + "src": "7916:539:7", "trueBody": { - "id": 2010, + "id": 2157, "nodeType": "Block", - "src": "7953:92:5", + "src": "7953:92:7", "statements": [ { "expression": { @@ -8154,12 +8154,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2007, + "id": 2154, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8030:7:5", + "referencedDeclaration": 2099, + "src": "8030:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8173,18 +8173,18 @@ "typeString": "bytes32" } ], - "id": 2006, + "id": 2153, "name": "resolveChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2470, - "src": "8013:16:5", + "referencedDeclaration": 2633, + "src": "8013:16:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2008, + "id": 2155, "isConstant": false, "isLValue": false, "isPure": false, @@ -8192,26 +8192,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8013:25:5", + "src": "8013:25:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2009, + "id": 2156, "nodeType": "ExpressionStatement", - "src": "8013:25:5" + "src": "8013:25:7" } ] } }, - "id": 2039, + "id": 2186, "nodeType": "IfStatement", - "src": "7535:920:5", + "src": "7535:920:7", "trueBody": { - "id": 2002, + "id": 2149, "nodeType": "Block", - "src": "7558:352:5", + "src": "7558:352:7", "statements": [ { "expression": { @@ -8221,26 +8221,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1975, + "id": 2122, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7731:4:5", + "referencedDeclaration": 2103, + "src": "7731:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1976, + "id": 2123, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "7731:9:5", + "referencedDeclaration": 1700, + "src": "7731:9:7", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -8250,26 +8250,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1977, + "id": 2124, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7742:4:5", + "referencedDeclaration": 2103, + "src": "7742:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1978, + "id": 2125, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "7742:10:5", + "referencedDeclaration": 1706, + "src": "7742:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8287,18 +8287,18 @@ "typeString": "uint256" } ], - "id": 1974, + "id": 2121, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "7727:3:5", + "referencedDeclaration": 2652, + "src": "7727:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1979, + "id": 2126, "isConstant": false, "isLValue": false, "isPure": false, @@ -8306,15 +8306,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7727:26:5", + "src": "7727:26:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1980, + "id": 2127, "nodeType": "ExpressionStatement", - "src": "7727:26:5" + "src": "7727:26:7" }, { "eventCall": { @@ -8322,12 +8322,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1982, + "id": 2129, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7784:7:5", + "referencedDeclaration": 2099, + "src": "7784:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8337,26 +8337,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1983, + "id": 2130, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7793:4:5", + "referencedDeclaration": 2103, + "src": "7793:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1984, + "id": 2131, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "7793:9:5", + "referencedDeclaration": 1700, + "src": "7793:9:7", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -8366,26 +8366,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1985, + "id": 2132, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7804:4:5", + "referencedDeclaration": 2103, + "src": "7804:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1986, + "id": 2133, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "7804:10:5", + "referencedDeclaration": 1706, + "src": "7804:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8407,18 +8407,18 @@ "typeString": "uint256" } ], - "id": 1981, + "id": 2128, "name": "_ProposalAccepted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1510, - "src": "7766:17:5", + "referencedDeclaration": 1657, + "src": "7766:17:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (bytes32,string memory,uint256)" } }, - "id": 1987, + "id": 2134, "isConstant": false, "isLValue": false, "isPure": false, @@ -8426,20 +8426,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7766:49:5", + "src": "7766:49:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1988, + "id": 2135, "nodeType": "EmitStatement", - "src": "7761:54:5" + "src": "7761:54:7" }, { "expression": { "argumentTypes": null, - "id": 1992, + "id": 2139, "isConstant": false, "isLValue": false, "isPure": false, @@ -8447,31 +8447,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "7823:25:5", + "src": "7823:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1989, + "id": 2136, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "7830:9:5", + "referencedDeclaration": 1734, + "src": "7830:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1991, + "id": 2138, "indexExpression": { "argumentTypes": null, - "id": 1990, + "id": 2137, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7840:7:5", + "referencedDeclaration": 2099, + "src": "7840:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8482,9 +8482,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7830:18:5", + "src": "7830:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -8493,9 +8493,9 @@ "typeString": "tuple()" } }, - "id": 1993, + "id": 2140, "nodeType": "ExpressionStatement", - "src": "7823:25:5" + "src": "7823:25:7" }, { "expression": { @@ -8506,12 +8506,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1997, + "id": 2144, "name": "propOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1962, - "src": "7879:9:5", + "referencedDeclaration": 2109, + "src": "7879:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8519,12 +8519,12 @@ }, { "argumentTypes": null, - "id": 1998, + "id": 2145, "name": "propDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1967, - "src": "7890:11:5", + "referencedDeclaration": 2114, + "src": "7890:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8544,32 +8544,32 @@ ], "expression": { "argumentTypes": null, - "id": 1995, + "id": 2142, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "7864:5:5", + "referencedDeclaration": 1736, + "src": "7864:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1996, + "id": 2143, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "7864:14:5", + "referencedDeclaration": 551, + "src": "7864:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 1999, + "id": 2146, "isConstant": false, "isLValue": false, "isPure": false, @@ -8577,7 +8577,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7864:38:5", + "src": "7864:38:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8591,21 +8591,21 @@ "typeString": "bool" } ], - "id": 1994, + "id": 2141, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7856:7:5", + "referencedDeclaration": 4156, + "src": "7856:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2000, + "id": 2147, "isConstant": false, "isLValue": false, "isPure": false, @@ -8613,15 +8613,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7856:47:5", + "src": "7856:47:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2001, + "id": 2148, "nodeType": "ExpressionStatement", - "src": "7856:47:5" + "src": "7856:47:7" } ] } @@ -8636,7 +8636,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2045, + "id": 2192, "isConstant": false, "isLValue": false, "isPure": false, @@ -8647,14 +8647,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 2042, + "id": 2189, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8472:17:5", + "src": "8472:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -8670,18 +8670,18 @@ "typeString": "literal_string \"dispensationPct\"" } ], - "id": 2041, + "id": 2188, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8468:3:5", + "referencedDeclaration": 2512, + "src": "8468:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2043, + "id": 2190, "isConstant": false, "isLValue": false, "isPure": false, @@ -8689,7 +8689,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8468:22:5", + "src": "8468:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8700,14 +8700,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 2044, + "id": 2191, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8494:3:5", + "src": "8494:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -8715,7 +8715,7 @@ }, "value": "100" }, - "src": "8468:29:5", + "src": "8468:29:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8729,18 +8729,18 @@ "typeString": "bool" } ], - "id": 2040, + "id": 2187, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "8461:6:5", + "referencedDeclaration": 4142, + "src": "8461:6:7", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2046, + "id": 2193, "isConstant": false, "isLValue": false, "isPure": false, @@ -8748,15 +8748,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8461:37:5", + "src": "8461:37:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2047, + "id": 2194, "nodeType": "ExpressionStatement", - "src": "8461:37:5" + "src": "8461:37:7" }, { "expression": { @@ -8768,7 +8768,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2053, + "id": 2200, "isConstant": false, "isLValue": false, "isPure": false, @@ -8779,14 +8779,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 2050, + "id": 2197, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8515:18:5", + "src": "8515:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -8802,18 +8802,18 @@ "typeString": "literal_string \"pDispensationPct\"" } ], - "id": 2049, + "id": 2196, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8511:3:5", + "referencedDeclaration": 2512, + "src": "8511:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2051, + "id": 2198, "isConstant": false, "isLValue": false, "isPure": false, @@ -8821,7 +8821,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8511:23:5", + "src": "8511:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8832,14 +8832,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 2052, + "id": 2199, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8538:3:5", + "src": "8538:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -8847,7 +8847,7 @@ }, "value": "100" }, - "src": "8511:30:5", + "src": "8511:30:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8861,18 +8861,18 @@ "typeString": "bool" } ], - "id": 2048, + "id": 2195, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "8504:6:5", + "referencedDeclaration": 4142, + "src": "8504:6:7", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2054, + "id": 2201, "isConstant": false, "isLValue": false, "isPure": false, @@ -8880,15 +8880,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8504:38:5", + "src": "8504:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2055, + "id": 2202, "nodeType": "ExpressionStatement", - "src": "8504:38:5" + "src": "8504:38:7" }, { "expression": { @@ -8896,12 +8896,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2074, + "id": 2221, "name": "PROCESSBY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1594, - "src": "8744:9:5", + "referencedDeclaration": 1741, + "src": "8744:9:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8924,14 +8924,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 2070, + "id": 2217, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8713:17:5", + "src": "8713:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -8947,18 +8947,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 2069, + "id": 2216, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8709:3:5", + "referencedDeclaration": 2512, + "src": "8709:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2071, + "id": 2218, "isConstant": false, "isLValue": false, "isPure": false, @@ -8966,7 +8966,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8709:22:5", + "src": "8709:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8989,14 +8989,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 2065, + "id": 2212, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8678:17:5", + "src": "8678:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -9012,18 +9012,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 2064, + "id": 2211, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8674:3:5", + "referencedDeclaration": 2512, + "src": "8674:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2066, + "id": 2213, "isConstant": false, "isLValue": false, "isPure": false, @@ -9031,7 +9031,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8674:22:5", + "src": "8674:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9054,14 +9054,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 2060, + "id": 2207, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8644:16:5", + "src": "8644:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -9077,18 +9077,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 2059, + "id": 2206, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8640:3:5", + "referencedDeclaration": 2512, + "src": "8640:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2061, + "id": 2208, "isConstant": false, "isLValue": false, "isPure": false, @@ -9096,7 +9096,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8640:21:5", + "src": "8640:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9112,32 +9112,32 @@ ], "expression": { "argumentTypes": null, - "id": 2056, + "id": 2203, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "8632:3:5", + "referencedDeclaration": 4155, + "src": "8632:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2058, + "id": 2205, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:7:5", + "referencedDeclaration": 3890, + "src": "8632:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2062, + "id": 2209, "isConstant": false, "isLValue": false, "isPure": false, @@ -9145,27 +9145,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:30:5", + "src": "8632:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2063, + "id": 2210, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:41:5", + "referencedDeclaration": 3890, + "src": "8632:41:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2067, + "id": 2214, "isConstant": false, "isLValue": false, "isPure": false, @@ -9173,27 +9173,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:65:5", + "src": "8632:65:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2068, + "id": 2215, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:76:5", + "referencedDeclaration": 3890, + "src": "8632:76:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2072, + "id": 2219, "isConstant": false, "isLValue": false, "isPure": false, @@ -9201,27 +9201,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:100:5", + "src": "8632:100:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2073, + "id": 2220, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:111:5", + "referencedDeclaration": 3890, + "src": "8632:111:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2075, + "id": 2222, "isConstant": false, "isLValue": false, "isPure": false, @@ -9229,20 +9229,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:122:5", + "src": "8632:122:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2076, + "id": 2223, "nodeType": "ExpressionStatement", - "src": "8632:122:5" + "src": "8632:122:7" }, { "expression": { "argumentTypes": null, - "id": 2080, + "id": 2227, "isConstant": false, "isLValue": false, "isPure": false, @@ -9250,31 +9250,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "8761:25:5", + "src": "8761:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2077, + "id": 2224, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "8768:9:5", + "referencedDeclaration": 1734, + "src": "8768:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2079, + "id": 2226, "indexExpression": { "argumentTypes": null, - "id": 2078, + "id": 2225, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8778:7:5", + "referencedDeclaration": 2099, + "src": "8778:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9285,9 +9285,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "8768:18:5", + "src": "8768:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -9296,14 +9296,14 @@ "typeString": "tuple()" } }, - "id": 2081, + "id": 2228, "nodeType": "ExpressionStatement", - "src": "8761:25:5" + "src": "8761:25:7" } ] }, "documentation": "@notice for the provided proposal ID, set it, resolve its challenge, or delete it depending on whether it can be set, has a challenge which can be resolved, or if its \"process by\" date has passed\n@param _propID the proposal ID to make a determination and state transition for", - "id": 2083, + "id": 2230, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -9311,16 +9311,16 @@ "name": "processProposal", "nodeType": "FunctionDefinition", "parameters": { - "id": 1953, + "id": 2100, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1952, + "id": 2099, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7208:15:5", + "scope": 2230, + "src": "7208:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9328,10 +9328,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1951, + "id": 2098, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7208:7:5", + "src": "7208:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9341,26 +9341,26 @@ "visibility": "internal" } ], - "src": "7207:17:5" + "src": "7207:17:7" }, "payable": false, "returnParameters": { - "id": 1954, + "id": 2101, "nodeType": "ParameterList", "parameters": [], - "src": "7232:0:5" + "src": "7232:0:7" }, - "scope": 2490, - "src": "7183:1608:5", + "scope": 2653, + "src": "7183:1608:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2170, + "id": 2329, "nodeType": "Block", - "src": "9075:844:5", + "src": "9075:927:7", "statements": [ { "expression": { @@ -9372,7 +9372,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2099, + "id": 2246, "isConstant": false, "isLValue": false, "isPure": false, @@ -9385,26 +9385,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2091, + "id": 2238, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9182:10:5", + "referencedDeclaration": 1730, + "src": "9182:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2093, + "id": 2240, "indexExpression": { "argumentTypes": null, - "id": 2092, + "id": 2239, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9193:12:5", + "referencedDeclaration": 2232, + "src": "9193:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9415,43 +9415,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9182:24:5", + "src": "9182:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2094, + "id": 2241, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "9182:36:5", + "referencedDeclaration": 1721, + "src": "9182:36:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2097, + "id": 2244, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2095, + "id": 2242, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9219:3:5", + "referencedDeclaration": 4153, + "src": "9219:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2096, + "id": 2243, "isConstant": false, "isLValue": false, "isPure": false, @@ -9459,7 +9459,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9219:10:5", + "src": "9219:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9470,7 +9470,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9182:48:5", + "src": "9182:48:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9481,14 +9481,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2098, + "id": 2245, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9234:5:5", + "src": "9234:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9496,7 +9496,7 @@ }, "value": "false" }, - "src": "9182:57:5", + "src": "9182:57:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9510,21 +9510,21 @@ "typeString": "bool" } ], - "id": 2090, + "id": 2237, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9174:7:5", + "referencedDeclaration": 4156, + "src": "9174:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2100, + "id": 2247, "isConstant": false, "isLValue": false, "isPure": false, @@ -9532,15 +9532,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9174:66:5", + "src": "9174:66:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2101, + "id": 2248, "nodeType": "ExpressionStatement", - "src": "9174:66:5" + "src": "9174:66:7" }, { "expression": { @@ -9552,7 +9552,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2108, + "id": 2255, "isConstant": false, "isLValue": false, "isPure": false, @@ -9563,26 +9563,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2103, + "id": 2250, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9254:10:5", + "referencedDeclaration": 1730, + "src": "9254:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2105, + "id": 2252, "indexExpression": { "argumentTypes": null, - "id": 2104, + "id": 2251, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9265:12:5", + "referencedDeclaration": 2232, + "src": "9265:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9593,21 +9593,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9254:24:5", + "src": "9254:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2106, + "id": 2253, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "9254:33:5", + "referencedDeclaration": 1713, + "src": "9254:33:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9618,14 +9618,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2107, + "id": 2254, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9291:4:5", + "src": "9291:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9633,7 +9633,7 @@ }, "value": "true" }, - "src": "9254:41:5", + "src": "9254:41:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9647,21 +9647,21 @@ "typeString": "bool" } ], - "id": 2102, + "id": 2249, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9246:7:5", + "referencedDeclaration": 4156, + "src": "9246:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2109, + "id": 2256, "isConstant": false, "isLValue": false, "isPure": false, @@ -9669,28 +9669,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9246:50:5", + "src": "9246:50:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2110, + "id": 2257, "nodeType": "ExpressionStatement", - "src": "9246:50:5" + "src": "9246:50:7" }, { "assignments": [ - 2112 + 2259 ], "declarations": [ { "constant": false, - "id": 2112, + "id": 2259, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9303:16:5", + "scope": 2330, + "src": "9303:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9698,10 +9698,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2111, + "id": 2258, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9303:4:5", + "src": "9303:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9711,7 +9711,7 @@ "visibility": "internal" } ], - "id": 2120, + "id": 2267, "initialValue": { "argumentTypes": null, "arguments": [ @@ -9719,18 +9719,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2115, + "id": 2262, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9349:3:5", + "referencedDeclaration": 4153, + "src": "9349:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2116, + "id": 2263, "isConstant": false, "isLValue": false, "isPure": false, @@ -9738,7 +9738,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9349:10:5", + "src": "9349:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9746,12 +9746,12 @@ }, { "argumentTypes": null, - "id": 2117, + "id": 2264, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9361:12:5", + "referencedDeclaration": 2232, + "src": "9361:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9759,12 +9759,12 @@ }, { "argumentTypes": null, - "id": 2118, + "id": 2265, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2087, - "src": "9375:5:5", + "referencedDeclaration": 2234, + "src": "9375:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9788,32 +9788,32 @@ ], "expression": { "argumentTypes": null, - "id": 2113, + "id": 2260, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "9322:6:5", + "referencedDeclaration": 1738, + "src": "9322:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2114, + "id": 2261, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "9322:26:5", + "referencedDeclaration": 1189, + "src": "9322:26:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 2119, + "id": 2266, "isConstant": false, "isLValue": false, "isPure": false, @@ -9821,27 +9821,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9322:59:5", + "src": "9322:59:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9303:78:5" + "src": "9303:78:7" }, { "assignments": [ - 2122 + 2269 ], "declarations": [ { "constant": false, - "id": 2122, + "id": 2269, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9387:11:5", + "scope": 2330, + "src": "9387:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9849,10 +9849,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2121, + "id": 2268, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9387:4:5", + "src": "9387:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9862,7 +9862,7 @@ "visibility": "internal" } ], - "id": 2129, + "id": 2276, "initialValue": { "argumentTypes": null, "arguments": [ @@ -9870,18 +9870,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2124, + "id": 2271, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9413:3:5", + "referencedDeclaration": 4153, + "src": "9413:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2125, + "id": 2272, "isConstant": false, "isLValue": false, "isPure": false, @@ -9889,7 +9889,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9413:10:5", + "src": "9413:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9897,12 +9897,12 @@ }, { "argumentTypes": null, - "id": 2126, + "id": 2273, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9425:12:5", + "referencedDeclaration": 2232, + "src": "9425:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9910,12 +9910,12 @@ }, { "argumentTypes": null, - "id": 2127, + "id": 2274, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2087, - "src": "9439:5:5", + "referencedDeclaration": 2234, + "src": "9439:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9937,18 +9937,18 @@ "typeString": "uint256" } ], - "id": 2123, + "id": 2270, "name": "voterReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "9401:11:5", + "referencedDeclaration": 2373, + "src": "9401:11:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view returns (uint256)" } }, - "id": 2128, + "id": 2275, "isConstant": false, "isLValue": false, "isPure": false, @@ -9956,19 +9956,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9401:44:5", + "src": "9401:44:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9387:58:5" + "src": "9387:58:7" }, { "expression": { "argumentTypes": null, - "id": 2135, + "id": 2288, "isConstant": false, "isLValue": false, "isPure": false, @@ -9979,26 +9979,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2130, + "id": 2277, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9590:10:5", + "referencedDeclaration": 1730, + "src": "9590:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2132, + "id": 2279, "indexExpression": { "argumentTypes": null, - "id": 2131, + "id": 2278, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9601:12:5", + "referencedDeclaration": 2232, + "src": "9601:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10009,55 +10009,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9590:24:5", + "src": "9590:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2133, + "id": 2280, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "9590:38:5", + "referencedDeclaration": 1717, + "src": "9590:38:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2134, - "name": "voterTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2112, - "src": "9632:11:5", + "arguments": [ + { + "argumentTypes": null, + "id": 2286, + "name": "voterTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2259, + "src": "9674:11:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2281, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "9631:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2283, + "indexExpression": { + "argumentTypes": null, + "id": 2282, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2232, + "src": "9642:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9631:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2284, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "winningTokens", + "nodeType": "MemberAccess", + "referencedDeclaration": 1717, + "src": "9631:38:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2285, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "9631:42:7", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2287, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9631:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9590:53:5", + "src": "9590:96:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2136, + "id": 2289, "nodeType": "ExpressionStatement", - "src": "9590:53:5" + "src": "9590:96:7" }, { "expression": { "argumentTypes": null, - "id": 2142, + "id": 2301, "isConstant": false, "isLValue": false, "isPure": false, @@ -10068,26 +10163,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2137, + "id": 2290, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9649:10:5", + "referencedDeclaration": 1730, + "src": "9692:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2139, + "id": 2292, "indexExpression": { "argumentTypes": null, - "id": 2138, + "id": 2291, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9660:12:5", + "referencedDeclaration": 2232, + "src": "9703:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10098,134 +10193,229 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9649:24:5", + "src": "9692:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2140, + "id": 2293, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "9649:35:5", + "referencedDeclaration": 1709, + "src": "9692:35:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2141, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9688:6:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "9649:45:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 2143, - "nodeType": "ExpressionStatement", - "src": "9649:45:5" - }, - { - "expression": { - "argumentTypes": null, - "id": 2152, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 2144, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9750:10:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" - } - }, - "id": 2146, - "indexExpression": { - "argumentTypes": null, - "id": 2145, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9761:12:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "9750:24:5", + "id": 2299, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2269, + "src": "9770:6:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "id": 2147, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "tokenClaims", - "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "9750:36:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", - "typeString": "mapping(address => bool)" } - }, - "id": 2150, + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2294, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "9730:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2296, + "indexExpression": { + "argumentTypes": null, + "id": 2295, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2232, + "src": "9741:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9730:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2297, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 1709, + "src": "9730:35:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2298, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "9730:39:7", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2300, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9730:47:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "9692:85:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2302, + "nodeType": "ExpressionStatement", + "src": "9692:85:7" + }, + { + "expression": { + "argumentTypes": null, + "id": 2311, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2303, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "9833:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2305, + "indexExpression": { + "argumentTypes": null, + "id": 2304, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2232, + "src": "9844:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9833:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2306, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "tokenClaims", + "nodeType": "MemberAccess", + "referencedDeclaration": 1721, + "src": "9833:36:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + } + }, + "id": 2309, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2148, + "id": 2307, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9787:3:5", + "referencedDeclaration": 4153, + "src": "9870:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2149, + "id": 2308, "isConstant": false, "isLValue": false, "isPure": false, @@ -10233,7 +10423,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9787:10:5", + "src": "9870:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10244,7 +10434,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "9750:48:5", + "src": "9833:48:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10255,14 +10445,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2151, + "id": 2310, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9801:4:5", + "src": "9884:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10270,15 +10460,15 @@ }, "value": "true" }, - "src": "9750:55:5", + "src": "9833:55:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2153, + "id": 2312, "nodeType": "ExpressionStatement", - "src": "9750:55:5" + "src": "9833:55:7" }, { "eventCall": { @@ -10286,12 +10476,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2155, + "id": 2314, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9832:12:5", + "referencedDeclaration": 2232, + "src": "9915:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10299,12 +10489,12 @@ }, { "argumentTypes": null, - "id": 2156, + "id": 2315, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9846:6:5", + "referencedDeclaration": 2269, + "src": "9929:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10314,18 +10504,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2157, + "id": 2316, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9854:3:5", + "referencedDeclaration": 4153, + "src": "9937:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2158, + "id": 2317, "isConstant": false, "isLValue": false, "isPure": false, @@ -10333,7 +10523,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9854:10:5", + "src": "9937:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10355,18 +10545,18 @@ "typeString": "address" } ], - "id": 2154, + "id": 2313, "name": "_RewardClaimed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1542, - "src": "9817:14:5", + "referencedDeclaration": 1689, + "src": "9900:14:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 2159, + "id": 2318, "isConstant": false, "isLValue": false, "isPure": false, @@ -10374,15 +10564,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9817:48:5", + "src": "9900:48:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2160, + "id": 2319, "nodeType": "EmitStatement", - "src": "9812:53:5" + "src": "9895:53:7" }, { "expression": { @@ -10395,18 +10585,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2164, + "id": 2323, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9894:3:5", + "referencedDeclaration": 4153, + "src": "9977:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2165, + "id": 2324, "isConstant": false, "isLValue": false, "isPure": false, @@ -10414,7 +10604,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9894:10:5", + "src": "9977:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10422,12 +10612,12 @@ }, { "argumentTypes": null, - "id": 2166, + "id": 2325, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9906:6:5", + "referencedDeclaration": 2269, + "src": "9989:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10447,32 +10637,32 @@ ], "expression": { "argumentTypes": null, - "id": 2162, + "id": 2321, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "9879:5:5", + "referencedDeclaration": 1736, + "src": "9962:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2163, + "id": 2322, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "9879:14:5", + "referencedDeclaration": 551, + "src": "9962:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2167, + "id": 2326, "isConstant": false, "isLValue": false, "isPure": false, @@ -10480,7 +10670,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9879:34:5", + "src": "9962:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10494,21 +10684,21 @@ "typeString": "bool" } ], - "id": 2161, + "id": 2320, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9871:7:5", + "referencedDeclaration": 4156, + "src": "9954:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2168, + "id": 2327, "isConstant": false, "isLValue": false, "isPure": false, @@ -10516,20 +10706,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9871:43:5", + "src": "9954:43:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2169, + "id": 2328, "nodeType": "ExpressionStatement", - "src": "9871:43:5" + "src": "9954:43:7" } ] }, "documentation": "@notice claim the tokens owed for the msg.sender in the provided challenge\n@param _challengeID the challenge ID to claim tokens for\n@param _salt the salt used to vote in the challenge being withdrawn for", - "id": 2171, + "id": 2330, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -10537,16 +10727,16 @@ "name": "claimReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2088, + "id": 2235, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2085, + "id": 2232, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9037:17:5", + "scope": 2330, + "src": "9037:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10554,10 +10744,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2084, + "id": 2231, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9037:4:5", + "src": "9037:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10568,11 +10758,11 @@ }, { "constant": false, - "id": 2087, + "id": 2234, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9056:10:5", + "scope": 2330, + "src": "9056:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10580,10 +10770,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2086, + "id": 2233, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9056:4:5", + "src": "9056:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10593,39 +10783,39 @@ "visibility": "internal" } ], - "src": "9036:31:5" + "src": "9036:31:7" }, "payable": false, "returnParameters": { - "id": 2089, + "id": 2236, "nodeType": "ParameterList", "parameters": [], - "src": "9075:0:5" + "src": "9075:0:7" }, - "scope": 2490, - "src": "9016:903:5", + "scope": 2653, + "src": "9016:986:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2212, + "id": 2372, "nodeType": "Block", - "src": "10474:264:5", + "src": "10557:268:7", "statements": [ { "assignments": [ - 2183 + 2342 ], "declarations": [ { "constant": false, - "id": 2183, + "id": 2342, "name": "winningTokens", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10480:18:5", + "scope": 2373, + "src": "10563:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10633,10 +10823,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2182, + "id": 2341, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10480:4:5", + "src": "10563:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10646,33 +10836,33 @@ "visibility": "internal" } ], - "id": 2188, + "id": 2347, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2184, + "id": 2343, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "10501:10:5", + "referencedDeclaration": 1730, + "src": "10584:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2186, + "id": 2345, "indexExpression": { "argumentTypes": null, - "id": 2185, + "id": 2344, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10512:12:5", + "referencedDeclaration": 2334, + "src": "10595:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10683,41 +10873,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10501:24:5", + "src": "10584:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2187, + "id": 2346, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "10501:38:5", + "referencedDeclaration": 1717, + "src": "10584:38:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10480:59:5" + "src": "10563:59:7" }, { "assignments": [ - 2190 + 2349 ], "declarations": [ { "constant": false, - "id": 2190, + "id": 2349, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10545:15:5", + "scope": 2373, + "src": "10628:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10725,10 +10915,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2189, + "id": 2348, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10545:4:5", + "src": "10628:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10738,33 +10928,33 @@ "visibility": "internal" } ], - "id": 2195, + "id": 2354, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2191, + "id": 2350, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "10563:10:5", + "referencedDeclaration": 1730, + "src": "10646:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2193, + "id": 2352, "indexExpression": { "argumentTypes": null, - "id": 2192, + "id": 2351, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10574:12:5", + "referencedDeclaration": 2334, + "src": "10657:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10775,41 +10965,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10563:24:5", + "src": "10646:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2194, + "id": 2353, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "10563:35:5", + "referencedDeclaration": 1709, + "src": "10646:35:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10545:53:5" + "src": "10628:53:7" }, { "assignments": [ - 2197 + 2356 ], "declarations": [ { "constant": false, - "id": 2197, + "id": 2356, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10604:16:5", + "scope": 2373, + "src": "10687:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10817,10 +11007,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2196, + "id": 2355, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10604:4:5", + "src": "10687:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10830,18 +11020,18 @@ "visibility": "internal" } ], - "id": 2204, + "id": 2363, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2200, + "id": 2359, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2173, - "src": "10650:6:5", + "referencedDeclaration": 2332, + "src": "10733:6:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10849,12 +11039,12 @@ }, { "argumentTypes": null, - "id": 2201, + "id": 2360, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10658:12:5", + "referencedDeclaration": 2334, + "src": "10741:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10862,12 +11052,12 @@ }, { "argumentTypes": null, - "id": 2202, + "id": 2361, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2177, - "src": "10672:5:5", + "referencedDeclaration": 2336, + "src": "10755:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10891,32 +11081,32 @@ ], "expression": { "argumentTypes": null, - "id": 2198, + "id": 2357, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "10623:6:5", + "referencedDeclaration": 1738, + "src": "10706:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2199, + "id": 2358, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "10623:26:5", + "referencedDeclaration": 1189, + "src": "10706:26:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 2203, + "id": 2362, "isConstant": false, "isLValue": false, "isPure": false, @@ -10924,119 +11114,142 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10623:55:5", + "src": "10706:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10604:74:5" + "src": "10687:74:7" }, { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2210, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "id": 2369, + "name": "winningTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2342, + "src": "10806:13:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2207, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 2205, - "name": "voterTokens", + "id": 2366, + "name": "rewardPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2197, - "src": "10692:11:5", + "referencedDeclaration": 2349, + "src": "10790:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "id": 2206, - "name": "rewardPool", + "id": 2364, + "name": "voterTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2190, - "src": "10706:10:5", + "referencedDeclaration": 2356, + "src": "10774:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10692:24:5", + "id": 2365, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "10774:15:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 2367, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10774:27:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 2208, + }, + "id": 2368, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "10691:26:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "id": 2209, - "name": "winningTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2183, - "src": "10720:13:5", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "10774:31:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10691:42:5", + "id": 2370, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10774:46:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2181, - "id": 2211, + "functionReturnParameters": 2340, + "id": 2371, "nodeType": "Return", - "src": "10684:49:5" + "src": "10767:53:7" } ] }, "documentation": "@dev Calculates the provided voter's token reward for the given poll.\n@param _voter The address of the voter whose reward balance is to be returned\n@param _challengeID The ID of the challenge the voter's reward is being calculated for\n@param _salt The salt of the voter's commit hash in the given poll\n@return The uint indicating the voter's reward", - "id": 2213, + "id": 2373, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11044,16 +11257,16 @@ "name": "voterReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2178, + "id": 2337, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2173, + "id": 2332, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10396:14:5", + "scope": 2373, + "src": "10479:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11061,10 +11274,10 @@ "typeString": "address" }, "typeName": { - "id": 2172, + "id": 2331, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10396:7:5", + "src": "10479:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11075,11 +11288,11 @@ }, { "constant": false, - "id": 2175, + "id": 2334, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10412:17:5", + "scope": 2373, + "src": "10495:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11087,10 +11300,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2174, + "id": 2333, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10412:4:5", + "src": "10495:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11101,11 +11314,11 @@ }, { "constant": false, - "id": 2177, + "id": 2336, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10431:10:5", + "scope": 2373, + "src": "10514:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11113,10 +11326,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2176, + "id": 2335, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10431:4:5", + "src": "10514:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11126,20 +11339,20 @@ "visibility": "internal" } ], - "src": "10395:47:5" + "src": "10478:47:7" }, "payable": false, "returnParameters": { - "id": 2181, + "id": 2340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2180, + "id": 2339, "name": "", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10466:4:5", + "scope": 2373, + "src": "10549:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11147,10 +11360,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2179, + "id": 2338, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10466:4:5", + "src": "10549:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11160,47 +11373,47 @@ "visibility": "internal" } ], - "src": "10465:6:5" + "src": "10548:6:7" }, - "scope": 2490, - "src": "10375:363:5", + "scope": 2653, + "src": "10458:367:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2242, + "id": 2402, "nodeType": "Block", - "src": "11017:142:5", + "src": "11104:142:7", "statements": [ { "assignments": [ - 2221 + 2381 ], "declarations": [ { "constant": false, - "id": 2221, + "id": 2381, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "11023:25:5", + "scope": 2403, + "src": "11110:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2220, + "id": 2380, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "11023:13:5", + "referencedDeclaration": 1707, + "src": "11110:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -11208,31 +11421,31 @@ "visibility": "internal" } ], - "id": 2225, + "id": 2385, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2222, + "id": 2382, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11051:9:5", + "referencedDeclaration": 1734, + "src": "11138:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2224, + "id": 2384, "indexExpression": { "argumentTypes": null, - "id": 2223, + "id": 2383, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2215, - "src": "11061:7:5", + "referencedDeclaration": 2375, + "src": "11148:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11243,14 +11456,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11051:18:5", + "src": "11138:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11023:46:5" + "src": "11110:46:7" }, { "expression": { @@ -11262,7 +11475,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2239, + "id": 2399, "isConstant": false, "isLValue": false, "isPure": false, @@ -11273,7 +11486,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2234, + "id": 2394, "isConstant": false, "isLValue": false, "isPure": false, @@ -11284,19 +11497,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2229, + "id": 2389, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2226, + "id": 2386, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11084:3:5", + "referencedDeclaration": 4155, + "src": "11171:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11308,32 +11521,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2227, + "id": 2387, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11090:4:5", + "referencedDeclaration": 2381, + "src": "11177:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2228, + "id": 2388, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "appExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 1547, - "src": "11090:14:5", + "referencedDeclaration": 1694, + "src": "11177:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11084:20:5", + "src": "11171:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11347,19 +11560,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2233, + "id": 2393, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2230, + "id": 2390, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11108:3:5", + "referencedDeclaration": 4155, + "src": "11195:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11371,38 +11584,38 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2231, + "id": 2391, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11114:4:5", + "referencedDeclaration": 2381, + "src": "11201:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2232, + "id": 2392, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "11114:14:5", + "referencedDeclaration": 1704, + "src": "11201:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11108:20:5", + "src": "11195:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11084:44:5", + "src": "11171:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11416,7 +11629,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2238, + "id": 2398, "isConstant": false, "isLValue": false, "isPure": false, @@ -11425,26 +11638,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2235, + "id": 2395, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11132:4:5", + "referencedDeclaration": 2381, + "src": "11219:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2236, + "id": 2396, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11132:16:5", + "referencedDeclaration": 1696, + "src": "11219:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11455,14 +11668,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2237, + "id": 2397, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11152:1:5", + "src": "11239:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11470,41 +11683,41 @@ }, "value": "0" }, - "src": "11132:21:5", + "src": "11219:21:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11084:69:5", + "src": "11171:69:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 2240, + "id": 2400, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11083:71:5", + "src": "11170:71:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2219, - "id": 2241, + "functionReturnParameters": 2379, + "id": 2401, "nodeType": "Return", - "src": "11076:78:5" + "src": "11163:78:7" } ] }, "documentation": "@notice Determines whether a proposal passed its application stage without a challenge\n@param _propID The proposal ID for which to determine whether its application stage passed without a challenge", - "id": 2243, + "id": 2403, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11512,16 +11725,16 @@ "name": "canBeSet", "nodeType": "FunctionDefinition", "parameters": { - "id": 2216, + "id": 2376, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2215, + "id": 2375, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "10973:15:5", + "scope": 2403, + "src": "11060:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11529,10 +11742,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2214, + "id": 2374, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10973:7:5", + "src": "11060:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11542,20 +11755,20 @@ "visibility": "internal" } ], - "src": "10972:17:5" + "src": "11059:17:7" }, "payable": false, "returnParameters": { - "id": 2219, + "id": 2379, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2218, + "id": 2378, "name": "", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "11011:4:5", + "scope": 2403, + "src": "11098:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11563,10 +11776,10 @@ "typeString": "bool" }, "typeName": { - "id": 2217, + "id": 2377, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11011:4:5", + "src": "11098:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11576,19 +11789,19 @@ "visibility": "internal" } ], - "src": "11010:6:5" + "src": "11097:6:7" }, - "scope": 2490, - "src": "10955:204:5", + "scope": 2653, + "src": "11042:204:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2257, + "id": 2417, "nodeType": "Block", - "src": "11383:50:5", + "src": "11470:50:7", "statements": [ { "expression": { @@ -11597,7 +11810,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2255, + "id": 2415, "isConstant": false, "isLValue": false, "isPure": false, @@ -11608,26 +11821,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2250, + "id": 2410, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11396:9:5", + "referencedDeclaration": 1734, + "src": "11483:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2252, + "id": 2412, "indexExpression": { "argumentTypes": null, - "id": 2251, + "id": 2411, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2245, - "src": "11406:7:5", + "referencedDeclaration": 2405, + "src": "11493:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11638,21 +11851,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11396:18:5", + "src": "11483:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 2253, + "id": 2413, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "11396:28:5", + "referencedDeclaration": 1704, + "src": "11483:28:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11663,14 +11876,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2254, + "id": 2414, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11427:1:5", + "src": "11514:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11678,21 +11891,21 @@ }, "value": "0" }, - "src": "11396:32:5", + "src": "11483:32:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2249, - "id": 2256, + "functionReturnParameters": 2409, + "id": 2416, "nodeType": "Return", - "src": "11389:39:5" + "src": "11476:39:7" } ] }, "documentation": "@notice Determines whether a proposal exists for the provided proposal ID\n@param _propID The proposal ID whose existance is to be determined", - "id": 2258, + "id": 2418, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11700,16 +11913,16 @@ "name": "propExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 2246, + "id": 2406, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2245, + "id": 2405, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2258, - "src": "11339:15:5", + "scope": 2418, + "src": "11426:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11717,10 +11930,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2244, + "id": 2404, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11339:7:5", + "src": "11426:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11730,20 +11943,20 @@ "visibility": "internal" } ], - "src": "11338:17:5" + "src": "11425:17:7" }, "payable": false, "returnParameters": { - "id": 2249, + "id": 2409, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2248, + "id": 2408, "name": "", "nodeType": "VariableDeclaration", - "scope": 2258, - "src": "11377:4:5", + "scope": 2418, + "src": "11464:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11751,10 +11964,10 @@ "typeString": "bool" }, "typeName": { - "id": 2247, + "id": 2407, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11377:4:5", + "src": "11464:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11764,47 +11977,47 @@ "visibility": "internal" } ], - "src": "11376:6:5" + "src": "11463:6:7" }, - "scope": 2490, - "src": "11319:114:5", + "scope": 2653, + "src": "11406:114:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2295, + "id": 2455, "nodeType": "Block", - "src": "11676:225:5", + "src": "11763:225:7", "statements": [ { "assignments": [ - 2266 + 2426 ], "declarations": [ { "constant": false, - "id": 2266, + "id": 2426, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11682:25:5", + "scope": 2456, + "src": "11769:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2265, + "id": 2425, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "11682:13:5", + "referencedDeclaration": 1707, + "src": "11769:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -11812,31 +12025,31 @@ "visibility": "internal" } ], - "id": 2270, + "id": 2430, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2267, + "id": 2427, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11710:9:5", + "referencedDeclaration": 1734, + "src": "11797:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2269, + "id": 2429, "indexExpression": { "argumentTypes": null, - "id": 2268, + "id": 2428, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2260, - "src": "11720:7:5", + "referencedDeclaration": 2420, + "src": "11807:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11847,42 +12060,42 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11710:18:5", + "src": "11797:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11682:46:5" + "src": "11769:46:7" }, { "assignments": [ - 2272 + 2432 ], "declarations": [ { "constant": false, - "id": 2272, + "id": 2432, "name": "challenge", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11734:26:5", + "scope": 2456, + "src": "11821:26:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_memory_ptr", "typeString": "struct Parameterizer.Challenge" }, "typeName": { "contractScope": null, - "id": 2271, + "id": 2431, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "11734:9:5", + "referencedDeclaration": 1722, + "src": "11821:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } }, @@ -11890,47 +12103,47 @@ "visibility": "internal" } ], - "id": 2277, + "id": 2437, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2273, + "id": 2433, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "11763:10:5", + "referencedDeclaration": 1730, + "src": "11850:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2276, + "id": 2436, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2274, + "id": 2434, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11774:4:5", + "referencedDeclaration": 2426, + "src": "11861:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2275, + "id": 2435, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11774:16:5", + "referencedDeclaration": 1696, + "src": "11861:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11941,14 +12154,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11763:28:5", + "src": "11850:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11734:57:5" + "src": "11821:57:7" }, { "expression": { @@ -11960,7 +12173,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2292, + "id": 2452, "isConstant": false, "isLValue": false, "isPure": false, @@ -11971,7 +12184,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2286, + "id": 2446, "isConstant": false, "isLValue": false, "isPure": false, @@ -11982,7 +12195,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2281, + "id": 2441, "isConstant": false, "isLValue": false, "isPure": false, @@ -11991,26 +12204,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2278, + "id": 2438, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11806:4:5", + "referencedDeclaration": 2426, + "src": "11893:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2279, + "id": 2439, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11806:16:5", + "referencedDeclaration": 1696, + "src": "11893:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12021,14 +12234,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2280, + "id": 2440, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11825:1:5", + "src": "11912:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12036,7 +12249,7 @@ }, "value": "0" }, - "src": "11806:20:5", + "src": "11893:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12050,7 +12263,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2285, + "id": 2445, "isConstant": false, "isLValue": false, "isPure": false, @@ -12059,26 +12272,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2282, + "id": 2442, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2272, - "src": "11830:9:5", + "referencedDeclaration": 2432, + "src": "11917:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_memory_ptr", "typeString": "struct Parameterizer.Challenge memory" } }, - "id": 2283, + "id": 2443, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "11830:18:5", + "referencedDeclaration": 1713, + "src": "11917:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12089,14 +12302,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2284, + "id": 2444, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "11852:5:5", + "src": "11939:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -12104,13 +12317,13 @@ }, "value": "false" }, - "src": "11830:27:5", + "src": "11917:27:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11806:51:5", + "src": "11893:51:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12125,26 +12338,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2289, + "id": 2449, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11878:4:5", + "referencedDeclaration": 2426, + "src": "11965:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2290, + "id": 2450, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11878:16:5", + "referencedDeclaration": 1696, + "src": "11965:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12160,32 +12373,32 @@ ], "expression": { "argumentTypes": null, - "id": 2287, + "id": 2447, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "11861:6:5", + "referencedDeclaration": 1738, + "src": "11948:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2288, + "id": 2448, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "11861:16:5", + "referencedDeclaration": 1334, + "src": "11948:16:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 2291, + "id": 2451, "isConstant": false, "isLValue": false, "isPure": false, @@ -12193,41 +12406,41 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11861:34:5", + "src": "11948:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11806:89:5", + "src": "11893:89:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 2293, + "id": 2453, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11805:91:5", + "src": "11892:91:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2264, - "id": 2294, + "functionReturnParameters": 2424, + "id": 2454, "nodeType": "Return", - "src": "11798:98:5" + "src": "11885:98:7" } ] }, "documentation": "@notice Determines whether the provided proposal ID has a challenge which can be resolved\n@param _propID The proposal ID whose challenge to inspect", - "id": 2296, + "id": 2456, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12235,16 +12448,16 @@ "name": "challengeCanBeResolved", "nodeType": "FunctionDefinition", "parameters": { - "id": 2261, + "id": 2421, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2260, + "id": 2420, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11632:15:5", + "scope": 2456, + "src": "11719:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12252,10 +12465,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2259, + "id": 2419, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11632:7:5", + "src": "11719:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12265,20 +12478,20 @@ "visibility": "internal" } ], - "src": "11631:17:5" + "src": "11718:17:7" }, "payable": false, "returnParameters": { - "id": 2264, + "id": 2424, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2263, + "id": 2423, "name": "", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11670:4:5", + "scope": 2456, + "src": "11757:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12286,10 +12499,10 @@ "typeString": "bool" }, "typeName": { - "id": 2262, + "id": 2422, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11670:4:5", + "src": "11757:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12299,19 +12512,19 @@ "visibility": "internal" } ], - "src": "11669:6:5" + "src": "11756:6:7" }, - "scope": 2490, - "src": "11600:301:5", + "scope": 2653, + "src": "11687:301:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2331, + "id": 2494, "nodeType": "Block", - "src": "12146:293:5", + "src": "12233:302:7", "statements": [ { "condition": { @@ -12320,7 +12533,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2308, + "id": 2468, "isConstant": false, "isLValue": false, "isPure": false, @@ -12330,12 +12543,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2305, + "id": 2465, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12202:12:5", + "referencedDeclaration": 2458, + "src": "12289:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12351,32 +12564,32 @@ ], "expression": { "argumentTypes": null, - "id": 2303, + "id": 2463, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "12156:6:5", + "referencedDeclaration": 1738, + "src": "12243:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2304, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "12156:45:5", + "referencedDeclaration": 1313, + "src": "12243:45:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 2306, + "id": 2466, "isConstant": false, "isLValue": false, "isPure": false, @@ -12384,7 +12597,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12156:59:5", + "src": "12243:59:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12395,14 +12608,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2307, + "id": 2467, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12219:1:5", + "src": "12306:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12410,119 +12623,139 @@ }, "value": "0" }, - "src": "12156:64:5", + "src": "12243:64:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2317, + "id": 2478, "nodeType": "IfStatement", - "src": "12152:195:5", + "src": "12239:198:7", "trueBody": { - "id": 2316, + "id": 2477, "nodeType": "Block", - "src": "12222:125:5", + "src": "12309:128:7", "statements": [ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2314, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "32", - "id": 2309, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "12306:1:5", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 2310, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12310:10:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" - } + "hexValue": "32", + "id": 2474, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "12428:1:7", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" }, - "id": 2312, - "indexExpression": { + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + } + ], + "expression": { + "argumentTypes": null, + "expression": { "argumentTypes": null, - "id": 2311, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12321:12:5", + "baseExpression": { + "argumentTypes": null, + "id": 2469, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12393:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2471, + "indexExpression": { + "argumentTypes": null, + "id": 2470, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12404:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12393:24:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" } }, + "id": 2472, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12310:24:5", + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 1715, + "src": "12393:30:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2313, + "id": 2473, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "stake", + "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 1568, - "src": "12310:30:5", + "referencedDeclaration": 3832, + "src": "12393:34:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "12306:34:5", + "id": 2475, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12393:37:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2302, - "id": 2315, + "functionReturnParameters": 2462, + "id": 2476, "nodeType": "Return", - "src": "12299:41:5" + "src": "12386:44:7" } ] } @@ -12530,198 +12763,238 @@ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2329, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ - { + "arguments": [ + { + "argumentTypes": null, + "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "baseExpression": { + "argumentTypes": null, + "id": 2488, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12494:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } }, - "id": 2323, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "id": 2490, + "indexExpression": { "argumentTypes": null, - "hexValue": "32", - "id": 2318, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "12361:1:5", - "subdenomination": null, + "id": 2489, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12505:12:7", "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12494:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2491, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 1709, + "src": "12494:35:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "components": [ + { "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { + "arguments": [ + { "argumentTypes": null, - "id": 2319, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12365:10:5", + "hexValue": "32", + "id": 2484, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "12486:1:7", + "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" } - }, - "id": 2321, - "indexExpression": { + ], + "expression": { "argumentTypes": null, - "id": 2320, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12376:12:5", + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2479, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12451:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2481, + "indexExpression": { + "argumentTypes": null, + "id": 2480, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12462:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12451:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2482, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 1715, + "src": "12451:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, + "id": 2483, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12365:24:5", + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "12451:34:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2322, + "id": 2485, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "stake", - "nodeType": "MemberAccess", - "referencedDeclaration": 1568, - "src": "12365:30:5", + "names": [], + "nodeType": "FunctionCall", + "src": "12451:37:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "src": "12361:34:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "id": 2324, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "12360:36:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 2325, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12399:10:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" - } - }, - "id": 2327, - "indexExpression": { - "argumentTypes": null, - "id": 2326, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12410:12:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" } - }, + ], + "id": 2486, "isConstant": false, - "isLValue": true, + "isInlineArray": false, + "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12399:24:5", + "nodeType": "TupleExpression", + "src": "12450:39:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2328, + "id": 2487, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "rewardPool", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "12399:35:5", + "referencedDeclaration": 3866, + "src": "12450:43:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "12360:74:5", + "id": 2492, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12450:80:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2302, - "id": 2330, + "functionReturnParameters": 2462, + "id": 2493, "nodeType": "Return", - "src": "12353:81:5" + "src": "12443:87:7" } ] }, "documentation": "@notice Determines the number of tokens to awarded to the winning party in a challenge\n@param _challengeID The challengeID to determine a reward for", - "id": 2332, + "id": 2495, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12729,16 +13002,16 @@ "name": "challengeWinnerReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2299, + "id": 2459, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2298, + "id": 2458, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2332, - "src": "12100:17:5", + "scope": 2495, + "src": "12187:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12746,10 +13019,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2297, + "id": 2457, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12100:4:5", + "src": "12187:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12759,20 +13032,20 @@ "visibility": "internal" } ], - "src": "12099:19:5" + "src": "12186:19:7" }, "payable": false, "returnParameters": { - "id": 2302, + "id": 2462, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2301, + "id": 2461, "name": "", "nodeType": "VariableDeclaration", - "scope": 2332, - "src": "12140:4:5", + "scope": 2495, + "src": "12227:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12780,10 +13053,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2300, + "id": 2460, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12140:4:5", + "src": "12227:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12793,37 +13066,37 @@ "visibility": "internal" } ], - "src": "12139:6:5" + "src": "12226:6:7" }, - "scope": 2490, - "src": "12069:370:5", + "scope": 2653, + "src": "12156:379:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2348, + "id": 2511, "nodeType": "Block", - "src": "12655:60:5", + "src": "12751:60:7", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2339, + "id": 2502, "name": "params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "12668:6:5", + "referencedDeclaration": 1726, + "src": "12764:6:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" } }, - "id": 2346, + "id": 2509, "indexExpression": { "argumentTypes": null, "arguments": [ @@ -12832,12 +13105,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2343, + "id": 2506, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2334, - "src": "12702:5:5", + "referencedDeclaration": 2497, + "src": "12798:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -12853,18 +13126,18 @@ ], "expression": { "argumentTypes": null, - "id": 2341, + "id": 2504, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "12685:3:5", + "referencedDeclaration": 4140, + "src": "12781:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 2342, + "id": 2505, "isConstant": false, "isLValue": false, "isPure": true, @@ -12872,13 +13145,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12685:16:5", + "src": "12781:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 2344, + "id": 2507, "isConstant": false, "isLValue": false, "isPure": false, @@ -12886,7 +13159,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12685:23:5", + "src": "12781:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -12900,18 +13173,18 @@ "typeString": "bytes memory" } ], - "id": 2340, + "id": 2503, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "12675:9:5", + "referencedDeclaration": 4147, + "src": "12771:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 2345, + "id": 2508, "isConstant": false, "isLValue": false, "isPure": false, @@ -12919,7 +13192,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12675:34:5", + "src": "12771:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12930,21 +13203,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12668:42:5", + "src": "12764:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2338, - "id": 2347, + "functionReturnParameters": 2501, + "id": 2510, "nodeType": "Return", - "src": "12661:49:5" + "src": "12757:49:7" } ] }, "documentation": "@notice gets the parameter keyed by the provided name value from the params mapping\n@param _name the key whose value is to be determined", - "id": 2349, + "id": 2512, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12952,16 +13225,16 @@ "name": "get", "nodeType": "FunctionDefinition", "parameters": { - "id": 2335, + "id": 2498, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2334, + "id": 2497, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2349, - "src": "12608:12:5", + "scope": 2512, + "src": "12704:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12969,10 +13242,10 @@ "typeString": "string" }, "typeName": { - "id": 2333, + "id": 2496, "name": "string", "nodeType": "ElementaryTypeName", - "src": "12608:6:5", + "src": "12704:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -12982,20 +13255,20 @@ "visibility": "internal" } ], - "src": "12607:14:5" + "src": "12703:14:7" }, "payable": false, "returnParameters": { - "id": 2338, + "id": 2501, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2337, + "id": 2500, "name": "value", "nodeType": "VariableDeclaration", - "scope": 2349, - "src": "12643:10:5", + "scope": 2512, + "src": "12739:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13003,10 +13276,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2336, + "id": 2499, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12643:4:5", + "src": "12739:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13016,19 +13289,19 @@ "visibility": "internal" } ], - "src": "12642:12:5" + "src": "12738:12:7" }, - "scope": 2490, - "src": "12595:120:5", + "scope": 2653, + "src": "12691:120:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2365, + "id": 2528, "nodeType": "Block", - "src": "13013:62:5", + "src": "13109:62:7", "statements": [ { "expression": { @@ -13039,26 +13312,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2358, + "id": 2521, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "13026:10:5", + "referencedDeclaration": 1730, + "src": "13122:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2360, + "id": 2523, "indexExpression": { "argumentTypes": null, - "id": 2359, + "id": 2522, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2351, - "src": "13037:12:5", + "referencedDeclaration": 2514, + "src": "13133:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13069,35 +13342,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13026:24:5", + "src": "13122:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2361, + "id": 2524, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "13026:36:5", + "referencedDeclaration": 1721, + "src": "13122:36:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2363, + "id": 2526, "indexExpression": { "argumentTypes": null, - "id": 2362, + "id": 2525, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2353, - "src": "13063:6:5", + "referencedDeclaration": 2516, + "src": "13159:6:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13108,21 +13381,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13026:44:5", + "src": "13122:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2357, - "id": 2364, + "functionReturnParameters": 2520, + "id": 2527, "nodeType": "Return", - "src": "13019:51:5" + "src": "13115:51:7" } ] }, "documentation": "@dev Getter for Challenge tokenClaims mappings\n@param _challengeID The challengeID to query\n@param _voter The voter whose claim status to query for the provided challengeID", - "id": 2366, + "id": 2529, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -13130,16 +13403,16 @@ "name": "tokenClaims", "nodeType": "FunctionDefinition", "parameters": { - "id": 2354, + "id": 2517, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2351, + "id": 2514, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "12951:17:5", + "scope": 2529, + "src": "13047:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13147,10 +13420,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2350, + "id": 2513, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12951:4:5", + "src": "13047:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13161,11 +13434,11 @@ }, { "constant": false, - "id": 2353, + "id": 2516, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "12970:14:5", + "scope": 2529, + "src": "13066:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13173,10 +13446,10 @@ "typeString": "address" }, "typeName": { - "id": 2352, + "id": 2515, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12970:7:5", + "src": "13066:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13186,20 +13459,20 @@ "visibility": "internal" } ], - "src": "12950:35:5" + "src": "13046:35:7" }, "payable": false, "returnParameters": { - "id": 2357, + "id": 2520, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2356, + "id": 2519, "name": "", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "13007:4:5", + "scope": 2529, + "src": "13103:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13207,10 +13480,10 @@ "typeString": "bool" }, "typeName": { - "id": 2355, + "id": 2518, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13007:4:5", + "src": "13103:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13220,47 +13493,47 @@ "visibility": "internal" } ], - "src": "13006:6:5" + "src": "13102:6:7" }, - "scope": 2490, - "src": "12930:145:5", + "scope": 2653, + "src": "13026:145:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2469, + "id": 2632, "nodeType": "Block", - "src": "13403:1025:5", + "src": "13499:1025:7", "statements": [ { "assignments": [ - 2372 + 2535 ], "declarations": [ { "constant": false, - "id": 2372, + "id": 2535, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13409:25:5", + "scope": 2633, + "src": "13505:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2371, + "id": 2534, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "13409:13:5", + "referencedDeclaration": 1707, + "src": "13505:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -13268,31 +13541,31 @@ "visibility": "internal" } ], - "id": 2376, + "id": 2539, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2373, + "id": 2536, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "13437:9:5", + "referencedDeclaration": 1734, + "src": "13533:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2375, + "id": 2538, "indexExpression": { "argumentTypes": null, - "id": 2374, + "id": 2537, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "13447:7:5", + "referencedDeclaration": 2531, + "src": "13543:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13303,42 +13576,42 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13437:18:5", + "src": "13533:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "13409:46:5" + "src": "13505:46:7" }, { "assignments": [ - 2378 + 2541 ], "declarations": [ { "constant": false, - "id": 2378, + "id": 2541, "name": "challenge", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13461:27:5", + "scope": 2633, + "src": "13557:27:7", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" }, "typeName": { "contractScope": null, - "id": 2377, + "id": 2540, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "13461:9:5", + "referencedDeclaration": 1722, + "src": "13557:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } }, @@ -13346,47 +13619,47 @@ "visibility": "internal" } ], - "id": 2383, + "id": 2546, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2379, + "id": 2542, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "13491:10:5", + "referencedDeclaration": 1730, + "src": "13587:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2382, + "id": 2545, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2380, + "id": 2543, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13502:4:5", + "referencedDeclaration": 2535, + "src": "13598:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2381, + "id": 2544, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13502:16:5", + "referencedDeclaration": 1696, + "src": "13598:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13397,27 +13670,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13491:28:5", + "src": "13587:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "13461:58:5" + "src": "13557:58:7" }, { "assignments": [ - 2385 + 2548 ], "declarations": [ { "constant": false, - "id": 2385, + "id": 2548, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13611:11:5", + "scope": 2633, + "src": "13707:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13425,10 +13698,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2384, + "id": 2547, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13611:4:5", + "src": "13707:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13438,7 +13711,7 @@ "visibility": "internal" } ], - "id": 2390, + "id": 2553, "initialValue": { "argumentTypes": null, "arguments": [ @@ -13446,26 +13719,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2387, + "id": 2550, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13647:4:5", + "referencedDeclaration": 2535, + "src": "13743:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2388, + "id": 2551, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13647:16:5", + "referencedDeclaration": 1696, + "src": "13743:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13479,18 +13752,18 @@ "typeString": "uint256" } ], - "id": 2386, + "id": 2549, "name": "challengeWinnerReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2332, - "src": "13625:21:5", + "referencedDeclaration": 2495, + "src": "13721:21:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view returns (uint256)" } }, - "id": 2389, + "id": 2552, "isConstant": false, "isLValue": false, "isPure": false, @@ -13498,19 +13771,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13625:39:5", + "src": "13721:39:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "13611:53:5" + "src": "13707:53:7" }, { "expression": { "argumentTypes": null, - "id": 2399, + "id": 2562, "isConstant": false, "isLValue": false, "isPure": false, @@ -13519,26 +13792,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2391, + "id": 2554, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "13671:9:5", + "referencedDeclaration": 2541, + "src": "13767:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2393, + "id": 2556, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "13671:23:5", + "referencedDeclaration": 1717, + "src": "13767:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13553,26 +13826,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2396, + "id": 2559, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13743:4:5", + "referencedDeclaration": 2535, + "src": "13839:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2397, + "id": 2560, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13743:16:5", + "referencedDeclaration": 1696, + "src": "13839:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13588,32 +13861,32 @@ ], "expression": { "argumentTypes": null, - "id": 2394, + "id": 2557, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "13697:6:5", + "referencedDeclaration": 1738, + "src": "13793:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2395, + "id": 2558, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "13697:45:5", + "referencedDeclaration": 1313, + "src": "13793:45:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 2398, + "id": 2561, "isConstant": false, "isLValue": false, "isPure": false, @@ -13621,26 +13894,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13697:63:5", + "src": "13793:63:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13671:89:5", + "src": "13767:89:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2400, + "id": 2563, "nodeType": "ExpressionStatement", - "src": "13671:89:5" + "src": "13767:89:7" }, { "expression": { "argumentTypes": null, - "id": 2405, + "id": 2568, "isConstant": false, "isLValue": false, "isPure": false, @@ -13649,26 +13922,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2401, + "id": 2564, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "13766:9:5", + "referencedDeclaration": 2541, + "src": "13862:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2403, + "id": 2566, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "13766:18:5", + "referencedDeclaration": 1713, + "src": "13862:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13679,14 +13952,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2404, + "id": 2567, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "13787:4:5", + "src": "13883:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -13694,15 +13967,15 @@ }, "value": "true" }, - "src": "13766:25:5", + "src": "13862:25:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2406, + "id": 2569, "nodeType": "ExpressionStatement", - "src": "13766:25:5" + "src": "13862:25:7" }, { "condition": { @@ -13712,26 +13985,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2409, + "id": 2572, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13818:4:5", + "referencedDeclaration": 2535, + "src": "13914:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2410, + "id": 2573, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13818:16:5", + "referencedDeclaration": 1696, + "src": "13914:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13747,32 +14020,32 @@ ], "expression": { "argumentTypes": null, - "id": 2407, + "id": 2570, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "13802:6:5", + "referencedDeclaration": 1738, + "src": "13898:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2408, + "id": 2571, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "isPassed", "nodeType": "MemberAccess", - "referencedDeclaration": 1138, - "src": "13802:15:5", + "referencedDeclaration": 1285, + "src": "13898:15:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 2411, + "id": 2574, "isConstant": false, "isLValue": false, "isPure": false, @@ -13780,16 +14053,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13802:33:5", + "src": "13898:33:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2467, + "id": 2630, "nodeType": "Block", - "src": "14147:277:5", + "src": "14243:277:7", "statements": [ { "eventCall": { @@ -13797,12 +14070,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2446, + "id": 2609, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "14232:7:5", + "referencedDeclaration": 2531, + "src": "14328:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13812,26 +14085,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2447, + "id": 2610, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14249:4:5", + "referencedDeclaration": 2535, + "src": "14345:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2448, + "id": 2611, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "14249:16:5", + "referencedDeclaration": 1696, + "src": "14345:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13841,26 +14114,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2449, + "id": 2612, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14275:9:5", + "referencedDeclaration": 2541, + "src": "14371:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2450, + "id": 2613, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "14275:20:5", + "referencedDeclaration": 1709, + "src": "14371:20:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13870,26 +14143,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2451, + "id": 2614, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14305:9:5", + "referencedDeclaration": 2541, + "src": "14401:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2452, + "id": 2615, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "14305:23:5", + "referencedDeclaration": 1717, + "src": "14401:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13915,18 +14188,18 @@ "typeString": "uint256" } ], - "id": 2445, + "id": 2608, "name": "_ChallengeSucceeded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1524, - "src": "14203:19:5", + "referencedDeclaration": 1671, + "src": "14299:19:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 2453, + "id": 2616, "isConstant": false, "isLValue": false, "isPure": false, @@ -13934,15 +14207,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14203:133:5", + "src": "14299:133:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2454, + "id": 2617, "nodeType": "EmitStatement", - "src": "14198:138:5" + "src": "14294:138:7" }, { "expression": { @@ -13957,42 +14230,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2458, + "id": 2621, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "14368:10:5", + "referencedDeclaration": 1730, + "src": "14464:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2461, + "id": 2624, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2459, + "id": 2622, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14379:4:5", + "referencedDeclaration": 2535, + "src": "14475:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2460, + "id": 2623, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "14379:16:5", + "referencedDeclaration": 1696, + "src": "14475:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14003,21 +14276,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14368:28:5", + "src": "14464:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2462, + "id": 2625, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challenger", "nodeType": "MemberAccess", - "referencedDeclaration": 1564, - "src": "14368:39:5", + "referencedDeclaration": 1711, + "src": "14464:39:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14025,12 +14298,12 @@ }, { "argumentTypes": null, - "id": 2463, + "id": 2626, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "14409:6:5", + "referencedDeclaration": 2548, + "src": "14505:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14050,32 +14323,32 @@ ], "expression": { "argumentTypes": null, - "id": 2456, + "id": 2619, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "14353:5:5", + "referencedDeclaration": 1736, + "src": "14449:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2457, + "id": 2620, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "14353:14:5", + "referencedDeclaration": 551, + "src": "14449:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2464, + "id": 2627, "isConstant": false, "isLValue": false, "isPure": false, @@ -14083,7 +14356,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14353:63:5", + "src": "14449:63:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14097,21 +14370,21 @@ "typeString": "bool" } ], - "id": 2455, + "id": 2618, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "14345:7:5", + "referencedDeclaration": 4156, + "src": "14441:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2465, + "id": 2628, "isConstant": false, "isLValue": false, "isPure": false, @@ -14119,25 +14392,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14345:72:5", + "src": "14441:72:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2466, + "id": 2629, "nodeType": "ExpressionStatement", - "src": "14345:72:5" + "src": "14441:72:7" } ] }, - "id": 2468, + "id": 2631, "nodeType": "IfStatement", - "src": "13798:626:5", + "src": "13894:626:7", "trueBody": { - "id": 2444, + "id": 2607, "nodeType": "Block", - "src": "13837:304:5", + "src": "13933:304:7", "statements": [ { "condition": { @@ -14146,7 +14419,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2415, + "id": 2578, "isConstant": false, "isLValue": false, "isPure": false, @@ -14155,26 +14428,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2412, + "id": 2575, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13873:4:5", + "referencedDeclaration": 2535, + "src": "13969:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2413, + "id": 2576, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "13873:14:5", + "referencedDeclaration": 1704, + "src": "13969:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14184,31 +14457,31 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 2414, + "id": 2577, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "13890:3:5", + "referencedDeclaration": 4155, + "src": "13986:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13873:20:5", + "src": "13969:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2424, + "id": 2587, "nodeType": "IfStatement", - "src": "13869:71:5", + "src": "13965:71:7", "trueBody": { - "id": 2423, + "id": 2586, "nodeType": "Block", - "src": "13895:45:5", + "src": "13991:45:7", "statements": [ { "expression": { @@ -14218,26 +14491,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2417, + "id": 2580, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13909:4:5", + "referencedDeclaration": 2535, + "src": "14005:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2418, + "id": 2581, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "13909:9:5", + "referencedDeclaration": 1700, + "src": "14005:9:7", "typeDescriptions": { "typeIdentifier": "t_string_memory", "typeString": "string memory" @@ -14247,26 +14520,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2419, + "id": 2582, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13920:4:5", + "referencedDeclaration": 2535, + "src": "14016:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2420, + "id": 2583, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "13920:10:5", + "referencedDeclaration": 1706, + "src": "14016:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14284,18 +14557,18 @@ "typeString": "uint256" } ], - "id": 2416, + "id": 2579, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "13905:3:5", + "referencedDeclaration": 2652, + "src": "14001:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 2421, + "id": 2584, "isConstant": false, "isLValue": false, "isPure": false, @@ -14303,15 +14576,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13905:26:5", + "src": "14001:26:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2422, + "id": 2585, "nodeType": "ExpressionStatement", - "src": "13905:26:5" + "src": "14001:26:7" } ] } @@ -14322,12 +14595,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2426, + "id": 2589, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "13978:7:5", + "referencedDeclaration": 2531, + "src": "14074:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14337,26 +14610,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2427, + "id": 2590, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13995:4:5", + "referencedDeclaration": 2535, + "src": "14091:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2428, + "id": 2591, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13995:16:5", + "referencedDeclaration": 1696, + "src": "14091:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14366,26 +14639,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2429, + "id": 2592, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14021:9:5", + "referencedDeclaration": 2541, + "src": "14117:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2430, + "id": 2593, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "14021:20:5", + "referencedDeclaration": 1709, + "src": "14117:20:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14395,26 +14668,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2431, + "id": 2594, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14051:9:5", + "referencedDeclaration": 2541, + "src": "14147:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2432, + "id": 2595, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "14051:23:5", + "referencedDeclaration": 1717, + "src": "14147:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14440,18 +14713,18 @@ "typeString": "uint256" } ], - "id": 2425, + "id": 2588, "name": "_ChallengeFailed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1534, - "src": "13952:16:5", + "referencedDeclaration": 1681, + "src": "14048:16:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 2433, + "id": 2596, "isConstant": false, "isLValue": false, "isPure": false, @@ -14459,15 +14732,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13952:130:5", + "src": "14048:130:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2434, + "id": 2597, "nodeType": "EmitStatement", - "src": "13947:135:5" + "src": "14043:135:7" }, { "expression": { @@ -14480,26 +14753,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2438, + "id": 2601, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14114:4:5", + "referencedDeclaration": 2535, + "src": "14210:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2439, + "id": 2602, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 1555, - "src": "14114:10:5", + "referencedDeclaration": 1702, + "src": "14210:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14507,12 +14780,12 @@ }, { "argumentTypes": null, - "id": 2440, + "id": 2603, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "14126:6:5", + "referencedDeclaration": 2548, + "src": "14222:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14532,32 +14805,32 @@ ], "expression": { "argumentTypes": null, - "id": 2436, + "id": 2599, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "14099:5:5", + "referencedDeclaration": 1736, + "src": "14195:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2437, + "id": 2600, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "14099:14:5", + "referencedDeclaration": 551, + "src": "14195:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2441, + "id": 2604, "isConstant": false, "isLValue": false, "isPure": false, @@ -14565,7 +14838,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14099:34:5", + "src": "14195:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14579,21 +14852,21 @@ "typeString": "bool" } ], - "id": 2435, + "id": 2598, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "14091:7:5", + "referencedDeclaration": 4156, + "src": "14187:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2442, + "id": 2605, "isConstant": false, "isLValue": false, "isPure": false, @@ -14601,15 +14874,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14091:43:5", + "src": "14187:43:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2443, + "id": 2606, "nodeType": "ExpressionStatement", - "src": "14091:43:5" + "src": "14187:43:7" } ] } @@ -14617,7 +14890,7 @@ ] }, "documentation": "@dev resolves a challenge for the provided _propID. It must be checked in advance whether the _propID has a challenge on it\n@param _propID the proposal ID whose challenge is to be resolved.", - "id": 2470, + "id": 2633, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -14625,16 +14898,16 @@ "name": "resolveChallenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 2369, + "id": 2532, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2368, + "id": 2531, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13378:15:5", + "scope": 2633, + "src": "13474:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14642,10 +14915,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2367, + "id": 2530, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13378:7:5", + "src": "13474:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14655,31 +14928,31 @@ "visibility": "internal" } ], - "src": "13377:17:5" + "src": "13473:17:7" }, "payable": false, "returnParameters": { - "id": 2370, + "id": 2533, "nodeType": "ParameterList", "parameters": [], - "src": "13403:0:5" + "src": "13499:0:7" }, - "scope": 2490, - "src": "13352:1076:5", + "scope": 2653, + "src": "13448:1076:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2488, + "id": 2651, "nodeType": "Block", - "src": "14662:62:5", + "src": "14758:62:7", "statements": [ { "expression": { "argumentTypes": null, - "id": 2486, + "id": 2649, "isConstant": false, "isLValue": false, "isPure": false, @@ -14688,18 +14961,18 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2477, + "id": 2640, "name": "params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "14668:6:5", + "referencedDeclaration": 1726, + "src": "14764:6:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" } }, - "id": 2484, + "id": 2647, "indexExpression": { "argumentTypes": null, "arguments": [ @@ -14708,12 +14981,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2481, + "id": 2644, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2472, - "src": "14702:5:5", + "referencedDeclaration": 2635, + "src": "14798:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -14729,18 +15002,18 @@ ], "expression": { "argumentTypes": null, - "id": 2479, + "id": 2642, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "14685:3:5", + "referencedDeclaration": 4140, + "src": "14781:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 2480, + "id": 2643, "isConstant": false, "isLValue": false, "isPure": true, @@ -14748,13 +15021,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14685:16:5", + "src": "14781:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 2482, + "id": 2645, "isConstant": false, "isLValue": false, "isPure": false, @@ -14762,7 +15035,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14685:23:5", + "src": "14781:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -14776,18 +15049,18 @@ "typeString": "bytes memory" } ], - "id": 2478, + "id": 2641, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "14675:9:5", + "referencedDeclaration": 4147, + "src": "14771:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 2483, + "id": 2646, "isConstant": false, "isLValue": false, "isPure": false, @@ -14795,7 +15068,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14675:34:5", + "src": "14771:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14806,7 +15079,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "14668:42:5", + "src": "14764:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14816,31 +15089,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2485, + "id": 2648, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2474, - "src": "14713:6:5", + "referencedDeclaration": 2637, + "src": "14809:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "14668:51:5", + "src": "14764:51:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2487, + "id": 2650, "nodeType": "ExpressionStatement", - "src": "14668:51:5" + "src": "14764:51:7" } ] }, "documentation": "@dev sets the param keted by the provided name to the provided value\n@param _name the name of the param to be set\n@param _value the value to set the param to be set", - "id": 2489, + "id": 2652, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -14848,16 +15121,16 @@ "name": "set", "nodeType": "FunctionDefinition", "parameters": { - "id": 2475, + "id": 2638, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2472, + "id": 2635, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2489, - "src": "14627:12:5", + "scope": 2652, + "src": "14723:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14865,10 +15138,10 @@ "typeString": "string" }, "typeName": { - "id": 2471, + "id": 2634, "name": "string", "nodeType": "ElementaryTypeName", - "src": "14627:6:5", + "src": "14723:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -14879,11 +15152,11 @@ }, { "constant": false, - "id": 2474, + "id": 2637, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 2489, - "src": "14641:11:5", + "scope": 2652, + "src": "14737:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14891,10 +15164,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2473, + "id": 2636, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14641:4:5", + "src": "14737:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14904,78 +15177,78 @@ "visibility": "internal" } ], - "src": "14626:27:5" + "src": "14722:27:7" }, "payable": false, "returnParameters": { - "id": 2476, + "id": 2639, "nodeType": "ParameterList", "parameters": [], - "src": "14662:0:5" + "src": "14758:0:7" }, - "scope": 2490, - "src": "14614:110:5", + "scope": 2653, + "src": "14710:110:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 2491, - "src": "101:14625:5" + "scope": 2654, + "src": "101:14721:7" } ], - "src": "0:14727:5" + "src": "0:14823:7" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/Parameterizer.sol", + "absolutePath": "/home/bharath/computable/contracts/Parameterizer.sol", "exportedSymbols": { "Parameterizer": [ - 2490 + 2653 ] }, - "id": 2491, + "id": 2654, "nodeType": "SourceUnit", "nodes": [ { - "id": 1473, + "id": 1620, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:7" }, { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "file": "./PLCRVoting.sol", - "id": 1474, + "id": 1621, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 1472, - "src": "25:26:5", + "scope": 2654, + "sourceUnit": 1619, + "src": "25:26:7", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 1475, + "id": 1622, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 409, - "src": "52:21:5", + "scope": 2654, + "sourceUnit": 529, + "src": "52:21:7", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 1476, + "id": 1623, "nodeType": "ImportDirective", - "scope": 2491, - "sourceUnit": 3688, - "src": "74:24:5", + "scope": 2654, + "sourceUnit": 3892, + "src": "74:24:7", "symbolAliases": [], "unitAlias": "" }, @@ -14985,9 +15258,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2490, + "id": 2653, "linearizedBaseContracts": [ - 2490 + 2653 ], "name": "Parameterizer", "nodeType": "ContractDefinition", @@ -14995,21 +15268,21 @@ { "anonymous": false, "documentation": null, - "id": 1490, + "id": 1637, "name": "_ReparameterizationProposal", "nodeType": "EventDefinition", "parameters": { - "id": 1489, + "id": 1636, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1478, + "id": 1625, "indexed": false, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "200:11:5", + "scope": 1637, + "src": "200:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15017,10 +15290,10 @@ "typeString": "string" }, "typeName": { - "id": 1477, + "id": 1624, "name": "string", "nodeType": "ElementaryTypeName", - "src": "200:6:5", + "src": "200:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -15031,12 +15304,12 @@ }, { "constant": false, - "id": 1480, + "id": 1627, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "213:10:5", + "scope": 1637, + "src": "213:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15044,10 +15317,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1479, + "id": 1626, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "213:4:5", + "src": "213:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15058,12 +15331,12 @@ }, { "constant": false, - "id": 1482, + "id": 1629, "indexed": false, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "225:14:5", + "scope": 1637, + "src": "225:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15071,10 +15344,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1481, + "id": 1628, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "225:7:5", + "src": "225:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15085,12 +15358,12 @@ }, { "constant": false, - "id": 1484, + "id": 1631, "indexed": false, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "241:12:5", + "scope": 1637, + "src": "241:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15098,10 +15371,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1483, + "id": 1630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "241:4:5", + "src": "241:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15112,12 +15385,12 @@ }, { "constant": false, - "id": 1486, + "id": 1633, "indexed": false, "name": "appEndDate", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "255:15:5", + "scope": 1637, + "src": "255:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15125,10 +15398,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1485, + "id": 1632, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "255:4:5", + "src": "255:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15139,12 +15412,12 @@ }, { "constant": false, - "id": 1488, + "id": 1635, "indexed": true, "name": "proposer", "nodeType": "VariableDeclaration", - "scope": 1490, - "src": "272:24:5", + "scope": 1637, + "src": "272:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15152,10 +15425,10 @@ "typeString": "address" }, "typeName": { - "id": 1487, + "id": 1634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "272:7:5", + "src": "272:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15165,28 +15438,28 @@ "visibility": "internal" } ], - "src": "199:98:5" + "src": "199:98:7" }, - "src": "166:132:5" + "src": "166:132:7" }, { "anonymous": false, "documentation": null, - "id": 1502, + "id": 1649, "name": "_NewChallenge", "nodeType": "EventDefinition", "parameters": { - "id": 1501, + "id": 1648, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1492, + "id": 1639, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "321:22:5", + "scope": 1649, + "src": "321:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15194,10 +15467,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1491, + "id": 1638, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "321:7:5", + "src": "321:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15208,12 +15481,12 @@ }, { "constant": false, - "id": 1494, + "id": 1641, "indexed": false, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "345:16:5", + "scope": 1649, + "src": "345:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15221,10 +15494,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1493, + "id": 1640, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "345:4:5", + "src": "345:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15235,12 +15508,12 @@ }, { "constant": false, - "id": 1496, + "id": 1643, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "363:18:5", + "scope": 1649, + "src": "363:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15248,10 +15521,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1495, + "id": 1642, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "363:4:5", + "src": "363:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15262,12 +15535,12 @@ }, { "constant": false, - "id": 1498, + "id": 1645, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "383:18:5", + "scope": 1649, + "src": "383:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15275,10 +15548,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1497, + "id": 1644, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "383:4:5", + "src": "383:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15289,12 +15562,12 @@ }, { "constant": false, - "id": 1500, + "id": 1647, "indexed": true, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 1502, - "src": "403:26:5", + "scope": 1649, + "src": "403:26:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15302,10 +15575,10 @@ "typeString": "address" }, "typeName": { - "id": 1499, + "id": 1646, "name": "address", "nodeType": "ElementaryTypeName", - "src": "403:7:5", + "src": "403:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15315,28 +15588,28 @@ "visibility": "internal" } ], - "src": "320:110:5" + "src": "320:110:7" }, - "src": "301:130:5" + "src": "301:130:7" }, { "anonymous": false, "documentation": null, - "id": 1510, + "id": 1657, "name": "_ProposalAccepted", "nodeType": "EventDefinition", "parameters": { - "id": 1509, + "id": 1656, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1504, + "id": 1651, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "458:22:5", + "scope": 1657, + "src": "458:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15344,10 +15617,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1503, + "id": 1650, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "458:7:5", + "src": "458:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15358,12 +15631,12 @@ }, { "constant": false, - "id": 1506, + "id": 1653, "indexed": false, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "482:11:5", + "scope": 1657, + "src": "482:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15371,10 +15644,10 @@ "typeString": "string" }, "typeName": { - "id": 1505, + "id": 1652, "name": "string", "nodeType": "ElementaryTypeName", - "src": "482:6:5", + "src": "482:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -15385,12 +15658,12 @@ }, { "constant": false, - "id": 1508, + "id": 1655, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1510, - "src": "495:10:5", + "scope": 1657, + "src": "495:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15398,10 +15671,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1507, + "id": 1654, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "495:4:5", + "src": "495:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15411,28 +15684,28 @@ "visibility": "internal" } ], - "src": "457:49:5" + "src": "457:49:7" }, - "src": "434:73:5" + "src": "434:73:7" }, { "anonymous": false, "documentation": null, - "id": 1514, + "id": 1661, "name": "_ProposalExpired", "nodeType": "EventDefinition", "parameters": { - "id": 1513, + "id": 1660, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1512, + "id": 1659, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1514, - "src": "533:22:5", + "scope": 1661, + "src": "533:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15440,10 +15713,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1511, + "id": 1658, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "533:7:5", + "src": "533:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15453,28 +15726,28 @@ "visibility": "internal" } ], - "src": "532:24:5" + "src": "532:24:7" }, - "src": "510:47:5" + "src": "510:47:7" }, { "anonymous": false, "documentation": null, - "id": 1524, + "id": 1671, "name": "_ChallengeSucceeded", "nodeType": "EventDefinition", "parameters": { - "id": 1523, + "id": 1670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1516, + "id": 1663, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "586:22:5", + "scope": 1671, + "src": "586:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15482,10 +15755,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1515, + "id": 1662, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "586:7:5", + "src": "586:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15496,12 +15769,12 @@ }, { "constant": false, - "id": 1518, + "id": 1665, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "610:24:5", + "scope": 1671, + "src": "610:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15509,10 +15782,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1517, + "id": 1664, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "610:4:5", + "src": "610:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15523,12 +15796,12 @@ }, { "constant": false, - "id": 1520, + "id": 1667, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "636:15:5", + "scope": 1671, + "src": "636:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15536,10 +15809,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1519, + "id": 1666, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "636:4:5", + "src": "636:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15550,12 +15823,12 @@ }, { "constant": false, - "id": 1522, + "id": 1669, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 1524, - "src": "653:16:5", + "scope": 1671, + "src": "653:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15563,10 +15836,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1521, + "id": 1668, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "653:4:5", + "src": "653:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15576,28 +15849,28 @@ "visibility": "internal" } ], - "src": "585:85:5" + "src": "585:85:7" }, - "src": "560:111:5" + "src": "560:111:7" }, { "anonymous": false, "documentation": null, - "id": 1534, + "id": 1681, "name": "_ChallengeFailed", "nodeType": "EventDefinition", "parameters": { - "id": 1533, + "id": 1680, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1526, + "id": 1673, "indexed": true, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "697:22:5", + "scope": 1681, + "src": "697:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15605,10 +15878,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1525, + "id": 1672, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "697:7:5", + "src": "697:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15619,12 +15892,12 @@ }, { "constant": false, - "id": 1528, + "id": 1675, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "721:24:5", + "scope": 1681, + "src": "721:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15632,10 +15905,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1527, + "id": 1674, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "721:4:5", + "src": "721:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15646,12 +15919,12 @@ }, { "constant": false, - "id": 1530, + "id": 1677, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "747:15:5", + "scope": 1681, + "src": "747:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15659,10 +15932,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1529, + "id": 1676, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "747:4:5", + "src": "747:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15673,12 +15946,12 @@ }, { "constant": false, - "id": 1532, + "id": 1679, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 1534, - "src": "764:16:5", + "scope": 1681, + "src": "764:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15686,10 +15959,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1531, + "id": 1678, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "764:4:5", + "src": "764:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15699,28 +15972,28 @@ "visibility": "internal" } ], - "src": "696:85:5" + "src": "696:85:7" }, - "src": "674:108:5" + "src": "674:108:7" }, { "anonymous": false, "documentation": null, - "id": 1542, + "id": 1689, "name": "_RewardClaimed", "nodeType": "EventDefinition", "parameters": { - "id": 1541, + "id": 1688, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1536, + "id": 1683, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "806:24:5", + "scope": 1689, + "src": "806:24:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15728,10 +16001,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1535, + "id": 1682, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "806:4:5", + "src": "806:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15742,12 +16015,12 @@ }, { "constant": false, - "id": 1538, + "id": 1685, "indexed": false, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "832:11:5", + "scope": 1689, + "src": "832:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15755,10 +16028,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1537, + "id": 1684, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "832:4:5", + "src": "832:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15769,12 +16042,12 @@ }, { "constant": false, - "id": 1540, + "id": 1687, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 1542, - "src": "845:21:5", + "scope": 1689, + "src": "845:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15782,10 +16055,10 @@ "typeString": "address" }, "typeName": { - "id": 1539, + "id": 1686, "name": "address", "nodeType": "ElementaryTypeName", - "src": "845:7:5", + "src": "845:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15795,31 +16068,31 @@ "visibility": "internal" } ], - "src": "805:62:5" + "src": "805:62:7" }, - "src": "785:83:5" + "src": "785:83:7" }, { - "id": 1545, + "id": 1692, "libraryName": { "contractScope": null, - "id": 1543, + "id": 1690, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "925:8:5", + "referencedDeclaration": 3891, + "src": "925:8:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "919:24:5", + "src": "919:24:7", "typeName": { - "id": 1544, + "id": 1691, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "938:4:5", + "src": "938:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15828,15 +16101,15 @@ }, { "canonicalName": "Parameterizer.ParamProposal", - "id": 1560, + "id": 1707, "members": [ { "constant": false, - "id": 1547, + "id": 1694, "name": "appExpiry", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "974:14:5", + "scope": 1707, + "src": "974:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15844,10 +16117,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1546, + "id": 1693, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "974:4:5", + "src": "974:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15858,11 +16131,11 @@ }, { "constant": false, - "id": 1549, + "id": 1696, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "994:16:5", + "scope": 1707, + "src": "994:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15870,10 +16143,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1548, + "id": 1695, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "994:4:5", + "src": "994:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15884,11 +16157,11 @@ }, { "constant": false, - "id": 1551, + "id": 1698, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1016:12:5", + "scope": 1707, + "src": "1016:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15896,10 +16169,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1550, + "id": 1697, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1016:4:5", + "src": "1016:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15910,11 +16183,11 @@ }, { "constant": false, - "id": 1553, + "id": 1700, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1034:11:5", + "scope": 1707, + "src": "1034:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15922,10 +16195,10 @@ "typeString": "string" }, "typeName": { - "id": 1552, + "id": 1699, "name": "string", "nodeType": "ElementaryTypeName", - "src": "1034:6:5", + "src": "1034:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -15936,11 +16209,11 @@ }, { "constant": false, - "id": 1555, + "id": 1702, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1051:13:5", + "scope": 1707, + "src": "1051:13:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15948,10 +16221,10 @@ "typeString": "address" }, "typeName": { - "id": 1554, + "id": 1701, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1051:7:5", + "src": "1051:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15962,11 +16235,11 @@ }, { "constant": false, - "id": 1557, + "id": 1704, "name": "processBy", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1070:14:5", + "scope": 1707, + "src": "1070:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15974,10 +16247,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1556, + "id": 1703, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1070:4:5", + "src": "1070:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15988,11 +16261,11 @@ }, { "constant": false, - "id": 1559, + "id": 1706, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1560, - "src": "1090:10:5", + "scope": 1707, + "src": "1090:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16000,10 +16273,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1558, + "id": 1705, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1090:4:5", + "src": "1090:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16015,21 +16288,21 @@ ], "name": "ParamProposal", "nodeType": "StructDefinition", - "scope": 2490, - "src": "947:158:5", + "scope": 2653, + "src": "947:158:7", "visibility": "public" }, { "canonicalName": "Parameterizer.Challenge", - "id": 1575, + "id": 1722, "members": [ { "constant": false, - "id": 1562, + "id": 1709, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1132:15:5", + "scope": 1722, + "src": "1132:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16037,10 +16310,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1561, + "id": 1708, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1132:4:5", + "src": "1132:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16051,11 +16324,11 @@ }, { "constant": false, - "id": 1564, + "id": 1711, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1225:18:5", + "scope": 1722, + "src": "1225:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16063,10 +16336,10 @@ "typeString": "address" }, "typeName": { - "id": 1563, + "id": 1710, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1225:7:5", + "src": "1225:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16077,11 +16350,11 @@ }, { "constant": false, - "id": 1566, + "id": 1713, "name": "resolved", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1275:13:5", + "scope": 1722, + "src": "1275:13:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16089,10 +16362,10 @@ "typeString": "bool" }, "typeName": { - "id": 1565, + "id": 1712, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1275:4:5", + "src": "1275:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16103,11 +16376,11 @@ }, { "constant": false, - "id": 1568, + "id": 1715, "name": "stake", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1345:10:5", + "scope": 1722, + "src": "1345:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16115,10 +16388,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1567, + "id": 1714, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1345:4:5", + "src": "1345:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16129,11 +16402,11 @@ }, { "constant": false, - "id": 1570, + "id": 1717, "name": "winningTokens", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1435:18:5", + "scope": 1722, + "src": "1435:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16141,10 +16414,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1569, + "id": 1716, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1435:4:5", + "src": "1435:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16155,11 +16428,11 @@ }, { "constant": false, - "id": 1574, + "id": 1721, "name": "tokenClaims", "nodeType": "VariableDeclaration", - "scope": 1575, - "src": "1531:36:5", + "scope": 1722, + "src": "1531:36:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16167,28 +16440,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 1573, + "id": 1720, "keyType": { - "id": 1571, + "id": 1718, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1539:7:5", + "src": "1539:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1531:24:5", + "src": "1531:24:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 1572, + "id": 1719, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1550:4:5", + "src": "1550:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16201,17 +16474,17 @@ ], "name": "Challenge", "nodeType": "StructDefinition", - "scope": 2490, - "src": "1109:463:5", + "scope": 2653, + "src": "1109:463:7", "visibility": "public" }, { "constant": false, - "id": 1579, + "id": 1726, "name": "params", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1612:38:5", + "scope": 2653, + "src": "1612:38:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -16219,28 +16492,28 @@ "typeString": "mapping(bytes32 => uint256)" }, "typeName": { - "id": 1578, + "id": 1725, "keyType": { - "id": 1576, + "id": 1723, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1620:7:5", + "src": "1620:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1612:24:5", + "src": "1612:24:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" }, "valueType": { - "id": 1577, + "id": 1724, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1631:4:5", + "src": "1631:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16252,44 +16525,44 @@ }, { "constant": false, - "id": 1583, + "id": 1730, "name": "challenges", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1707:44:5", + "scope": 2653, + "src": "1707:44:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge)" }, "typeName": { - "id": 1582, + "id": 1729, "keyType": { - "id": 1580, + "id": 1727, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1715:4:5", + "src": "1715:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "1707:26:5", + "src": "1707:26:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge)" }, "valueType": { "contractScope": null, - "id": 1581, + "id": 1728, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "1723:9:5", + "referencedDeclaration": 1722, + "src": "1723:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } } @@ -16299,44 +16572,44 @@ }, { "constant": false, - "id": 1587, + "id": 1734, "name": "proposals", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1813:50:5", + "scope": 2653, + "src": "1813:50:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal)" }, "typeName": { - "id": 1586, + "id": 1733, "keyType": { - "id": 1584, + "id": 1731, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1821:7:5", + "src": "1821:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1813:33:5", + "src": "1813:33:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal)" }, "valueType": { "contractScope": null, - "id": 1585, + "id": 1732, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "1832:13:5", + "referencedDeclaration": 1707, + "src": "1832:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } } @@ -16346,26 +16619,26 @@ }, { "constant": false, - "id": 1589, + "id": 1736, "name": "token", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1890:18:5", + "scope": 2653, + "src": "1890:18:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 1588, + "id": 1735, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "1890:5:5", + "referencedDeclaration": 528, + "src": "1890:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -16374,26 +16647,26 @@ }, { "constant": false, - "id": 1591, + "id": 1738, "name": "voting", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1912:24:5", + "scope": 2653, + "src": "1912:24:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, "typeName": { "contractScope": null, - "id": 1590, + "id": 1737, "name": "PLCRVoting", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1471, - "src": "1912:10:5", + "referencedDeclaration": 1618, + "src": "1912:10:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -16402,11 +16675,11 @@ }, { "constant": false, - "id": 1594, + "id": 1741, "name": "PROCESSBY", "nodeType": "VariableDeclaration", - "scope": 2490, - "src": "1940:30:5", + "scope": 2653, + "src": "1940:30:7", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -16414,10 +16687,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1592, + "id": 1739, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1940:4:5", + "src": "1940:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16426,14 +16699,14 @@ "value": { "argumentTypes": null, "hexValue": "363034383030", - "id": 1593, + "id": 1740, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1964:6:5", + "src": "1964:6:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_604800_by_1", @@ -16445,28 +16718,28 @@ }, { "body": { - "id": 1697, + "id": 1844, "nodeType": "Block", - "src": "3592:581:5", + "src": "3592:581:7", "statements": [ { "expression": { "argumentTypes": null, - "id": 1629, + "id": 1776, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1625, + "id": 1772, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "3598:5:5", + "referencedDeclaration": 1736, + "src": "3598:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -16477,12 +16750,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1627, + "id": 1774, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1596, - "src": "3612:10:5", + "referencedDeclaration": 1743, + "src": "3612:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16496,18 +16769,18 @@ "typeString": "address" } ], - "id": 1626, + "id": 1773, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "3606:5:5", + "referencedDeclaration": 528, + "src": "3606:5:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 1628, + "id": 1775, "isConstant": false, "isLValue": false, "isPure": false, @@ -16515,40 +16788,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3606:17:5", + "src": "3606:17:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "3598:25:5", + "src": "3598:25:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1630, + "id": 1777, "nodeType": "ExpressionStatement", - "src": "3598:25:5" + "src": "3598:25:7" }, { "expression": { "argumentTypes": null, - "id": 1635, + "id": 1782, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1631, + "id": 1778, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "3629:6:5", + "referencedDeclaration": 1738, + "src": "3629:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -16559,12 +16832,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1633, + "id": 1780, "name": "_plcrAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1598, - "src": "3649:9:5", + "referencedDeclaration": 1745, + "src": "3649:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16578,18 +16851,18 @@ "typeString": "address" } ], - "id": 1632, + "id": 1779, "name": "PLCRVoting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1471, - "src": "3638:10:5", + "referencedDeclaration": 1618, + "src": "3638:10:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1471_$", + "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1618_$", "typeString": "type(contract PLCRVoting)" } }, - "id": 1634, + "id": 1781, "isConstant": false, "isLValue": false, "isPure": false, @@ -16597,21 +16870,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3638:21:5", + "src": "3638:21:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "src": "3629:30:5", + "src": "3629:30:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1636, + "id": 1783, "nodeType": "ExpressionStatement", - "src": "3629:30:5" + "src": "3629:30:7" }, { "expression": { @@ -16620,14 +16893,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 1638, + "id": 1785, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3670:12:5", + "src": "3670:12:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -16637,12 +16910,12 @@ }, { "argumentTypes": null, - "id": 1639, + "id": 1786, "name": "_minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1600, - "src": "3684:11:5", + "referencedDeclaration": 1747, + "src": "3684:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16660,18 +16933,18 @@ "typeString": "uint256" } ], - "id": 1637, + "id": 1784, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3666:3:5", + "referencedDeclaration": 2652, + "src": "3666:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1640, + "id": 1787, "isConstant": false, "isLValue": false, "isPure": false, @@ -16679,15 +16952,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3666:30:5", + "src": "3666:30:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1641, + "id": 1788, "nodeType": "ExpressionStatement", - "src": "3666:30:5" + "src": "3666:30:7" }, { "expression": { @@ -16696,14 +16969,14 @@ { "argumentTypes": null, "hexValue": "704d696e4465706f736974", - "id": 1643, + "id": 1790, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3706:13:5", + "src": "3706:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_79b35b6e30f7c782e133dcfa06a825d420ec880f4036bf04dd005fe368978200", @@ -16713,12 +16986,12 @@ }, { "argumentTypes": null, - "id": 1644, + "id": 1791, "name": "_pMinDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1602, - "src": "3721:12:5", + "referencedDeclaration": 1749, + "src": "3721:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16736,18 +17009,18 @@ "typeString": "uint256" } ], - "id": 1642, + "id": 1789, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3702:3:5", + "referencedDeclaration": 2652, + "src": "3702:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1645, + "id": 1792, "isConstant": false, "isLValue": false, "isPure": false, @@ -16755,15 +17028,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3702:32:5", + "src": "3702:32:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1646, + "id": 1793, "nodeType": "ExpressionStatement", - "src": "3702:32:5" + "src": "3702:32:7" }, { "expression": { @@ -16772,14 +17045,14 @@ { "argumentTypes": null, "hexValue": "6170706c7953746167654c656e", - "id": 1648, + "id": 1795, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3744:15:5", + "src": "3744:15:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8c03b11eba3b2d069479ae0d3837927171e72e193c0acb726bbd53bdd5902da", @@ -16789,12 +17062,12 @@ }, { "argumentTypes": null, - "id": 1649, + "id": 1796, "name": "_applyStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1604, - "src": "3761:14:5", + "referencedDeclaration": 1751, + "src": "3761:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16812,18 +17085,18 @@ "typeString": "uint256" } ], - "id": 1647, + "id": 1794, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3740:3:5", + "referencedDeclaration": 2652, + "src": "3740:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1650, + "id": 1797, "isConstant": false, "isLValue": false, "isPure": false, @@ -16831,15 +17104,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3740:36:5", + "src": "3740:36:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1651, + "id": 1798, "nodeType": "ExpressionStatement", - "src": "3740:36:5" + "src": "3740:36:7" }, { "expression": { @@ -16848,14 +17121,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1653, + "id": 1800, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3786:16:5", + "src": "3786:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -16865,12 +17138,12 @@ }, { "argumentTypes": null, - "id": 1654, + "id": 1801, "name": "_pApplyStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1606, - "src": "3804:15:5", + "referencedDeclaration": 1753, + "src": "3804:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16888,18 +17161,18 @@ "typeString": "uint256" } ], - "id": 1652, + "id": 1799, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3782:3:5", + "referencedDeclaration": 2652, + "src": "3782:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1655, + "id": 1802, "isConstant": false, "isLValue": false, "isPure": false, @@ -16907,15 +17180,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3782:38:5", + "src": "3782:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1656, + "id": 1803, "nodeType": "ExpressionStatement", - "src": "3782:38:5" + "src": "3782:38:7" }, { "expression": { @@ -16924,14 +17197,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697453746167654c656e", - "id": 1658, + "id": 1805, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3830:16:5", + "src": "3830:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22aa10f6207ed6245b2e23bddfcdfa1a542b375f7cf45082a1a75b9304a6150d", @@ -16941,12 +17214,12 @@ }, { "argumentTypes": null, - "id": 1659, + "id": 1806, "name": "_commitStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1608, - "src": "3848:15:5", + "referencedDeclaration": 1755, + "src": "3848:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16964,18 +17237,18 @@ "typeString": "uint256" } ], - "id": 1657, + "id": 1804, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3826:3:5", + "referencedDeclaration": 2652, + "src": "3826:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1660, + "id": 1807, "isConstant": false, "isLValue": false, "isPure": false, @@ -16983,15 +17256,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3826:38:5", + "src": "3826:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1661, + "id": 1808, "nodeType": "ExpressionStatement", - "src": "3826:38:5" + "src": "3826:38:7" }, { "expression": { @@ -17000,14 +17273,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1663, + "id": 1810, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3874:17:5", + "src": "3874:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -17017,12 +17290,12 @@ }, { "argumentTypes": null, - "id": 1664, + "id": 1811, "name": "_pCommitStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1610, - "src": "3893:16:5", + "referencedDeclaration": 1757, + "src": "3893:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17040,18 +17313,18 @@ "typeString": "uint256" } ], - "id": 1662, + "id": 1809, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3870:3:5", + "referencedDeclaration": 2652, + "src": "3870:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1665, + "id": 1812, "isConstant": false, "isLValue": false, "isPure": false, @@ -17059,15 +17332,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3870:40:5", + "src": "3870:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1666, + "id": 1813, "nodeType": "ExpressionStatement", - "src": "3870:40:5" + "src": "3870:40:7" }, { "expression": { @@ -17076,14 +17349,14 @@ { "argumentTypes": null, "hexValue": "72657665616c53746167654c656e", - "id": 1668, + "id": 1815, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3920:16:5", + "src": "3920:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8858300ed02b4242350c6412c69b3951ae8f1d10eb49beafb9ecebaba7a0af1", @@ -17093,12 +17366,12 @@ }, { "argumentTypes": null, - "id": 1669, + "id": 1816, "name": "_revealStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1612, - "src": "3938:15:5", + "referencedDeclaration": 1759, + "src": "3938:15:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17116,18 +17389,18 @@ "typeString": "uint256" } ], - "id": 1667, + "id": 1814, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3916:3:5", + "referencedDeclaration": 2652, + "src": "3916:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1670, + "id": 1817, "isConstant": false, "isLValue": false, "isPure": false, @@ -17135,15 +17408,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3916:38:5", + "src": "3916:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1671, + "id": 1818, "nodeType": "ExpressionStatement", - "src": "3916:38:5" + "src": "3916:38:7" }, { "expression": { @@ -17152,14 +17425,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1673, + "id": 1820, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3964:17:5", + "src": "3964:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -17169,12 +17442,12 @@ }, { "argumentTypes": null, - "id": 1674, + "id": 1821, "name": "_pRevealStageLen", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1614, - "src": "3983:16:5", + "referencedDeclaration": 1761, + "src": "3983:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17192,18 +17465,18 @@ "typeString": "uint256" } ], - "id": 1672, + "id": 1819, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "3960:3:5", + "referencedDeclaration": 2652, + "src": "3960:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1675, + "id": 1822, "isConstant": false, "isLValue": false, "isPure": false, @@ -17211,15 +17484,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3960:40:5", + "src": "3960:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1676, + "id": 1823, "nodeType": "ExpressionStatement", - "src": "3960:40:5" + "src": "3960:40:7" }, { "expression": { @@ -17228,14 +17501,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 1678, + "id": 1825, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4010:17:5", + "src": "4010:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -17245,12 +17518,12 @@ }, { "argumentTypes": null, - "id": 1679, + "id": 1826, "name": "_dispensationPct", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1616, - "src": "4029:16:5", + "referencedDeclaration": 1763, + "src": "4029:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17268,18 +17541,18 @@ "typeString": "uint256" } ], - "id": 1677, + "id": 1824, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4006:3:5", + "referencedDeclaration": 2652, + "src": "4006:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1680, + "id": 1827, "isConstant": false, "isLValue": false, "isPure": false, @@ -17287,15 +17560,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4006:40:5", + "src": "4006:40:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1681, + "id": 1828, "nodeType": "ExpressionStatement", - "src": "4006:40:5" + "src": "4006:40:7" }, { "expression": { @@ -17304,14 +17577,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1683, + "id": 1830, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4056:18:5", + "src": "4056:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -17321,12 +17594,12 @@ }, { "argumentTypes": null, - "id": 1684, + "id": 1831, "name": "_pDispensationPct", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1618, - "src": "4076:17:5", + "referencedDeclaration": 1765, + "src": "4076:17:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17344,18 +17617,18 @@ "typeString": "uint256" } ], - "id": 1682, + "id": 1829, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4052:3:5", + "referencedDeclaration": 2652, + "src": "4052:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1685, + "id": 1832, "isConstant": false, "isLValue": false, "isPure": false, @@ -17363,15 +17636,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4052:42:5", + "src": "4052:42:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1686, + "id": 1833, "nodeType": "ExpressionStatement", - "src": "4052:42:5" + "src": "4052:42:7" }, { "expression": { @@ -17380,14 +17653,14 @@ { "argumentTypes": null, "hexValue": "766f746551756f72756d", - "id": 1688, + "id": 1835, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4104:12:5", + "src": "4104:12:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9b01c2212638b995654bf3d584befbb3576184e03cd1a9ae5693a18a1f559878", @@ -17397,12 +17670,12 @@ }, { "argumentTypes": null, - "id": 1689, + "id": 1836, "name": "_voteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1620, - "src": "4118:11:5", + "referencedDeclaration": 1767, + "src": "4118:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17420,18 +17693,18 @@ "typeString": "uint256" } ], - "id": 1687, + "id": 1834, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4100:3:5", + "referencedDeclaration": 2652, + "src": "4100:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1690, + "id": 1837, "isConstant": false, "isLValue": false, "isPure": false, @@ -17439,15 +17712,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4100:30:5", + "src": "4100:30:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1691, + "id": 1838, "nodeType": "ExpressionStatement", - "src": "4100:30:5" + "src": "4100:30:7" }, { "expression": { @@ -17456,14 +17729,14 @@ { "argumentTypes": null, "hexValue": "70566f746551756f72756d", - "id": 1693, + "id": 1840, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4140:13:5", + "src": "4140:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1cd8ca3a1baaf24ca4431f7b59b78854d08ce96815f9b5677de2c92385fb9138", @@ -17473,12 +17746,12 @@ }, { "argumentTypes": null, - "id": 1694, + "id": 1841, "name": "_pVoteQuorum", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1622, - "src": "4155:12:5", + "referencedDeclaration": 1769, + "src": "4155:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17496,18 +17769,18 @@ "typeString": "uint256" } ], - "id": 1692, + "id": 1839, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "4136:3:5", + "referencedDeclaration": 2652, + "src": "4136:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1695, + "id": 1842, "isConstant": false, "isLValue": false, "isPure": false, @@ -17515,20 +17788,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4136:32:5", + "src": "4136:32:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1696, + "id": 1843, "nodeType": "ExpressionStatement", - "src": "4136:32:5" + "src": "4136:32:7" } ] }, "documentation": "@dev constructor\n@param _tokenAddr address of the token which parameterizes this system\n@param _plcrAddr address of a PLCR voting contract for the provided token\n@param _minDeposit minimum deposit for listing to be whitelisted\n@param _pMinDeposit minimum deposit to propose a reparameterization\n@param _applyStageLen period over which applicants wait to be whitelisted\n@param _pApplyStageLen period over which reparmeterization proposals wait to be processed\n@param _dispensationPct percentage of losing party's deposit distributed to winning party\n@param _pDispensationPct percentage of losing party's deposit distributed to winning party in parameterizer\n@param _commitStageLen length of commit period for voting\n@param _pCommitStageLen length of commit period for voting in parameterizer\n@param _revealStageLen length of reveal period for voting\n@param _pRevealStageLen length of reveal period for voting in parameterizer\n@param _voteQuorum type of majority out of 100 necessary for vote success\n@param _pVoteQuorum type of majority out of 100 necessary for vote success in parameterizer", - "id": 1698, + "id": 1845, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -17536,16 +17809,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1623, + "id": 1770, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1596, + "id": 1743, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3233:18:5", + "scope": 1845, + "src": "3233:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17553,10 +17826,10 @@ "typeString": "address" }, "typeName": { - "id": 1595, + "id": 1742, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3233:7:5", + "src": "3233:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17567,11 +17840,11 @@ }, { "constant": false, - "id": 1598, + "id": 1745, "name": "_plcrAddr", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3257:17:5", + "scope": 1845, + "src": "3257:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17579,10 +17852,10 @@ "typeString": "address" }, "typeName": { - "id": 1597, + "id": 1744, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3257:7:5", + "src": "3257:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17593,11 +17866,11 @@ }, { "constant": false, - "id": 1600, + "id": 1747, "name": "_minDeposit", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3280:16:5", + "scope": 1845, + "src": "3280:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17605,10 +17878,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1599, + "id": 1746, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3280:4:5", + "src": "3280:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17619,11 +17892,11 @@ }, { "constant": false, - "id": 1602, + "id": 1749, "name": "_pMinDeposit", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3302:17:5", + "scope": 1845, + "src": "3302:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17631,10 +17904,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1601, + "id": 1748, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3302:4:5", + "src": "3302:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17645,11 +17918,11 @@ }, { "constant": false, - "id": 1604, + "id": 1751, "name": "_applyStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3325:19:5", + "scope": 1845, + "src": "3325:19:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17657,10 +17930,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1603, + "id": 1750, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3325:4:5", + "src": "3325:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17671,11 +17944,11 @@ }, { "constant": false, - "id": 1606, + "id": 1753, "name": "_pApplyStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3350:20:5", + "scope": 1845, + "src": "3350:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17683,10 +17956,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1605, + "id": 1752, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3350:4:5", + "src": "3350:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17697,11 +17970,11 @@ }, { "constant": false, - "id": 1608, + "id": 1755, "name": "_commitStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3376:20:5", + "scope": 1845, + "src": "3376:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17709,10 +17982,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1607, + "id": 1754, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3376:4:5", + "src": "3376:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17723,11 +17996,11 @@ }, { "constant": false, - "id": 1610, + "id": 1757, "name": "_pCommitStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3402:21:5", + "scope": 1845, + "src": "3402:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17735,10 +18008,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1609, + "id": 1756, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3402:4:5", + "src": "3402:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17749,11 +18022,11 @@ }, { "constant": false, - "id": 1612, + "id": 1759, "name": "_revealStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3429:20:5", + "scope": 1845, + "src": "3429:20:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17761,10 +18034,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1611, + "id": 1758, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3429:4:5", + "src": "3429:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17775,11 +18048,11 @@ }, { "constant": false, - "id": 1614, + "id": 1761, "name": "_pRevealStageLen", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3455:21:5", + "scope": 1845, + "src": "3455:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17787,10 +18060,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1613, + "id": 1760, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3455:4:5", + "src": "3455:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17801,11 +18074,11 @@ }, { "constant": false, - "id": 1616, + "id": 1763, "name": "_dispensationPct", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3482:21:5", + "scope": 1845, + "src": "3482:21:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17813,10 +18086,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1615, + "id": 1762, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3482:4:5", + "src": "3482:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17827,11 +18100,11 @@ }, { "constant": false, - "id": 1618, + "id": 1765, "name": "_pDispensationPct", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3509:22:5", + "scope": 1845, + "src": "3509:22:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17839,10 +18112,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1617, + "id": 1764, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3509:4:5", + "src": "3509:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17853,11 +18126,11 @@ }, { "constant": false, - "id": 1620, + "id": 1767, "name": "_voteQuorum", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3537:16:5", + "scope": 1845, + "src": "3537:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17865,10 +18138,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1619, + "id": 1766, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3537:4:5", + "src": "3537:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17879,11 +18152,11 @@ }, { "constant": false, - "id": 1622, + "id": 1769, "name": "_pVoteQuorum", "nodeType": "VariableDeclaration", - "scope": 1698, - "src": "3559:17:5", + "scope": 1845, + "src": "3559:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17891,10 +18164,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1621, + "id": 1768, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3559:4:5", + "src": "3559:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17904,39 +18177,39 @@ "visibility": "internal" } ], - "src": "3227:355:5" + "src": "3227:355:7" }, "payable": false, "returnParameters": { - "id": 1624, + "id": 1771, "nodeType": "ParameterList", "parameters": [], - "src": "3592:0:5" + "src": "3592:0:7" }, - "scope": 2490, - "src": "3216:957:5", + "scope": 2653, + "src": "3216:957:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1836, + "id": 1983, "nodeType": "Block", - "src": "4555:1133:5", + "src": "4555:1133:7", "statements": [ { "assignments": [ - 1708 + 1855 ], "declarations": [ { "constant": false, - "id": 1708, + "id": 1855, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4561:12:5", + "scope": 1984, + "src": "4561:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17944,10 +18217,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1707, + "id": 1854, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4561:4:5", + "src": "4561:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17957,21 +18230,21 @@ "visibility": "internal" } ], - "id": 1712, + "id": 1859, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "704d696e4465706f736974", - "id": 1710, + "id": 1857, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4580:13:5", + "src": "4580:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_79b35b6e30f7c782e133dcfa06a825d420ec880f4036bf04dd005fe368978200", @@ -17987,18 +18260,18 @@ "typeString": "literal_string \"pMinDeposit\"" } ], - "id": 1709, + "id": 1856, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "4576:3:5", + "referencedDeclaration": 2512, + "src": "4576:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1711, + "id": 1858, "isConstant": false, "isLValue": false, "isPure": false, @@ -18006,27 +18279,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4576:18:5", + "src": "4576:18:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "4561:33:5" + "src": "4561:33:7" }, { "assignments": [ - 1714 + 1861 ], "declarations": [ { "constant": false, - "id": 1714, + "id": 1861, "name": "propID", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4600:14:5", + "scope": 1984, + "src": "4600:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18034,10 +18307,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1713, + "id": 1860, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4600:7:5", + "src": "4600:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18047,7 +18320,7 @@ "visibility": "internal" } ], - "id": 1722, + "id": 1869, "initialValue": { "argumentTypes": null, "arguments": [ @@ -18056,12 +18329,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1718, + "id": 1865, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4644:5:5", + "referencedDeclaration": 1847, + "src": "4644:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -18069,12 +18342,12 @@ }, { "argumentTypes": null, - "id": 1719, + "id": 1866, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4651:6:5", + "referencedDeclaration": 1849, + "src": "4651:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18094,18 +18367,18 @@ ], "expression": { "argumentTypes": null, - "id": 1716, + "id": 1863, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4627:3:5", + "referencedDeclaration": 4140, + "src": "4627:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1717, + "id": 1864, "isConstant": false, "isLValue": false, "isPure": true, @@ -18113,13 +18386,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4627:16:5", + "src": "4627:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1720, + "id": 1867, "isConstant": false, "isLValue": false, "isPure": false, @@ -18127,7 +18400,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4627:31:5", + "src": "4627:31:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -18141,18 +18414,18 @@ "typeString": "bytes memory" } ], - "id": 1715, + "id": 1862, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4617:9:5", + "referencedDeclaration": 4147, + "src": "4617:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1721, + "id": 1868, "isConstant": false, "isLValue": false, "isPure": false, @@ -18160,14 +18433,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4617:42:5", + "src": "4617:42:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "4600:59:5" + "src": "4600:59:7" }, { "condition": { @@ -18176,7 +18449,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1749, + "id": 1896, "isConstant": false, "isLValue": false, "isPure": false, @@ -18187,7 +18460,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1735, + "id": 1882, "isConstant": false, "isLValue": false, "isPure": false, @@ -18200,12 +18473,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1726, + "id": 1873, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4697:5:5", + "referencedDeclaration": 1847, + "src": "4697:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -18221,18 +18494,18 @@ ], "expression": { "argumentTypes": null, - "id": 1724, + "id": 1871, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4680:3:5", + "referencedDeclaration": 4140, + "src": "4680:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1725, + "id": 1872, "isConstant": false, "isLValue": false, "isPure": true, @@ -18240,13 +18513,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4680:16:5", + "src": "4680:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1727, + "id": 1874, "isConstant": false, "isLValue": false, "isPure": false, @@ -18254,7 +18527,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4680:23:5", + "src": "4680:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -18268,18 +18541,18 @@ "typeString": "bytes memory" } ], - "id": 1723, + "id": 1870, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4670:9:5", + "referencedDeclaration": 4147, + "src": "4670:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1728, + "id": 1875, "isConstant": false, "isLValue": false, "isPure": false, @@ -18287,7 +18560,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4670:34:5", + "src": "4670:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18304,14 +18577,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 1732, + "id": 1879, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4735:17:5", + "src": "4735:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -18329,18 +18602,18 @@ ], "expression": { "argumentTypes": null, - "id": 1730, + "id": 1877, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4718:3:5", + "referencedDeclaration": 4140, + "src": "4718:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1731, + "id": 1878, "isConstant": false, "isLValue": false, "isPure": true, @@ -18348,13 +18621,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4718:16:5", + "src": "4718:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1733, + "id": 1880, "isConstant": false, "isLValue": false, "isPure": true, @@ -18362,7 +18635,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4718:35:5", + "src": "4718:35:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -18376,18 +18649,18 @@ "typeString": "bytes memory" } ], - "id": 1729, + "id": 1876, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4708:9:5", + "referencedDeclaration": 4147, + "src": "4708:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1734, + "id": 1881, "isConstant": false, "isLValue": false, "isPure": true, @@ -18395,13 +18668,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4708:46:5", + "src": "4708:46:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "4670:84:5", + "src": "4670:84:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18415,7 +18688,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1748, + "id": 1895, "isConstant": false, "isLValue": false, "isPure": false, @@ -18428,12 +18701,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1739, + "id": 1886, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4792:5:5", + "referencedDeclaration": 1847, + "src": "4792:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -18449,18 +18722,18 @@ ], "expression": { "argumentTypes": null, - "id": 1737, + "id": 1884, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4775:3:5", + "referencedDeclaration": 4140, + "src": "4775:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1738, + "id": 1885, "isConstant": false, "isLValue": false, "isPure": true, @@ -18468,13 +18741,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4775:16:5", + "src": "4775:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1740, + "id": 1887, "isConstant": false, "isLValue": false, "isPure": false, @@ -18482,7 +18755,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4775:23:5", + "src": "4775:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -18496,18 +18769,18 @@ "typeString": "bytes memory" } ], - "id": 1736, + "id": 1883, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4765:9:5", + "referencedDeclaration": 4147, + "src": "4765:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1741, + "id": 1888, "isConstant": false, "isLValue": false, "isPure": false, @@ -18515,7 +18788,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4765:34:5", + "src": "4765:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18532,14 +18805,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1745, + "id": 1892, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4830:18:5", + "src": "4830:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -18557,18 +18830,18 @@ ], "expression": { "argumentTypes": null, - "id": 1743, + "id": 1890, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "4813:3:5", + "referencedDeclaration": 4140, + "src": "4813:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 1744, + "id": 1891, "isConstant": false, "isLValue": false, "isPure": true, @@ -18576,13 +18849,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4813:16:5", + "src": "4813:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 1746, + "id": 1893, "isConstant": false, "isLValue": false, "isPure": true, @@ -18590,7 +18863,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4813:36:5", + "src": "4813:36:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -18604,18 +18877,18 @@ "typeString": "bytes memory" } ], - "id": 1742, + "id": 1889, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "4803:9:5", + "referencedDeclaration": 4147, + "src": "4803:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 1747, + "id": 1894, "isConstant": false, "isLValue": false, "isPure": true, @@ -18623,32 +18896,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4803:47:5", + "src": "4803:47:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "4765:85:5", + "src": "4765:85:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "4670:180:5", + "src": "4670:180:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1757, + "id": 1904, "nodeType": "IfStatement", - "src": "4666:223:5", + "src": "4666:223:7", "trueBody": { - "id": 1756, + "id": 1903, "nodeType": "Block", - "src": "4852:37:5", + "src": "4852:37:7", "statements": [ { "expression": { @@ -18660,19 +18933,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1753, + "id": 1900, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1751, + "id": 1898, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4868:6:5", + "referencedDeclaration": 1849, + "src": "4868:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18683,14 +18956,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 1752, + "id": 1899, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4878:3:5", + "src": "4878:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -18698,7 +18971,7 @@ }, "value": "100" }, - "src": "4868:13:5", + "src": "4868:13:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18712,21 +18985,21 @@ "typeString": "bool" } ], - "id": 1750, + "id": 1897, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4860:7:5", + "referencedDeclaration": 4156, + "src": "4860:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1754, + "id": 1901, "isConstant": false, "isLValue": false, "isPure": false, @@ -18734,15 +19007,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4860:22:5", + "src": "4860:22:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1755, + "id": 1902, "nodeType": "ExpressionStatement", - "src": "4860:22:5" + "src": "4860:22:7" } ] } @@ -18753,7 +19026,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1762, + "id": 1909, "isConstant": false, "isLValue": false, "isPure": false, @@ -18761,18 +19034,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "4903:19:5", + "src": "4903:19:7", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1760, + "id": 1907, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "4915:6:5", + "referencedDeclaration": 1861, + "src": "4915:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18786,18 +19059,18 @@ "typeString": "bytes32" } ], - "id": 1759, + "id": 1906, "name": "propExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2258, - "src": "4904:10:5", + "referencedDeclaration": 2418, + "src": "4904:10:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1761, + "id": 1908, "isConstant": false, "isLValue": false, "isPure": false, @@ -18805,7 +19078,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4904:18:5", + "src": "4904:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18824,21 +19097,21 @@ "typeString": "bool" } ], - "id": 1758, + "id": 1905, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4895:7:5", + "referencedDeclaration": 4156, + "src": "4895:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1763, + "id": 1910, "isConstant": false, "isLValue": false, "isPure": false, @@ -18846,15 +19119,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4895:28:5", + "src": "4895:28:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1764, + "id": 1911, "nodeType": "ExpressionStatement", - "src": "4895:28:5" + "src": "4895:28:7" }, { "expression": { @@ -18866,7 +19139,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1770, + "id": 1917, "isConstant": false, "isLValue": false, "isPure": false, @@ -18876,12 +19149,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1767, + "id": 1914, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "4971:5:5", + "referencedDeclaration": 1847, + "src": "4971:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -18895,18 +19168,18 @@ "typeString": "string memory" } ], - "id": 1766, + "id": 1913, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "4967:3:5", + "referencedDeclaration": 2512, + "src": "4967:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1768, + "id": 1915, "isConstant": false, "isLValue": false, "isPure": false, @@ -18914,7 +19187,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4967:10:5", + "src": "4967:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18924,18 +19197,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 1769, + "id": 1916, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "4981:6:5", + "referencedDeclaration": 1849, + "src": "4981:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4967:20:5", + "src": "4967:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18949,21 +19222,21 @@ "typeString": "bool" } ], - "id": 1765, + "id": 1912, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4959:7:5", + "referencedDeclaration": 4156, + "src": "4959:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1771, + "id": 1918, "isConstant": false, "isLValue": false, "isPure": false, @@ -18971,20 +19244,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4959:29:5", + "src": "4959:29:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1772, + "id": 1919, "nodeType": "ExpressionStatement", - "src": "4959:29:5" + "src": "4959:29:7" }, { "expression": { "argumentTypes": null, - "id": 1809, + "id": 1956, "isConstant": false, "isLValue": false, "isPure": false, @@ -18993,26 +19266,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1773, + "id": 1920, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5069:9:5", + "referencedDeclaration": 1734, + "src": "5069:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1775, + "id": 1922, "indexExpression": { "argumentTypes": null, - "id": 1774, + "id": 1921, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5079:6:5", + "referencedDeclaration": 1861, + "src": "5079:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19023,9 +19296,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5069:17:5", + "src": "5069:17:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -19043,14 +19316,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1780, + "id": 1927, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5134:16:5", + "src": "5134:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -19066,18 +19339,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 1779, + "id": 1926, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5130:3:5", + "referencedDeclaration": 2512, + "src": "5130:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1781, + "id": 1928, "isConstant": false, "isLValue": false, "isPure": false, @@ -19085,7 +19358,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5130:21:5", + "src": "5130:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19101,32 +19374,32 @@ ], "expression": { "argumentTypes": null, - "id": 1777, + "id": 1924, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "5122:3:5", + "referencedDeclaration": 4155, + "src": "5122:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1778, + "id": 1925, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5122:7:5", + "referencedDeclaration": 3890, + "src": "5122:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1782, + "id": 1929, "isConstant": false, "isLValue": false, "isPure": false, @@ -19134,7 +19407,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5122:30:5", + "src": "5122:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19143,14 +19416,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1783, + "id": 1930, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5173:1:5", + "src": "5173:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -19160,12 +19433,12 @@ }, { "argumentTypes": null, - "id": 1784, + "id": 1931, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5191:7:5", + "referencedDeclaration": 1855, + "src": "5191:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19173,12 +19446,12 @@ }, { "argumentTypes": null, - "id": 1785, + "id": 1932, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "5212:5:5", + "referencedDeclaration": 1847, + "src": "5212:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -19188,18 +19461,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1786, + "id": 1933, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5232:3:5", + "referencedDeclaration": 4153, + "src": "5232:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1787, + "id": 1934, "isConstant": false, "isLValue": false, "isPure": false, @@ -19207,7 +19480,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5232:10:5", + "src": "5232:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19218,12 +19491,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1805, + "id": 1952, "name": "PROCESSBY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1594, - "src": "5379:9:5", + "referencedDeclaration": 1741, + "src": "5379:9:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19246,14 +19519,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1801, + "id": 1948, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5346:17:5", + "src": "5346:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -19269,18 +19542,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 1800, + "id": 1947, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5342:3:5", + "referencedDeclaration": 2512, + "src": "5342:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1802, + "id": 1949, "isConstant": false, "isLValue": false, "isPure": false, @@ -19288,7 +19561,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5342:22:5", + "src": "5342:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19311,14 +19584,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1796, + "id": 1943, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5309:17:5", + "src": "5309:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -19334,18 +19607,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 1795, + "id": 1942, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5305:3:5", + "referencedDeclaration": 2512, + "src": "5305:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1797, + "id": 1944, "isConstant": false, "isLValue": false, "isPure": false, @@ -19353,7 +19626,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5305:22:5", + "src": "5305:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19376,14 +19649,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 1791, + "id": 1938, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5273:16:5", + "src": "5273:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -19399,18 +19672,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 1790, + "id": 1937, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "5269:3:5", + "referencedDeclaration": 2512, + "src": "5269:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1792, + "id": 1939, "isConstant": false, "isLValue": false, "isPure": false, @@ -19418,7 +19691,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5269:21:5", + "src": "5269:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19434,32 +19707,32 @@ ], "expression": { "argumentTypes": null, - "id": 1788, + "id": 1935, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "5261:3:5", + "referencedDeclaration": 4155, + "src": "5261:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1789, + "id": 1936, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:7:5", + "referencedDeclaration": 3890, + "src": "5261:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1793, + "id": 1940, "isConstant": false, "isLValue": false, "isPure": false, @@ -19467,27 +19740,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:30:5", + "src": "5261:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1794, + "id": 1941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:43:5", + "referencedDeclaration": 3890, + "src": "5261:43:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1798, + "id": 1945, "isConstant": false, "isLValue": false, "isPure": false, @@ -19495,27 +19768,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:67:5", + "src": "5261:67:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1799, + "id": 1946, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:80:5", + "referencedDeclaration": 3890, + "src": "5261:80:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1803, + "id": 1950, "isConstant": false, "isLValue": false, "isPure": false, @@ -19523,27 +19796,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:104:5", + "src": "5261:104:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1804, + "id": 1951, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "5261:117:5", + "referencedDeclaration": 3890, + "src": "5261:117:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1806, + "id": 1953, "isConstant": false, "isLValue": false, "isPure": false, @@ -19551,7 +19824,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5261:128:5", + "src": "5261:128:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19559,12 +19832,12 @@ }, { "argumentTypes": null, - "id": 1807, + "id": 1954, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "5404:6:5", + "referencedDeclaration": 1849, + "src": "5404:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19573,18 +19846,18 @@ ], "expression": { "argumentTypes": null, - "id": 1776, + "id": 1923, "name": "ParamProposal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1560, - "src": "5089:13:5", + "referencedDeclaration": 1707, + "src": "5089:13:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ParamProposal_$1560_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ParamProposal_$1707_storage_ptr_$", "typeString": "type(struct Parameterizer.ParamProposal storage pointer)" } }, - "id": 1808, + "id": 1955, "isConstant": false, "isLValue": false, "isPure": false, @@ -19600,21 +19873,21 @@ "value" ], "nodeType": "FunctionCall", - "src": "5089:328:5", + "src": "5089:328:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "src": "5069:348:5", + "src": "5069:348:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1810, + "id": 1957, "nodeType": "ExpressionStatement", - "src": "5069:348:5" + "src": "5069:348:7" }, { "expression": { @@ -19627,18 +19900,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1814, + "id": 1961, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5451:3:5", + "referencedDeclaration": 4153, + "src": "5451:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1815, + "id": 1962, "isConstant": false, "isLValue": false, "isPure": false, @@ -19646,7 +19919,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5451:10:5", + "src": "5451:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19654,25 +19927,25 @@ }, { "argumentTypes": null, - "id": 1816, + "id": 1963, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3727, - "src": "5463:4:5", + "referencedDeclaration": 4184, + "src": "5463:4:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, { "argumentTypes": null, - "id": 1817, + "id": 1964, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5469:7:5", + "referencedDeclaration": 1855, + "src": "5469:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19686,7 +19959,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, { @@ -19696,32 +19969,32 @@ ], "expression": { "argumentTypes": null, - "id": 1812, + "id": 1959, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "5432:5:5", + "referencedDeclaration": 1736, + "src": "5432:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1813, + "id": 1960, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "5432:18:5", + "referencedDeclaration": 510, + "src": "5432:18:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 1818, + "id": 1965, "isConstant": false, "isLValue": false, "isPure": false, @@ -19729,7 +20002,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5432:45:5", + "src": "5432:45:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19743,21 +20016,21 @@ "typeString": "bool" } ], - "id": 1811, + "id": 1958, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5424:7:5", + "referencedDeclaration": 4156, + "src": "5424:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1819, + "id": 1966, "isConstant": false, "isLValue": false, "isPure": false, @@ -19765,15 +20038,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5424:54:5", + "src": "5424:54:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1820, + "id": 1967, "nodeType": "ExpressionStatement", - "src": "5424:54:5" + "src": "5424:54:7" }, { "eventCall": { @@ -19781,12 +20054,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1822, + "id": 1969, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1700, - "src": "5556:5:5", + "referencedDeclaration": 1847, + "src": "5556:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -19794,12 +20067,12 @@ }, { "argumentTypes": null, - "id": 1823, + "id": 1970, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1702, - "src": "5569:6:5", + "referencedDeclaration": 1849, + "src": "5569:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19807,12 +20080,12 @@ }, { "argumentTypes": null, - "id": 1824, + "id": 1971, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5583:6:5", + "referencedDeclaration": 1861, + "src": "5583:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19820,12 +20093,12 @@ }, { "argumentTypes": null, - "id": 1825, + "id": 1972, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1708, - "src": "5597:7:5", + "referencedDeclaration": 1855, + "src": "5597:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19837,26 +20110,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1826, + "id": 1973, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5612:9:5", + "referencedDeclaration": 1734, + "src": "5612:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1828, + "id": 1975, "indexExpression": { "argumentTypes": null, - "id": 1827, + "id": 1974, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5622:6:5", + "referencedDeclaration": 1861, + "src": "5622:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19867,21 +20140,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5612:17:5", + "src": "5612:17:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1829, + "id": 1976, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "appExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 1547, - "src": "5612:27:5", + "referencedDeclaration": 1694, + "src": "5612:27:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19891,18 +20164,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1830, + "id": 1977, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5647:3:5", + "referencedDeclaration": 4153, + "src": "5647:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1831, + "id": 1978, "isConstant": false, "isLValue": false, "isPure": false, @@ -19910,7 +20183,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5647:10:5", + "src": "5647:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19944,18 +20217,18 @@ "typeString": "address" } ], - "id": 1821, + "id": 1968, "name": "_ReparameterizationProposal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1490, - "src": "5521:27:5", + "referencedDeclaration": 1637, + "src": "5521:27:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_string_memory_ptr_$_t_uint256_$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (string memory,uint256,bytes32,uint256,uint256,address)" } }, - "id": 1832, + "id": 1979, "isConstant": false, "isLValue": false, "isPure": false, @@ -19963,39 +20236,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5521:142:5", + "src": "5521:142:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1833, + "id": 1980, "nodeType": "EmitStatement", - "src": "5516:147:5" + "src": "5516:147:7" }, { "expression": { "argumentTypes": null, - "id": 1834, + "id": 1981, "name": "propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1714, - "src": "5677:6:5", + "referencedDeclaration": 1861, + "src": "5677:6:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 1706, - "id": 1835, + "functionReturnParameters": 1853, + "id": 1982, "nodeType": "Return", - "src": "5670:13:5" + "src": "5670:13:7" } ] }, "documentation": "@notice propose a reparamaterization of the key _name's value to _value.\n@param _name the name of the proposed param to be set\n@param _value the proposed value to set the param to be set", - "id": 1837, + "id": 1984, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -20003,16 +20276,16 @@ "name": "proposeReparameterization", "nodeType": "FunctionDefinition", "parameters": { - "id": 1703, + "id": 1850, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1700, + "id": 1847, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4503:12:5", + "scope": 1984, + "src": "4503:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20020,10 +20293,10 @@ "typeString": "string" }, "typeName": { - "id": 1699, + "id": 1846, "name": "string", "nodeType": "ElementaryTypeName", - "src": "4503:6:5", + "src": "4503:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -20034,11 +20307,11 @@ }, { "constant": false, - "id": 1702, + "id": 1849, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4517:11:5", + "scope": 1984, + "src": "4517:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20046,10 +20319,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1701, + "id": 1848, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4517:4:5", + "src": "4517:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20059,20 +20332,20 @@ "visibility": "internal" } ], - "src": "4502:27:5" + "src": "4502:27:7" }, "payable": false, "returnParameters": { - "id": 1706, + "id": 1853, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1705, + "id": 1852, "name": "", "nodeType": "VariableDeclaration", - "scope": 1837, - "src": "4546:7:5", + "scope": 1984, + "src": "4546:7:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20080,10 +20353,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1704, + "id": 1851, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4546:7:5", + "src": "4546:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20093,47 +20366,47 @@ "visibility": "internal" } ], - "src": "4545:9:5" + "src": "4545:9:7" }, - "scope": 2490, - "src": "4468:1220:5", + "scope": 2653, + "src": "4468:1220:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1949, + "id": 2096, "nodeType": "Block", - "src": "5917:971:5", + "src": "5917:971:7", "statements": [ { "assignments": [ - 1845 + 1992 ], "declarations": [ { "constant": false, - "id": 1845, + "id": 1992, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5923:25:5", + "scope": 2097, + "src": "5923:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 1844, + "id": 1991, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "5923:13:5", + "referencedDeclaration": 1707, + "src": "5923:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -20141,31 +20414,31 @@ "visibility": "internal" } ], - "id": 1849, + "id": 1996, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1846, + "id": 1993, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "5951:9:5", + "referencedDeclaration": 1734, + "src": "5951:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1848, + "id": 1995, "indexExpression": { "argumentTypes": null, - "id": 1847, + "id": 1994, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "5961:7:5", + "referencedDeclaration": 1986, + "src": "5961:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20176,27 +20449,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5951:18:5", + "src": "5951:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "5923:46:5" + "src": "5923:46:7" }, { "assignments": [ - 1851 + 1998 ], "declarations": [ { "constant": false, - "id": 1851, + "id": 1998, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5975:12:5", + "scope": 2097, + "src": "5975:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20204,10 +20477,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1850, + "id": 1997, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5975:4:5", + "src": "5975:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20217,38 +20490,38 @@ "visibility": "internal" } ], - "id": 1854, + "id": 2001, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1852, + "id": 1999, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1845, - "src": "5990:4:5", + "referencedDeclaration": 1992, + "src": "5990:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 1853, + "id": 2000, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "deposit", "nodeType": "MemberAccess", - "referencedDeclaration": 1551, - "src": "5990:12:5", + "referencedDeclaration": 1698, + "src": "5990:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5975:27:5" + "src": "5975:27:7" }, { "expression": { @@ -20260,7 +20533,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1863, + "id": 2010, "isConstant": false, "isLValue": false, "isPure": false, @@ -20270,12 +20543,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1857, + "id": 2004, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6028:7:5", + "referencedDeclaration": 1986, + "src": "6028:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20289,18 +20562,18 @@ "typeString": "bytes32" } ], - "id": 1856, + "id": 2003, "name": "propExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2258, - "src": "6017:10:5", + "referencedDeclaration": 2418, + "src": "6017:10:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1858, + "id": 2005, "isConstant": false, "isLValue": false, "isPure": false, @@ -20308,7 +20581,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6017:19:5", + "src": "6017:19:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20322,7 +20595,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1862, + "id": 2009, "isConstant": false, "isLValue": false, "isPure": false, @@ -20331,26 +20604,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1859, + "id": 2006, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1845, - "src": "6040:4:5", + "referencedDeclaration": 1992, + "src": "6040:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 1860, + "id": 2007, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "6040:16:5", + "referencedDeclaration": 1696, + "src": "6040:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20361,14 +20634,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1861, + "id": 2008, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6060:1:5", + "src": "6060:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -20376,13 +20649,13 @@ }, "value": "0" }, - "src": "6040:21:5", + "src": "6040:21:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6017:44:5", + "src": "6017:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20396,21 +20669,21 @@ "typeString": "bool" } ], - "id": 1855, + "id": 2002, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6009:7:5", + "referencedDeclaration": 4156, + "src": "6009:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1864, + "id": 2011, "isConstant": false, "isLValue": false, "isPure": false, @@ -20418,28 +20691,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6009:53:5", + "src": "6009:53:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1865, + "id": 2012, "nodeType": "ExpressionStatement", - "src": "6009:53:5" + "src": "6009:53:7" }, { "assignments": [ - 1867 + 2014 ], "declarations": [ { "constant": false, - "id": 1867, + "id": 2014, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6086:11:5", + "scope": 2097, + "src": "6086:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20447,10 +20720,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1866, + "id": 2013, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6086:4:5", + "src": "6086:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20460,7 +20733,7 @@ "visibility": "internal" } ], - "id": 1880, + "id": 2027, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20470,14 +20743,14 @@ { "argumentTypes": null, "hexValue": "70566f746551756f72756d", - "id": 1871, + "id": 2018, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6128:13:5", + "src": "6128:13:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1cd8ca3a1baaf24ca4431f7b59b78854d08ce96815f9b5677de2c92385fb9138", @@ -20493,18 +20766,18 @@ "typeString": "literal_string \"pVoteQuorum\"" } ], - "id": 1870, + "id": 2017, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6124:3:5", + "referencedDeclaration": 2512, + "src": "6124:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1872, + "id": 2019, "isConstant": false, "isLValue": false, "isPure": false, @@ -20512,7 +20785,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6124:18:5", + "src": "6124:18:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20524,14 +20797,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 1874, + "id": 2021, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6154:17:5", + "src": "6154:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -20547,18 +20820,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 1873, + "id": 2020, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6150:3:5", + "referencedDeclaration": 2512, + "src": "6150:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1875, + "id": 2022, "isConstant": false, "isLValue": false, "isPure": false, @@ -20566,7 +20839,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6150:22:5", + "src": "6150:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20578,14 +20851,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 1877, + "id": 2024, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6184:17:5", + "src": "6184:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -20601,18 +20874,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 1876, + "id": 2023, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6180:3:5", + "referencedDeclaration": 2512, + "src": "6180:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1878, + "id": 2025, "isConstant": false, "isLValue": false, "isPure": false, @@ -20620,7 +20893,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6180:22:5", + "src": "6180:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20644,32 +20917,32 @@ ], "expression": { "argumentTypes": null, - "id": 1868, + "id": 2015, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "6100:6:5", + "referencedDeclaration": 1738, + "src": "6100:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1869, + "id": 2016, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "startPoll", "nodeType": "MemberAccess", - "referencedDeclaration": 1101, - "src": "6100:16:5", + "referencedDeclaration": 1246, + "src": "6100:16:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 1879, + "id": 2026, "isConstant": false, "isLValue": false, "isPure": false, @@ -20677,19 +20950,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6100:108:5", + "src": "6100:108:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "6086:122:5" + "src": "6086:122:7" }, { "expression": { "argumentTypes": null, - "id": 1904, + "id": 2051, "isConstant": false, "isLValue": false, "isPure": false, @@ -20698,26 +20971,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1881, + "id": 2028, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "6215:10:5", + "referencedDeclaration": 1730, + "src": "6215:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 1883, + "id": 2030, "indexExpression": { "argumentTypes": null, - "id": 1882, + "id": 2029, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6226:6:5", + "referencedDeclaration": 2014, + "src": "6226:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20728,9 +21001,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "6215:18:5", + "src": "6215:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, @@ -20743,18 +21016,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1885, + "id": 2032, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6266:3:5", + "referencedDeclaration": 4153, + "src": "6266:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1886, + "id": 2033, "isConstant": false, "isLValue": false, "isPure": false, @@ -20762,7 +21035,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6266:10:5", + "src": "6266:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20774,14 +21047,14 @@ { "argumentTypes": null, "hexValue": "313030", - "id": 1898, + "id": 2045, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6356:3:5", + "src": "6356:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -20802,12 +21075,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1895, + "id": 2042, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6343:7:5", + "referencedDeclaration": 1998, + "src": "6343:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20827,14 +21100,14 @@ { "argumentTypes": null, "hexValue": "313030", - "id": 1889, + "id": 2036, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6309:3:5", + "src": "6309:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -20848,14 +21121,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 1891, + "id": 2038, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6318:18:5", + "src": "6318:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -20871,18 +21144,18 @@ "typeString": "literal_string \"pDispensationPct\"" } ], - "id": 1890, + "id": 2037, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "6314:3:5", + "referencedDeclaration": 2512, + "src": "6314:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 1892, + "id": 2039, "isConstant": false, "isLValue": false, "isPure": false, @@ -20890,7 +21163,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6314:23:5", + "src": "6314:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20910,32 +21183,32 @@ ], "expression": { "argumentTypes": null, - "id": 1887, + "id": 2034, "name": "SafeMath", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3687, - "src": "6296:8:5", + "referencedDeclaration": 3891, + "src": "6296:8:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_SafeMath_$3687_$", + "typeIdentifier": "t_type$_t_contract$_SafeMath_$3891_$", "typeString": "type(library SafeMath)" } }, - "id": 1888, + "id": 2035, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3662, - "src": "6296:12:5", + "referencedDeclaration": 3866, + "src": "6296:12:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1893, + "id": 2040, "isConstant": false, "isLValue": false, "isPure": false, @@ -20943,27 +21216,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:42:5", + "src": "6296:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1894, + "id": 2041, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 3628, - "src": "6296:46:5", + "referencedDeclaration": 3832, + "src": "6296:46:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1896, + "id": 2043, "isConstant": false, "isLValue": false, "isPure": false, @@ -20971,27 +21244,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:55:5", + "src": "6296:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1897, + "id": 2044, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 3642, - "src": "6296:59:5", + "referencedDeclaration": 3846, + "src": "6296:59:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1899, + "id": 2046, "isConstant": false, "isLValue": false, "isPure": false, @@ -20999,7 +21272,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6296:64:5", + "src": "6296:64:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21007,12 +21280,12 @@ }, { "argumentTypes": null, - "id": 1900, + "id": 2047, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6375:7:5", + "referencedDeclaration": 1998, + "src": "6375:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21021,14 +21294,14 @@ { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1901, + "id": 2048, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "6400:5:5", + "src": "6400:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21039,14 +21312,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1902, + "id": 2049, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6428:1:5", + "src": "6428:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -21057,18 +21330,18 @@ ], "expression": { "argumentTypes": null, - "id": 1884, + "id": 2031, "name": "Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1575, - "src": "6236:9:5", + "referencedDeclaration": 1722, + "src": "6236:9:7", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Challenge_$1575_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Challenge_$1722_storage_ptr_$", "typeString": "type(struct Parameterizer.Challenge storage pointer)" } }, - "id": 1903, + "id": 2050, "isConstant": false, "isLValue": false, "isPure": false, @@ -21082,26 +21355,26 @@ "winningTokens" ], "nodeType": "FunctionCall", - "src": "6236:200:5", + "src": "6236:200:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory", + "typeIdentifier": "t_struct$_Challenge_$1722_memory", "typeString": "struct Parameterizer.Challenge memory" } }, - "src": "6215:221:5", + "src": "6215:221:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 1905, + "id": 2052, "nodeType": "ExpressionStatement", - "src": "6215:221:5" + "src": "6215:221:7" }, { "expression": { "argumentTypes": null, - "id": 1911, + "id": 2058, "isConstant": false, "isLValue": false, "isPure": false, @@ -21112,26 +21385,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1906, + "id": 2053, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "6443:9:5", + "referencedDeclaration": 1734, + "src": "6443:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1908, + "id": 2055, "indexExpression": { "argumentTypes": null, - "id": 1907, + "id": 2054, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6453:7:5", + "referencedDeclaration": 1986, + "src": "6453:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21142,21 +21415,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6443:18:5", + "src": "6443:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 1909, + "id": 2056, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "6443:30:5", + "referencedDeclaration": 1696, + "src": "6443:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21166,26 +21439,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1910, + "id": 2057, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6476:6:5", + "referencedDeclaration": 2014, + "src": "6476:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6443:39:5", + "src": "6443:39:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1912, + "id": 2059, "nodeType": "ExpressionStatement", - "src": "6443:39:5" + "src": "6443:39:7" }, { "expression": { @@ -21198,18 +21471,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1916, + "id": 2063, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6605:3:5", + "referencedDeclaration": 4153, + "src": "6605:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1917, + "id": 2064, "isConstant": false, "isLValue": false, "isPure": false, @@ -21217,7 +21490,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6605:10:5", + "src": "6605:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21225,25 +21498,25 @@ }, { "argumentTypes": null, - "id": 1918, + "id": 2065, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3727, - "src": "6617:4:5", + "referencedDeclaration": 4184, + "src": "6617:4:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, { "argumentTypes": null, - "id": 1919, + "id": 2066, "name": "deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "6623:7:5", + "referencedDeclaration": 1998, + "src": "6623:7:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21257,7 +21530,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, { @@ -21267,32 +21540,32 @@ ], "expression": { "argumentTypes": null, - "id": 1914, + "id": 2061, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "6586:5:5", + "referencedDeclaration": 1736, + "src": "6586:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1915, + "id": 2062, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "6586:18:5", + "referencedDeclaration": 510, + "src": "6586:18:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 1920, + "id": 2067, "isConstant": false, "isLValue": false, "isPure": false, @@ -21300,7 +21573,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6586:45:5", + "src": "6586:45:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21314,21 +21587,21 @@ "typeString": "bool" } ], - "id": 1913, + "id": 2060, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6578:7:5", + "referencedDeclaration": 4156, + "src": "6578:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 1921, + "id": 2068, "isConstant": false, "isLValue": false, "isPure": false, @@ -21336,26 +21609,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6578:54:5", + "src": "6578:54:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1922, + "id": 2069, "nodeType": "ExpressionStatement", - "src": "6578:54:5" + "src": "6578:54:7" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 1924, + "id": 2071, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6639:18:5", + "scope": 2097, + "src": "6639:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21363,10 +21636,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1923, + "id": 2070, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6639:4:5", + "src": "6639:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21376,21 +21649,21 @@ "visibility": "internal" } ], - "id": 1925, + "id": 2072, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "6639:18:5" + "src": "6639:18:7" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 1927, + "id": 2074, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "6663:18:5", + "scope": 2097, + "src": "6663:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21398,10 +21671,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1926, + "id": 2073, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "6663:4:5", + "src": "6663:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21411,15 +21684,15 @@ "visibility": "internal" } ], - "id": 1928, + "id": 2075, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "6663:18:5" + "src": "6663:18:7" }, { "expression": { "argumentTypes": null, - "id": 1936, + "id": 2083, "isConstant": false, "isLValue": false, "isPure": false, @@ -21429,12 +21702,12 @@ "components": [ { "argumentTypes": null, - "id": 1929, + "id": 2076, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1924, - "src": "6688:13:5", + "referencedDeclaration": 2071, + "src": "6688:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21442,12 +21715,12 @@ }, { "argumentTypes": null, - "id": 1930, + "id": 2077, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1927, - "src": "6703:13:5", + "referencedDeclaration": 2074, + "src": "6703:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21455,14 +21728,14 @@ }, null ], - "id": 1931, + "id": 2078, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "6687:31:5", + "src": "6687:31:7", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$__$", "typeString": "tuple(uint256,uint256,)" @@ -21475,12 +21748,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1934, + "id": 2081, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6736:6:5", + "referencedDeclaration": 2014, + "src": "6736:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21496,32 +21769,32 @@ ], "expression": { "argumentTypes": null, - "id": 1932, + "id": 2079, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "6721:6:5", + "referencedDeclaration": 1738, + "src": "6721:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 1933, + "id": 2080, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollMap", "nodeType": "MemberAccess", - "referencedDeclaration": 535, - "src": "6721:14:5", + "referencedDeclaration": 655, + "src": "6721:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 1935, + "id": 2082, "isConstant": false, "isLValue": false, "isPure": false, @@ -21529,21 +21802,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6721:22:5", + "src": "6721:22:7", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "tuple(uint256,uint256,uint256,uint256,uint256)" } }, - "src": "6687:56:5", + "src": "6687:56:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1937, + "id": 2084, "nodeType": "ExpressionStatement", - "src": "6687:56:5" + "src": "6687:56:7" }, { "eventCall": { @@ -21551,12 +21824,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1939, + "id": 2086, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1839, - "src": "6776:7:5", + "referencedDeclaration": 1986, + "src": "6776:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21564,12 +21837,12 @@ }, { "argumentTypes": null, - "id": 1940, + "id": 2087, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6791:6:5", + "referencedDeclaration": 2014, + "src": "6791:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21577,12 +21850,12 @@ }, { "argumentTypes": null, - "id": 1941, + "id": 2088, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1924, - "src": "6805:13:5", + "referencedDeclaration": 2071, + "src": "6805:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21590,12 +21863,12 @@ }, { "argumentTypes": null, - "id": 1942, + "id": 2089, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1927, - "src": "6826:13:5", + "referencedDeclaration": 2074, + "src": "6826:13:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21605,18 +21878,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1943, + "id": 2090, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6847:3:5", + "referencedDeclaration": 4153, + "src": "6847:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1944, + "id": 2091, "isConstant": false, "isLValue": false, "isPure": false, @@ -21624,7 +21897,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6847:10:5", + "src": "6847:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21654,18 +21927,18 @@ "typeString": "address" } ], - "id": 1938, + "id": 2085, "name": "_NewChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "6755:13:5", + "referencedDeclaration": 1649, + "src": "6755:13:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256,address)" } }, - "id": 1945, + "id": 2092, "isConstant": false, "isLValue": false, "isPure": false, @@ -21673,39 +21946,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6755:108:5", + "src": "6755:108:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1946, + "id": 2093, "nodeType": "EmitStatement", - "src": "6750:113:5" + "src": "6750:113:7" }, { "expression": { "argumentTypes": null, - "id": 1947, + "id": 2094, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1867, - "src": "6877:6:5", + "referencedDeclaration": 2014, + "src": "6877:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1843, - "id": 1948, + "functionReturnParameters": 1990, + "id": 2095, "nodeType": "Return", - "src": "6870:13:5" + "src": "6870:13:7" } ] }, "documentation": "@notice challenge the provided proposal ID, and put tokens at stake to do so.\n@param _propID the proposal ID to challenge", - "id": 1950, + "id": 2097, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -21713,16 +21986,16 @@ "name": "challengeReparameterization", "nodeType": "FunctionDefinition", "parameters": { - "id": 1840, + "id": 1987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1839, + "id": 1986, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5866:15:5", + "scope": 2097, + "src": "5866:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21730,10 +22003,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1838, + "id": 1985, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5866:7:5", + "src": "5866:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21743,20 +22016,20 @@ "visibility": "internal" } ], - "src": "5865:17:5" + "src": "5865:17:7" }, "payable": false, "returnParameters": { - "id": 1843, + "id": 1990, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1842, + "id": 1989, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 1950, - "src": "5899:16:5", + "scope": 2097, + "src": "5899:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21764,10 +22037,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1841, + "id": 1988, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5899:4:5", + "src": "5899:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21777,47 +22050,47 @@ "visibility": "internal" } ], - "src": "5898:18:5" + "src": "5898:18:7" }, - "scope": 2490, - "src": "5829:1059:5", + "scope": 2653, + "src": "5829:1059:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2082, + "id": 2229, "nodeType": "Block", - "src": "7232:1559:5", + "src": "7232:1559:7", "statements": [ { "assignments": [ - 1956 + 2103 ], "declarations": [ { "constant": false, - "id": 1956, + "id": 2103, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7238:26:5", + "scope": 2230, + "src": "7238:26:7", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 1955, + "id": 2102, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "7238:13:5", + "referencedDeclaration": 1707, + "src": "7238:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -21825,31 +22098,31 @@ "visibility": "internal" } ], - "id": 1960, + "id": 2107, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1957, + "id": 2104, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "7267:9:5", + "referencedDeclaration": 1734, + "src": "7267:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1959, + "id": 2106, "indexExpression": { "argumentTypes": null, - "id": 1958, + "id": 2105, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7277:7:5", + "referencedDeclaration": 2099, + "src": "7277:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21860,27 +22133,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7267:18:5", + "src": "7267:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "7238:47:5" + "src": "7238:47:7" }, { "assignments": [ - 1962 + 2109 ], "declarations": [ { "constant": false, - "id": 1962, + "id": 2109, "name": "propOwner", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7291:17:5", + "scope": 2230, + "src": "7291:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21888,10 +22161,10 @@ "typeString": "address" }, "typeName": { - "id": 1961, + "id": 2108, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7291:7:5", + "src": "7291:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21901,51 +22174,51 @@ "visibility": "internal" } ], - "id": 1965, + "id": 2112, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1963, + "id": 2110, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7311:4:5", + "referencedDeclaration": 2103, + "src": "7311:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1964, + "id": 2111, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 1555, - "src": "7311:10:5", + "referencedDeclaration": 1702, + "src": "7311:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "7291:30:5" + "src": "7291:30:7" }, { "assignments": [ - 1967 + 2114 ], "declarations": [ { "constant": false, - "id": 1967, + "id": 2114, "name": "propDeposit", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7327:16:5", + "scope": 2230, + "src": "7327:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21953,10 +22226,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1966, + "id": 2113, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7327:4:5", + "src": "7327:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21966,38 +22239,38 @@ "visibility": "internal" } ], - "id": 1970, + "id": 2117, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1968, + "id": 2115, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7346:4:5", + "referencedDeclaration": 2103, + "src": "7346:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1969, + "id": 2116, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "deposit", "nodeType": "MemberAccess", - "referencedDeclaration": 1551, - "src": "7346:12:5", + "referencedDeclaration": 1698, + "src": "7346:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7327:31:5" + "src": "7327:31:7" }, { "condition": { @@ -22005,12 +22278,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1972, + "id": 2119, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7548:7:5", + "referencedDeclaration": 2099, + "src": "7548:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22024,18 +22297,18 @@ "typeString": "bytes32" } ], - "id": 1971, + "id": 2118, "name": "canBeSet", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2243, - "src": "7539:8:5", + "referencedDeclaration": 2403, + "src": "7539:8:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1973, + "id": 2120, "isConstant": false, "isLValue": false, "isPure": false, @@ -22043,7 +22316,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7539:17:5", + "src": "7539:17:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22055,12 +22328,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2004, + "id": 2151, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7943:7:5", + "referencedDeclaration": 2099, + "src": "7943:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22074,18 +22347,18 @@ "typeString": "bytes32" } ], - "id": 2003, + "id": 2150, "name": "challengeCanBeResolved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2296, - "src": "7920:22:5", + "referencedDeclaration": 2456, + "src": "7920:22:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2005, + "id": 2152, "isConstant": false, "isLValue": false, "isPure": false, @@ -22093,7 +22366,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7920:31:5", + "src": "7920:31:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22106,19 +22379,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2014, + "id": 2161, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2011, + "id": 2158, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "8055:3:5", + "referencedDeclaration": 4155, + "src": "8055:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22130,41 +22403,41 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2012, + "id": 2159, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "8061:4:5", + "referencedDeclaration": 2103, + "src": "8061:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 2013, + "id": 2160, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "8061:14:5", + "referencedDeclaration": 1704, + "src": "8061:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8055:20:5", + "src": "8055:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2036, + "id": 2183, "nodeType": "Block", - "src": "8304:151:5", + "src": "8304:151:7", "statements": [ { "expression": { @@ -22172,21 +22445,21 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 2033, + "id": 2180, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 3707, - 3708 + 4158, + 4159 ], - "referencedDeclaration": 3707, - "src": "8440:6:5", + "referencedDeclaration": 4158, + "src": "8440:6:7", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 2034, + "id": 2181, "isConstant": false, "isLValue": false, "isPure": false, @@ -22194,25 +22467,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8440:8:5", + "src": "8440:8:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2035, + "id": 2182, "nodeType": "ExpressionStatement", - "src": "8440:8:5" + "src": "8440:8:7" } ] }, - "id": 2037, + "id": 2184, "nodeType": "IfStatement", - "src": "8051:404:5", + "src": "8051:404:7", "trueBody": { - "id": 2032, + "id": 2179, "nodeType": "Block", - "src": "8077:221:5", + "src": "8077:221:7", "statements": [ { "eventCall": { @@ -22220,12 +22493,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2016, + "id": 2163, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8195:7:5", + "referencedDeclaration": 2099, + "src": "8195:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22239,18 +22512,18 @@ "typeString": "bytes32" } ], - "id": 2015, + "id": 2162, "name": "_ProposalExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1514, - "src": "8178:16:5", + "referencedDeclaration": 1661, + "src": "8178:16:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2017, + "id": 2164, "isConstant": false, "isLValue": false, "isPure": false, @@ -22258,20 +22531,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8178:25:5", + "src": "8178:25:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2018, + "id": 2165, "nodeType": "EmitStatement", - "src": "8173:30:5" + "src": "8173:30:7" }, { "expression": { "argumentTypes": null, - "id": 2022, + "id": 2169, "isConstant": false, "isLValue": false, "isPure": false, @@ -22279,31 +22552,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "8211:25:5", + "src": "8211:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2019, + "id": 2166, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "8218:9:5", + "referencedDeclaration": 1734, + "src": "8218:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2021, + "id": 2168, "indexExpression": { "argumentTypes": null, - "id": 2020, + "id": 2167, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8228:7:5", + "referencedDeclaration": 2099, + "src": "8228:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22314,9 +22587,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "8218:18:5", + "src": "8218:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -22325,9 +22598,9 @@ "typeString": "tuple()" } }, - "id": 2023, + "id": 2170, "nodeType": "ExpressionStatement", - "src": "8211:25:5" + "src": "8211:25:7" }, { "expression": { @@ -22338,12 +22611,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2027, + "id": 2174, "name": "propOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1962, - "src": "8267:9:5", + "referencedDeclaration": 2109, + "src": "8267:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22351,12 +22624,12 @@ }, { "argumentTypes": null, - "id": 2028, + "id": 2175, "name": "propDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1967, - "src": "8278:11:5", + "referencedDeclaration": 2114, + "src": "8278:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22376,32 +22649,32 @@ ], "expression": { "argumentTypes": null, - "id": 2025, + "id": 2172, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "8252:5:5", + "referencedDeclaration": 1736, + "src": "8252:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2026, + "id": 2173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "8252:14:5", + "referencedDeclaration": 551, + "src": "8252:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2029, + "id": 2176, "isConstant": false, "isLValue": false, "isPure": false, @@ -22409,7 +22682,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8252:38:5", + "src": "8252:38:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22423,21 +22696,21 @@ "typeString": "bool" } ], - "id": 2024, + "id": 2171, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8244:7:5", + "referencedDeclaration": 4156, + "src": "8244:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2030, + "id": 2177, "isConstant": false, "isLValue": false, "isPure": false, @@ -22445,26 +22718,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8244:47:5", + "src": "8244:47:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2031, + "id": 2178, "nodeType": "ExpressionStatement", - "src": "8244:47:5" + "src": "8244:47:7" } ] } }, - "id": 2038, + "id": 2185, "nodeType": "IfStatement", - "src": "7916:539:5", + "src": "7916:539:7", "trueBody": { - "id": 2010, + "id": 2157, "nodeType": "Block", - "src": "7953:92:5", + "src": "7953:92:7", "statements": [ { "expression": { @@ -22472,12 +22745,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2007, + "id": 2154, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8030:7:5", + "referencedDeclaration": 2099, + "src": "8030:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22491,18 +22764,18 @@ "typeString": "bytes32" } ], - "id": 2006, + "id": 2153, "name": "resolveChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2470, - "src": "8013:16:5", + "referencedDeclaration": 2633, + "src": "8013:16:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2008, + "id": 2155, "isConstant": false, "isLValue": false, "isPure": false, @@ -22510,26 +22783,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8013:25:5", + "src": "8013:25:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2009, + "id": 2156, "nodeType": "ExpressionStatement", - "src": "8013:25:5" + "src": "8013:25:7" } ] } }, - "id": 2039, + "id": 2186, "nodeType": "IfStatement", - "src": "7535:920:5", + "src": "7535:920:7", "trueBody": { - "id": 2002, + "id": 2149, "nodeType": "Block", - "src": "7558:352:5", + "src": "7558:352:7", "statements": [ { "expression": { @@ -22539,26 +22812,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1975, + "id": 2122, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7731:4:5", + "referencedDeclaration": 2103, + "src": "7731:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1976, + "id": 2123, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "7731:9:5", + "referencedDeclaration": 1700, + "src": "7731:9:7", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -22568,26 +22841,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1977, + "id": 2124, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7742:4:5", + "referencedDeclaration": 2103, + "src": "7742:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1978, + "id": 2125, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "7742:10:5", + "referencedDeclaration": 1706, + "src": "7742:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22605,18 +22878,18 @@ "typeString": "uint256" } ], - "id": 1974, + "id": 2121, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "7727:3:5", + "referencedDeclaration": 2652, + "src": "7727:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 1979, + "id": 2126, "isConstant": false, "isLValue": false, "isPure": false, @@ -22624,15 +22897,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7727:26:5", + "src": "7727:26:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1980, + "id": 2127, "nodeType": "ExpressionStatement", - "src": "7727:26:5" + "src": "7727:26:7" }, { "eventCall": { @@ -22640,12 +22913,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1982, + "id": 2129, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7784:7:5", + "referencedDeclaration": 2099, + "src": "7784:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22655,26 +22928,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1983, + "id": 2130, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7793:4:5", + "referencedDeclaration": 2103, + "src": "7793:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1984, + "id": 2131, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "7793:9:5", + "referencedDeclaration": 1700, + "src": "7793:9:7", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -22684,26 +22957,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1985, + "id": 2132, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1956, - "src": "7804:4:5", + "referencedDeclaration": 2103, + "src": "7804:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal storage pointer" } }, - "id": 1986, + "id": 2133, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "7804:10:5", + "referencedDeclaration": 1706, + "src": "7804:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22725,18 +22998,18 @@ "typeString": "uint256" } ], - "id": 1981, + "id": 2128, "name": "_ProposalAccepted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1510, - "src": "7766:17:5", + "referencedDeclaration": 1657, + "src": "7766:17:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (bytes32,string memory,uint256)" } }, - "id": 1987, + "id": 2134, "isConstant": false, "isLValue": false, "isPure": false, @@ -22744,20 +23017,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7766:49:5", + "src": "7766:49:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1988, + "id": 2135, "nodeType": "EmitStatement", - "src": "7761:54:5" + "src": "7761:54:7" }, { "expression": { "argumentTypes": null, - "id": 1992, + "id": 2139, "isConstant": false, "isLValue": false, "isPure": false, @@ -22765,31 +23038,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "7823:25:5", + "src": "7823:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1989, + "id": 2136, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "7830:9:5", + "referencedDeclaration": 1734, + "src": "7830:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 1991, + "id": 2138, "indexExpression": { "argumentTypes": null, - "id": 1990, + "id": 2137, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "7840:7:5", + "referencedDeclaration": 2099, + "src": "7840:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22800,9 +23073,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7830:18:5", + "src": "7830:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -22811,9 +23084,9 @@ "typeString": "tuple()" } }, - "id": 1993, + "id": 2140, "nodeType": "ExpressionStatement", - "src": "7823:25:5" + "src": "7823:25:7" }, { "expression": { @@ -22824,12 +23097,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1997, + "id": 2144, "name": "propOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1962, - "src": "7879:9:5", + "referencedDeclaration": 2109, + "src": "7879:9:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22837,12 +23110,12 @@ }, { "argumentTypes": null, - "id": 1998, + "id": 2145, "name": "propDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1967, - "src": "7890:11:5", + "referencedDeclaration": 2114, + "src": "7890:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22862,32 +23135,32 @@ ], "expression": { "argumentTypes": null, - "id": 1995, + "id": 2142, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "7864:5:5", + "referencedDeclaration": 1736, + "src": "7864:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 1996, + "id": 2143, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "7864:14:5", + "referencedDeclaration": 551, + "src": "7864:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 1999, + "id": 2146, "isConstant": false, "isLValue": false, "isPure": false, @@ -22895,7 +23168,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7864:38:5", + "src": "7864:38:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22909,21 +23182,21 @@ "typeString": "bool" } ], - "id": 1994, + "id": 2141, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7856:7:5", + "referencedDeclaration": 4156, + "src": "7856:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2000, + "id": 2147, "isConstant": false, "isLValue": false, "isPure": false, @@ -22931,15 +23204,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7856:47:5", + "src": "7856:47:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2001, + "id": 2148, "nodeType": "ExpressionStatement", - "src": "7856:47:5" + "src": "7856:47:7" } ] } @@ -22954,7 +23227,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2045, + "id": 2192, "isConstant": false, "isLValue": false, "isPure": false, @@ -22965,14 +23238,14 @@ { "argumentTypes": null, "hexValue": "64697370656e736174696f6e506374", - "id": 2042, + "id": 2189, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8472:17:5", + "src": "8472:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", @@ -22988,18 +23261,18 @@ "typeString": "literal_string \"dispensationPct\"" } ], - "id": 2041, + "id": 2188, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8468:3:5", + "referencedDeclaration": 2512, + "src": "8468:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2043, + "id": 2190, "isConstant": false, "isLValue": false, "isPure": false, @@ -23007,7 +23280,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8468:22:5", + "src": "8468:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23018,14 +23291,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 2044, + "id": 2191, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8494:3:5", + "src": "8494:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -23033,7 +23306,7 @@ }, "value": "100" }, - "src": "8468:29:5", + "src": "8468:29:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23047,18 +23320,18 @@ "typeString": "bool" } ], - "id": 2040, + "id": 2187, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "8461:6:5", + "referencedDeclaration": 4142, + "src": "8461:6:7", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2046, + "id": 2193, "isConstant": false, "isLValue": false, "isPure": false, @@ -23066,15 +23339,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8461:37:5", + "src": "8461:37:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2047, + "id": 2194, "nodeType": "ExpressionStatement", - "src": "8461:37:5" + "src": "8461:37:7" }, { "expression": { @@ -23086,7 +23359,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2053, + "id": 2200, "isConstant": false, "isLValue": false, "isPure": false, @@ -23097,14 +23370,14 @@ { "argumentTypes": null, "hexValue": "7044697370656e736174696f6e506374", - "id": 2050, + "id": 2197, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8515:18:5", + "src": "8515:18:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_05a3daf44f91da292c219c05dc954c342940b8aa851b594c6aaec71e37d44b79", @@ -23120,18 +23393,18 @@ "typeString": "literal_string \"pDispensationPct\"" } ], - "id": 2049, + "id": 2196, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8511:3:5", + "referencedDeclaration": 2512, + "src": "8511:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2051, + "id": 2198, "isConstant": false, "isLValue": false, "isPure": false, @@ -23139,7 +23412,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8511:23:5", + "src": "8511:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23150,14 +23423,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "313030", - "id": 2052, + "id": 2199, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8538:3:5", + "src": "8538:3:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_100_by_1", @@ -23165,7 +23438,7 @@ }, "value": "100" }, - "src": "8511:30:5", + "src": "8511:30:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23179,18 +23452,18 @@ "typeString": "bool" } ], - "id": 2048, + "id": 2195, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "8504:6:5", + "referencedDeclaration": 4142, + "src": "8504:6:7", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2054, + "id": 2201, "isConstant": false, "isLValue": false, "isPure": false, @@ -23198,15 +23471,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8504:38:5", + "src": "8504:38:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2055, + "id": 2202, "nodeType": "ExpressionStatement", - "src": "8504:38:5" + "src": "8504:38:7" }, { "expression": { @@ -23214,12 +23487,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2074, + "id": 2221, "name": "PROCESSBY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1594, - "src": "8744:9:5", + "referencedDeclaration": 1741, + "src": "8744:9:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23242,14 +23515,14 @@ { "argumentTypes": null, "hexValue": "7052657665616c53746167654c656e", - "id": 2070, + "id": 2217, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8713:17:5", + "src": "8713:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb97b9af270fc6f948089d10e64865cacad847ebc2ed8f2c10065db2f3593fa5", @@ -23265,18 +23538,18 @@ "typeString": "literal_string \"pRevealStageLen\"" } ], - "id": 2069, + "id": 2216, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8709:3:5", + "referencedDeclaration": 2512, + "src": "8709:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2071, + "id": 2218, "isConstant": false, "isLValue": false, "isPure": false, @@ -23284,7 +23557,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8709:22:5", + "src": "8709:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23307,14 +23580,14 @@ { "argumentTypes": null, "hexValue": "70436f6d6d697453746167654c656e", - "id": 2065, + "id": 2212, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8678:17:5", + "src": "8678:17:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_8ba0bfd13d315213bdff16c58a613af32380ba99f9d780656d5dec1267165fb1", @@ -23330,18 +23603,18 @@ "typeString": "literal_string \"pCommitStageLen\"" } ], - "id": 2064, + "id": 2211, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8674:3:5", + "referencedDeclaration": 2512, + "src": "8674:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2066, + "id": 2213, "isConstant": false, "isLValue": false, "isPure": false, @@ -23349,7 +23622,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8674:22:5", + "src": "8674:22:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23372,14 +23645,14 @@ { "argumentTypes": null, "hexValue": "704170706c7953746167654c656e", - "id": 2060, + "id": 2207, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8644:16:5", + "src": "8644:16:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5b5170ca3f1920aed95b983e4a145c32a025f4a29a71df82746241afd472a9d8", @@ -23395,18 +23668,18 @@ "typeString": "literal_string \"pApplyStageLen\"" } ], - "id": 2059, + "id": 2206, "name": "get", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2349, - "src": "8640:3:5", + "referencedDeclaration": 2512, + "src": "8640:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view returns (uint256)" } }, - "id": 2061, + "id": 2208, "isConstant": false, "isLValue": false, "isPure": false, @@ -23414,7 +23687,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8640:21:5", + "src": "8640:21:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23430,32 +23703,32 @@ ], "expression": { "argumentTypes": null, - "id": 2056, + "id": 2203, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "8632:3:5", + "referencedDeclaration": 4155, + "src": "8632:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2058, + "id": 2205, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:7:5", + "referencedDeclaration": 3890, + "src": "8632:7:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2062, + "id": 2209, "isConstant": false, "isLValue": false, "isPure": false, @@ -23463,27 +23736,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:30:5", + "src": "8632:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2063, + "id": 2210, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:41:5", + "referencedDeclaration": 3890, + "src": "8632:41:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2067, + "id": 2214, "isConstant": false, "isLValue": false, "isPure": false, @@ -23491,27 +23764,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:65:5", + "src": "8632:65:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2068, + "id": 2215, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:76:5", + "referencedDeclaration": 3890, + "src": "8632:76:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2072, + "id": 2219, "isConstant": false, "isLValue": false, "isPure": false, @@ -23519,27 +23792,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:100:5", + "src": "8632:100:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2073, + "id": 2220, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "8632:111:5", + "referencedDeclaration": 3890, + "src": "8632:111:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2075, + "id": 2222, "isConstant": false, "isLValue": false, "isPure": false, @@ -23547,20 +23820,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8632:122:5", + "src": "8632:122:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2076, + "id": 2223, "nodeType": "ExpressionStatement", - "src": "8632:122:5" + "src": "8632:122:7" }, { "expression": { "argumentTypes": null, - "id": 2080, + "id": 2227, "isConstant": false, "isLValue": false, "isPure": false, @@ -23568,31 +23841,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "8761:25:5", + "src": "8761:25:7", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2077, + "id": 2224, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "8768:9:5", + "referencedDeclaration": 1734, + "src": "8768:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2079, + "id": 2226, "indexExpression": { "argumentTypes": null, - "id": 2078, + "id": 2225, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1952, - "src": "8778:7:5", + "referencedDeclaration": 2099, + "src": "8778:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23603,9 +23876,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "8768:18:5", + "src": "8768:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, @@ -23614,14 +23887,14 @@ "typeString": "tuple()" } }, - "id": 2081, + "id": 2228, "nodeType": "ExpressionStatement", - "src": "8761:25:5" + "src": "8761:25:7" } ] }, "documentation": "@notice for the provided proposal ID, set it, resolve its challenge, or delete it depending on whether it can be set, has a challenge which can be resolved, or if its \"process by\" date has passed\n@param _propID the proposal ID to make a determination and state transition for", - "id": 2083, + "id": 2230, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -23629,16 +23902,16 @@ "name": "processProposal", "nodeType": "FunctionDefinition", "parameters": { - "id": 1953, + "id": 2100, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1952, + "id": 2099, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2083, - "src": "7208:15:5", + "scope": 2230, + "src": "7208:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23646,10 +23919,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1951, + "id": 2098, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7208:7:5", + "src": "7208:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23659,26 +23932,26 @@ "visibility": "internal" } ], - "src": "7207:17:5" + "src": "7207:17:7" }, "payable": false, "returnParameters": { - "id": 1954, + "id": 2101, "nodeType": "ParameterList", "parameters": [], - "src": "7232:0:5" + "src": "7232:0:7" }, - "scope": 2490, - "src": "7183:1608:5", + "scope": 2653, + "src": "7183:1608:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2170, + "id": 2329, "nodeType": "Block", - "src": "9075:844:5", + "src": "9075:927:7", "statements": [ { "expression": { @@ -23690,7 +23963,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2099, + "id": 2246, "isConstant": false, "isLValue": false, "isPure": false, @@ -23703,26 +23976,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2091, + "id": 2238, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9182:10:5", + "referencedDeclaration": 1730, + "src": "9182:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2093, + "id": 2240, "indexExpression": { "argumentTypes": null, - "id": 2092, + "id": 2239, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9193:12:5", + "referencedDeclaration": 2232, + "src": "9193:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23733,43 +24006,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9182:24:5", + "src": "9182:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2094, + "id": 2241, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "9182:36:5", + "referencedDeclaration": 1721, + "src": "9182:36:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2097, + "id": 2244, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2095, + "id": 2242, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9219:3:5", + "referencedDeclaration": 4153, + "src": "9219:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2096, + "id": 2243, "isConstant": false, "isLValue": false, "isPure": false, @@ -23777,7 +24050,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9219:10:5", + "src": "9219:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23788,7 +24061,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9182:48:5", + "src": "9182:48:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23799,14 +24072,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2098, + "id": 2245, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9234:5:5", + "src": "9234:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -23814,7 +24087,7 @@ }, "value": "false" }, - "src": "9182:57:5", + "src": "9182:57:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23828,21 +24101,21 @@ "typeString": "bool" } ], - "id": 2090, + "id": 2237, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9174:7:5", + "referencedDeclaration": 4156, + "src": "9174:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2100, + "id": 2247, "isConstant": false, "isLValue": false, "isPure": false, @@ -23850,15 +24123,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9174:66:5", + "src": "9174:66:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2101, + "id": 2248, "nodeType": "ExpressionStatement", - "src": "9174:66:5" + "src": "9174:66:7" }, { "expression": { @@ -23870,7 +24143,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2108, + "id": 2255, "isConstant": false, "isLValue": false, "isPure": false, @@ -23881,26 +24154,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2103, + "id": 2250, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9254:10:5", + "referencedDeclaration": 1730, + "src": "9254:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2105, + "id": 2252, "indexExpression": { "argumentTypes": null, - "id": 2104, + "id": 2251, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9265:12:5", + "referencedDeclaration": 2232, + "src": "9265:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23911,21 +24184,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9254:24:5", + "src": "9254:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2106, + "id": 2253, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "9254:33:5", + "referencedDeclaration": 1713, + "src": "9254:33:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23936,14 +24209,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2107, + "id": 2254, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9291:4:5", + "src": "9291:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -23951,7 +24224,7 @@ }, "value": "true" }, - "src": "9254:41:5", + "src": "9254:41:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23965,21 +24238,21 @@ "typeString": "bool" } ], - "id": 2102, + "id": 2249, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9246:7:5", + "referencedDeclaration": 4156, + "src": "9246:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2109, + "id": 2256, "isConstant": false, "isLValue": false, "isPure": false, @@ -23987,28 +24260,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9246:50:5", + "src": "9246:50:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2110, + "id": 2257, "nodeType": "ExpressionStatement", - "src": "9246:50:5" + "src": "9246:50:7" }, { "assignments": [ - 2112 + 2259 ], "declarations": [ { "constant": false, - "id": 2112, + "id": 2259, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9303:16:5", + "scope": 2330, + "src": "9303:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24016,10 +24289,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2111, + "id": 2258, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9303:4:5", + "src": "9303:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24029,7 +24302,7 @@ "visibility": "internal" } ], - "id": 2120, + "id": 2267, "initialValue": { "argumentTypes": null, "arguments": [ @@ -24037,18 +24310,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2115, + "id": 2262, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9349:3:5", + "referencedDeclaration": 4153, + "src": "9349:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2116, + "id": 2263, "isConstant": false, "isLValue": false, "isPure": false, @@ -24056,7 +24329,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9349:10:5", + "src": "9349:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24064,12 +24337,12 @@ }, { "argumentTypes": null, - "id": 2117, + "id": 2264, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9361:12:5", + "referencedDeclaration": 2232, + "src": "9361:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24077,12 +24350,12 @@ }, { "argumentTypes": null, - "id": 2118, + "id": 2265, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2087, - "src": "9375:5:5", + "referencedDeclaration": 2234, + "src": "9375:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24106,32 +24379,32 @@ ], "expression": { "argumentTypes": null, - "id": 2113, + "id": 2260, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "9322:6:5", + "referencedDeclaration": 1738, + "src": "9322:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2114, + "id": 2261, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "9322:26:5", + "referencedDeclaration": 1189, + "src": "9322:26:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 2119, + "id": 2266, "isConstant": false, "isLValue": false, "isPure": false, @@ -24139,27 +24412,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9322:59:5", + "src": "9322:59:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9303:78:5" + "src": "9303:78:7" }, { "assignments": [ - 2122 + 2269 ], "declarations": [ { "constant": false, - "id": 2122, + "id": 2269, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9387:11:5", + "scope": 2330, + "src": "9387:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24167,10 +24440,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2121, + "id": 2268, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9387:4:5", + "src": "9387:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24180,7 +24453,7 @@ "visibility": "internal" } ], - "id": 2129, + "id": 2276, "initialValue": { "argumentTypes": null, "arguments": [ @@ -24188,18 +24461,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2124, + "id": 2271, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9413:3:5", + "referencedDeclaration": 4153, + "src": "9413:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2125, + "id": 2272, "isConstant": false, "isLValue": false, "isPure": false, @@ -24207,7 +24480,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9413:10:5", + "src": "9413:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24215,12 +24488,12 @@ }, { "argumentTypes": null, - "id": 2126, + "id": 2273, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9425:12:5", + "referencedDeclaration": 2232, + "src": "9425:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24228,12 +24501,12 @@ }, { "argumentTypes": null, - "id": 2127, + "id": 2274, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2087, - "src": "9439:5:5", + "referencedDeclaration": 2234, + "src": "9439:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24255,18 +24528,18 @@ "typeString": "uint256" } ], - "id": 2123, + "id": 2270, "name": "voterReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "9401:11:5", + "referencedDeclaration": 2373, + "src": "9401:11:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view returns (uint256)" } }, - "id": 2128, + "id": 2275, "isConstant": false, "isLValue": false, "isPure": false, @@ -24274,19 +24547,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9401:44:5", + "src": "9401:44:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9387:58:5" + "src": "9387:58:7" }, { "expression": { "argumentTypes": null, - "id": 2135, + "id": 2288, "isConstant": false, "isLValue": false, "isPure": false, @@ -24297,26 +24570,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2130, + "id": 2277, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9590:10:5", + "referencedDeclaration": 1730, + "src": "9590:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2132, + "id": 2279, "indexExpression": { "argumentTypes": null, - "id": 2131, + "id": 2278, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9601:12:5", + "referencedDeclaration": 2232, + "src": "9601:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24327,55 +24600,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9590:24:5", + "src": "9590:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2133, + "id": 2280, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "9590:38:5", + "referencedDeclaration": 1717, + "src": "9590:38:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2134, - "name": "voterTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2112, - "src": "9632:11:5", + "arguments": [ + { + "argumentTypes": null, + "id": 2286, + "name": "voterTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2259, + "src": "9674:11:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2281, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "9631:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2283, + "indexExpression": { + "argumentTypes": null, + "id": 2282, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2232, + "src": "9642:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9631:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2284, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "winningTokens", + "nodeType": "MemberAccess", + "referencedDeclaration": 1717, + "src": "9631:38:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2285, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "9631:42:7", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2287, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9631:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9590:53:5", + "src": "9590:96:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2136, + "id": 2289, "nodeType": "ExpressionStatement", - "src": "9590:53:5" + "src": "9590:96:7" }, { "expression": { "argumentTypes": null, - "id": 2142, + "id": 2301, "isConstant": false, "isLValue": false, "isPure": false, @@ -24386,85 +24754,180 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2137, + "id": 2290, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9649:10:5", + "referencedDeclaration": 1730, + "src": "9692:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2139, + "id": 2292, "indexExpression": { "argumentTypes": null, - "id": 2138, + "id": 2291, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9660:12:5", + "referencedDeclaration": 2232, + "src": "9703:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9692:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2293, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 1709, + "src": "9692:35:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2299, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2269, + "src": "9770:6:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2294, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "9730:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2296, + "indexExpression": { + "argumentTypes": null, + "id": 2295, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2232, + "src": "9741:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "9730:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2297, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 1709, + "src": "9730:35:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, + "id": 2298, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "9649:24:5", + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "9730:39:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2140, + "id": 2300, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, - "lValueRequested": true, - "memberName": "rewardPool", - "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "9649:35:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "-=", - "rightHandSide": { - "argumentTypes": null, - "id": 2141, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9688:6:5", + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9730:47:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9649:45:5", + "src": "9692:85:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2143, + "id": 2302, "nodeType": "ExpressionStatement", - "src": "9649:45:5" + "src": "9692:85:7" }, { "expression": { "argumentTypes": null, - "id": 2152, + "id": 2311, "isConstant": false, "isLValue": false, "isPure": false, @@ -24477,26 +24940,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2144, + "id": 2303, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "9750:10:5", + "referencedDeclaration": 1730, + "src": "9833:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2146, + "id": 2305, "indexExpression": { "argumentTypes": null, - "id": 2145, + "id": 2304, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9761:12:5", + "referencedDeclaration": 2232, + "src": "9844:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24507,43 +24970,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9750:24:5", + "src": "9833:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2147, + "id": 2306, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "9750:36:5", + "referencedDeclaration": 1721, + "src": "9833:36:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2150, + "id": 2309, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2148, + "id": 2307, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9787:3:5", + "referencedDeclaration": 4153, + "src": "9870:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2149, + "id": 2308, "isConstant": false, "isLValue": false, "isPure": false, @@ -24551,7 +25014,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9787:10:5", + "src": "9870:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24562,7 +25025,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "9750:48:5", + "src": "9833:48:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24573,14 +25036,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2151, + "id": 2310, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9801:4:5", + "src": "9884:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -24588,15 +25051,15 @@ }, "value": "true" }, - "src": "9750:55:5", + "src": "9833:55:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2153, + "id": 2312, "nodeType": "ExpressionStatement", - "src": "9750:55:5" + "src": "9833:55:7" }, { "eventCall": { @@ -24604,12 +25067,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2155, + "id": 2314, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2085, - "src": "9832:12:5", + "referencedDeclaration": 2232, + "src": "9915:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24617,12 +25080,12 @@ }, { "argumentTypes": null, - "id": 2156, + "id": 2315, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9846:6:5", + "referencedDeclaration": 2269, + "src": "9929:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24632,18 +25095,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2157, + "id": 2316, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9854:3:5", + "referencedDeclaration": 4153, + "src": "9937:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2158, + "id": 2317, "isConstant": false, "isLValue": false, "isPure": false, @@ -24651,7 +25114,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9854:10:5", + "src": "9937:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24673,18 +25136,18 @@ "typeString": "address" } ], - "id": 2154, + "id": 2313, "name": "_RewardClaimed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1542, - "src": "9817:14:5", + "referencedDeclaration": 1689, + "src": "9900:14:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 2159, + "id": 2318, "isConstant": false, "isLValue": false, "isPure": false, @@ -24692,15 +25155,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9817:48:5", + "src": "9900:48:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2160, + "id": 2319, "nodeType": "EmitStatement", - "src": "9812:53:5" + "src": "9895:53:7" }, { "expression": { @@ -24713,18 +25176,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2164, + "id": 2323, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9894:3:5", + "referencedDeclaration": 4153, + "src": "9977:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2165, + "id": 2324, "isConstant": false, "isLValue": false, "isPure": false, @@ -24732,7 +25195,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9894:10:5", + "src": "9977:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24740,12 +25203,12 @@ }, { "argumentTypes": null, - "id": 2166, + "id": 2325, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2122, - "src": "9906:6:5", + "referencedDeclaration": 2269, + "src": "9989:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24765,32 +25228,32 @@ ], "expression": { "argumentTypes": null, - "id": 2162, + "id": 2321, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "9879:5:5", + "referencedDeclaration": 1736, + "src": "9962:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2163, + "id": 2322, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "9879:14:5", + "referencedDeclaration": 551, + "src": "9962:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2167, + "id": 2326, "isConstant": false, "isLValue": false, "isPure": false, @@ -24798,7 +25261,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9879:34:5", + "src": "9962:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24812,21 +25275,21 @@ "typeString": "bool" } ], - "id": 2161, + "id": 2320, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9871:7:5", + "referencedDeclaration": 4156, + "src": "9954:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2168, + "id": 2327, "isConstant": false, "isLValue": false, "isPure": false, @@ -24834,20 +25297,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9871:43:5", + "src": "9954:43:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2169, + "id": 2328, "nodeType": "ExpressionStatement", - "src": "9871:43:5" + "src": "9954:43:7" } ] }, "documentation": "@notice claim the tokens owed for the msg.sender in the provided challenge\n@param _challengeID the challenge ID to claim tokens for\n@param _salt the salt used to vote in the challenge being withdrawn for", - "id": 2171, + "id": 2330, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -24855,16 +25318,16 @@ "name": "claimReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2088, + "id": 2235, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2085, + "id": 2232, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9037:17:5", + "scope": 2330, + "src": "9037:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24872,10 +25335,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2084, + "id": 2231, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9037:4:5", + "src": "9037:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24886,11 +25349,11 @@ }, { "constant": false, - "id": 2087, + "id": 2234, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "9056:10:5", + "scope": 2330, + "src": "9056:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24898,10 +25361,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2086, + "id": 2233, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9056:4:5", + "src": "9056:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24911,39 +25374,39 @@ "visibility": "internal" } ], - "src": "9036:31:5" + "src": "9036:31:7" }, "payable": false, "returnParameters": { - "id": 2089, + "id": 2236, "nodeType": "ParameterList", "parameters": [], - "src": "9075:0:5" + "src": "9075:0:7" }, - "scope": 2490, - "src": "9016:903:5", + "scope": 2653, + "src": "9016:986:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2212, + "id": 2372, "nodeType": "Block", - "src": "10474:264:5", + "src": "10557:268:7", "statements": [ { "assignments": [ - 2183 + 2342 ], "declarations": [ { "constant": false, - "id": 2183, + "id": 2342, "name": "winningTokens", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10480:18:5", + "scope": 2373, + "src": "10563:18:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24951,10 +25414,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2182, + "id": 2341, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10480:4:5", + "src": "10563:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24964,33 +25427,33 @@ "visibility": "internal" } ], - "id": 2188, + "id": 2347, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2184, + "id": 2343, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "10501:10:5", + "referencedDeclaration": 1730, + "src": "10584:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2186, + "id": 2345, "indexExpression": { "argumentTypes": null, - "id": 2185, + "id": 2344, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10512:12:5", + "referencedDeclaration": 2334, + "src": "10595:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25001,41 +25464,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10501:24:5", + "src": "10584:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2187, + "id": 2346, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "10501:38:5", + "referencedDeclaration": 1717, + "src": "10584:38:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10480:59:5" + "src": "10563:59:7" }, { "assignments": [ - 2190 + 2349 ], "declarations": [ { "constant": false, - "id": 2190, + "id": 2349, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10545:15:5", + "scope": 2373, + "src": "10628:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25043,10 +25506,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2189, + "id": 2348, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10545:4:5", + "src": "10628:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25056,33 +25519,33 @@ "visibility": "internal" } ], - "id": 2195, + "id": 2354, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2191, + "id": 2350, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "10563:10:5", + "referencedDeclaration": 1730, + "src": "10646:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2193, + "id": 2352, "indexExpression": { "argumentTypes": null, - "id": 2192, + "id": 2351, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10574:12:5", + "referencedDeclaration": 2334, + "src": "10657:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25093,41 +25556,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10563:24:5", + "src": "10646:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2194, + "id": 2353, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "10563:35:5", + "referencedDeclaration": 1709, + "src": "10646:35:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10545:53:5" + "src": "10628:53:7" }, { "assignments": [ - 2197 + 2356 ], "declarations": [ { "constant": false, - "id": 2197, + "id": 2356, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10604:16:5", + "scope": 2373, + "src": "10687:16:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25135,10 +25598,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2196, + "id": 2355, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10604:4:5", + "src": "10687:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25148,18 +25611,18 @@ "visibility": "internal" } ], - "id": 2204, + "id": 2363, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2200, + "id": 2359, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2173, - "src": "10650:6:5", + "referencedDeclaration": 2332, + "src": "10733:6:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25167,12 +25630,12 @@ }, { "argumentTypes": null, - "id": 2201, + "id": 2360, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "10658:12:5", + "referencedDeclaration": 2334, + "src": "10741:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25180,12 +25643,12 @@ }, { "argumentTypes": null, - "id": 2202, + "id": 2361, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2177, - "src": "10672:5:5", + "referencedDeclaration": 2336, + "src": "10755:5:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25209,32 +25672,32 @@ ], "expression": { "argumentTypes": null, - "id": 2198, + "id": 2357, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "10623:6:5", + "referencedDeclaration": 1738, + "src": "10706:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2199, + "id": 2358, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "10623:26:5", + "referencedDeclaration": 1189, + "src": "10706:26:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 2203, + "id": 2362, "isConstant": false, "isLValue": false, "isPure": false, @@ -25242,119 +25705,142 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10623:55:5", + "src": "10706:55:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10604:74:5" + "src": "10687:74:7" }, { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2210, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "id": 2369, + "name": "winningTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2342, + "src": "10806:13:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2207, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 2205, - "name": "voterTokens", + "id": 2366, + "name": "rewardPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2197, - "src": "10692:11:5", + "referencedDeclaration": 2349, + "src": "10790:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "id": 2206, - "name": "rewardPool", + "id": 2364, + "name": "voterTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2190, - "src": "10706:10:5", + "referencedDeclaration": 2356, + "src": "10774:11:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10692:24:5", + "id": 2365, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "10774:15:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 2367, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10774:27:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 2208, + }, + "id": 2368, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "10691:26:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "id": 2209, - "name": "winningTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2183, - "src": "10720:13:5", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "10774:31:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "10691:42:5", + "id": 2370, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10774:46:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2181, - "id": 2211, + "functionReturnParameters": 2340, + "id": 2371, "nodeType": "Return", - "src": "10684:49:5" + "src": "10767:53:7" } ] }, "documentation": "@dev Calculates the provided voter's token reward for the given poll.\n@param _voter The address of the voter whose reward balance is to be returned\n@param _challengeID The ID of the challenge the voter's reward is being calculated for\n@param _salt The salt of the voter's commit hash in the given poll\n@return The uint indicating the voter's reward", - "id": 2213, + "id": 2373, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25362,16 +25848,16 @@ "name": "voterReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2178, + "id": 2337, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2173, + "id": 2332, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10396:14:5", + "scope": 2373, + "src": "10479:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25379,10 +25865,10 @@ "typeString": "address" }, "typeName": { - "id": 2172, + "id": 2331, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10396:7:5", + "src": "10479:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25393,11 +25879,11 @@ }, { "constant": false, - "id": 2175, + "id": 2334, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10412:17:5", + "scope": 2373, + "src": "10495:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25405,10 +25891,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2174, + "id": 2333, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10412:4:5", + "src": "10495:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25419,11 +25905,11 @@ }, { "constant": false, - "id": 2177, + "id": 2336, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10431:10:5", + "scope": 2373, + "src": "10514:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25431,10 +25917,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2176, + "id": 2335, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10431:4:5", + "src": "10514:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25444,20 +25930,20 @@ "visibility": "internal" } ], - "src": "10395:47:5" + "src": "10478:47:7" }, "payable": false, "returnParameters": { - "id": 2181, + "id": 2340, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2180, + "id": 2339, "name": "", "nodeType": "VariableDeclaration", - "scope": 2213, - "src": "10466:4:5", + "scope": 2373, + "src": "10549:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25465,10 +25951,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2179, + "id": 2338, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10466:4:5", + "src": "10549:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25478,47 +25964,47 @@ "visibility": "internal" } ], - "src": "10465:6:5" + "src": "10548:6:7" }, - "scope": 2490, - "src": "10375:363:5", + "scope": 2653, + "src": "10458:367:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2242, + "id": 2402, "nodeType": "Block", - "src": "11017:142:5", + "src": "11104:142:7", "statements": [ { "assignments": [ - 2221 + 2381 ], "declarations": [ { "constant": false, - "id": 2221, + "id": 2381, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "11023:25:5", + "scope": 2403, + "src": "11110:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2220, + "id": 2380, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "11023:13:5", + "referencedDeclaration": 1707, + "src": "11110:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -25526,31 +26012,31 @@ "visibility": "internal" } ], - "id": 2225, + "id": 2385, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2222, + "id": 2382, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11051:9:5", + "referencedDeclaration": 1734, + "src": "11138:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2224, + "id": 2384, "indexExpression": { "argumentTypes": null, - "id": 2223, + "id": 2383, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2215, - "src": "11061:7:5", + "referencedDeclaration": 2375, + "src": "11148:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25561,14 +26047,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11051:18:5", + "src": "11138:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11023:46:5" + "src": "11110:46:7" }, { "expression": { @@ -25580,7 +26066,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2239, + "id": 2399, "isConstant": false, "isLValue": false, "isPure": false, @@ -25591,7 +26077,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2234, + "id": 2394, "isConstant": false, "isLValue": false, "isPure": false, @@ -25602,19 +26088,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2229, + "id": 2389, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2226, + "id": 2386, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11084:3:5", + "referencedDeclaration": 4155, + "src": "11171:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25626,32 +26112,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2227, + "id": 2387, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11090:4:5", + "referencedDeclaration": 2381, + "src": "11177:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2228, + "id": 2388, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "appExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 1547, - "src": "11090:14:5", + "referencedDeclaration": 1694, + "src": "11177:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11084:20:5", + "src": "11171:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25665,19 +26151,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2233, + "id": 2393, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2230, + "id": 2390, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11108:3:5", + "referencedDeclaration": 4155, + "src": "11195:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25689,38 +26175,38 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2231, + "id": 2391, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11114:4:5", + "referencedDeclaration": 2381, + "src": "11201:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2232, + "id": 2392, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "11114:14:5", + "referencedDeclaration": 1704, + "src": "11201:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11108:20:5", + "src": "11195:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11084:44:5", + "src": "11171:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25734,7 +26220,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2238, + "id": 2398, "isConstant": false, "isLValue": false, "isPure": false, @@ -25743,26 +26229,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2235, + "id": 2395, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2221, - "src": "11132:4:5", + "referencedDeclaration": 2381, + "src": "11219:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2236, + "id": 2396, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11132:16:5", + "referencedDeclaration": 1696, + "src": "11219:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25773,14 +26259,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2237, + "id": 2397, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11152:1:5", + "src": "11239:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -25788,41 +26274,41 @@ }, "value": "0" }, - "src": "11132:21:5", + "src": "11219:21:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11084:69:5", + "src": "11171:69:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 2240, + "id": 2400, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11083:71:5", + "src": "11170:71:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2219, - "id": 2241, + "functionReturnParameters": 2379, + "id": 2401, "nodeType": "Return", - "src": "11076:78:5" + "src": "11163:78:7" } ] }, "documentation": "@notice Determines whether a proposal passed its application stage without a challenge\n@param _propID The proposal ID for which to determine whether its application stage passed without a challenge", - "id": 2243, + "id": 2403, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25830,16 +26316,16 @@ "name": "canBeSet", "nodeType": "FunctionDefinition", "parameters": { - "id": 2216, + "id": 2376, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2215, + "id": 2375, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "10973:15:5", + "scope": 2403, + "src": "11060:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25847,10 +26333,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2214, + "id": 2374, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10973:7:5", + "src": "11060:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25860,20 +26346,20 @@ "visibility": "internal" } ], - "src": "10972:17:5" + "src": "11059:17:7" }, "payable": false, "returnParameters": { - "id": 2219, + "id": 2379, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2218, + "id": 2378, "name": "", "nodeType": "VariableDeclaration", - "scope": 2243, - "src": "11011:4:5", + "scope": 2403, + "src": "11098:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25881,10 +26367,10 @@ "typeString": "bool" }, "typeName": { - "id": 2217, + "id": 2377, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11011:4:5", + "src": "11098:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25894,19 +26380,19 @@ "visibility": "internal" } ], - "src": "11010:6:5" + "src": "11097:6:7" }, - "scope": 2490, - "src": "10955:204:5", + "scope": 2653, + "src": "11042:204:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2257, + "id": 2417, "nodeType": "Block", - "src": "11383:50:5", + "src": "11470:50:7", "statements": [ { "expression": { @@ -25915,7 +26401,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2255, + "id": 2415, "isConstant": false, "isLValue": false, "isPure": false, @@ -25926,26 +26412,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2250, + "id": 2410, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11396:9:5", + "referencedDeclaration": 1734, + "src": "11483:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2252, + "id": 2412, "indexExpression": { "argumentTypes": null, - "id": 2251, + "id": 2411, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2245, - "src": "11406:7:5", + "referencedDeclaration": 2405, + "src": "11493:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25956,21 +26442,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11396:18:5", + "src": "11483:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, - "id": 2253, + "id": 2413, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "11396:28:5", + "referencedDeclaration": 1704, + "src": "11483:28:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25981,14 +26467,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2254, + "id": 2414, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11427:1:5", + "src": "11514:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -25996,21 +26482,21 @@ }, "value": "0" }, - "src": "11396:32:5", + "src": "11483:32:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2249, - "id": 2256, + "functionReturnParameters": 2409, + "id": 2416, "nodeType": "Return", - "src": "11389:39:5" + "src": "11476:39:7" } ] }, "documentation": "@notice Determines whether a proposal exists for the provided proposal ID\n@param _propID The proposal ID whose existance is to be determined", - "id": 2258, + "id": 2418, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26018,16 +26504,16 @@ "name": "propExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 2246, + "id": 2406, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2245, + "id": 2405, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2258, - "src": "11339:15:5", + "scope": 2418, + "src": "11426:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26035,10 +26521,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2244, + "id": 2404, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11339:7:5", + "src": "11426:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26048,20 +26534,20 @@ "visibility": "internal" } ], - "src": "11338:17:5" + "src": "11425:17:7" }, "payable": false, "returnParameters": { - "id": 2249, + "id": 2409, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2248, + "id": 2408, "name": "", "nodeType": "VariableDeclaration", - "scope": 2258, - "src": "11377:4:5", + "scope": 2418, + "src": "11464:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26069,10 +26555,10 @@ "typeString": "bool" }, "typeName": { - "id": 2247, + "id": 2407, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11377:4:5", + "src": "11464:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26082,47 +26568,47 @@ "visibility": "internal" } ], - "src": "11376:6:5" + "src": "11463:6:7" }, - "scope": 2490, - "src": "11319:114:5", + "scope": 2653, + "src": "11406:114:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2295, + "id": 2455, "nodeType": "Block", - "src": "11676:225:5", + "src": "11763:225:7", "statements": [ { "assignments": [ - 2266 + 2426 ], "declarations": [ { "constant": false, - "id": 2266, + "id": 2426, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11682:25:5", + "scope": 2456, + "src": "11769:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2265, + "id": 2425, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "11682:13:5", + "referencedDeclaration": 1707, + "src": "11769:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -26130,31 +26616,31 @@ "visibility": "internal" } ], - "id": 2270, + "id": 2430, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2267, + "id": 2427, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "11710:9:5", + "referencedDeclaration": 1734, + "src": "11797:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2269, + "id": 2429, "indexExpression": { "argumentTypes": null, - "id": 2268, + "id": 2428, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2260, - "src": "11720:7:5", + "referencedDeclaration": 2420, + "src": "11807:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26165,42 +26651,42 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11710:18:5", + "src": "11797:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11682:46:5" + "src": "11769:46:7" }, { "assignments": [ - 2272 + 2432 ], "declarations": [ { "constant": false, - "id": 2272, + "id": 2432, "name": "challenge", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11734:26:5", + "scope": 2456, + "src": "11821:26:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_memory_ptr", "typeString": "struct Parameterizer.Challenge" }, "typeName": { "contractScope": null, - "id": 2271, + "id": 2431, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "11734:9:5", + "referencedDeclaration": 1722, + "src": "11821:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } }, @@ -26208,47 +26694,47 @@ "visibility": "internal" } ], - "id": 2277, + "id": 2437, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2273, + "id": 2433, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "11763:10:5", + "referencedDeclaration": 1730, + "src": "11850:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2276, + "id": 2436, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2274, + "id": 2434, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11774:4:5", + "referencedDeclaration": 2426, + "src": "11861:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2275, + "id": 2435, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11774:16:5", + "referencedDeclaration": 1696, + "src": "11861:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26259,14 +26745,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11763:28:5", + "src": "11850:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "11734:57:5" + "src": "11821:57:7" }, { "expression": { @@ -26278,7 +26764,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2292, + "id": 2452, "isConstant": false, "isLValue": false, "isPure": false, @@ -26289,7 +26775,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2286, + "id": 2446, "isConstant": false, "isLValue": false, "isPure": false, @@ -26300,7 +26786,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2281, + "id": 2441, "isConstant": false, "isLValue": false, "isPure": false, @@ -26309,26 +26795,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2278, + "id": 2438, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11806:4:5", + "referencedDeclaration": 2426, + "src": "11893:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2279, + "id": 2439, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11806:16:5", + "referencedDeclaration": 1696, + "src": "11893:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26339,14 +26825,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2280, + "id": 2440, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11825:1:5", + "src": "11912:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26354,7 +26840,7 @@ }, "value": "0" }, - "src": "11806:20:5", + "src": "11893:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26368,7 +26854,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2285, + "id": 2445, "isConstant": false, "isLValue": false, "isPure": false, @@ -26377,26 +26863,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2282, + "id": 2442, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2272, - "src": "11830:9:5", + "referencedDeclaration": 2432, + "src": "11917:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_memory_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_memory_ptr", "typeString": "struct Parameterizer.Challenge memory" } }, - "id": 2283, + "id": 2443, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "11830:18:5", + "referencedDeclaration": 1713, + "src": "11917:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26407,14 +26893,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2284, + "id": 2444, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "11852:5:5", + "src": "11939:5:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -26422,13 +26908,13 @@ }, "value": "false" }, - "src": "11830:27:5", + "src": "11917:27:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11806:51:5", + "src": "11893:51:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26443,26 +26929,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2289, + "id": 2449, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "11878:4:5", + "referencedDeclaration": 2426, + "src": "11965:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2290, + "id": 2450, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "11878:16:5", + "referencedDeclaration": 1696, + "src": "11965:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26478,32 +26964,32 @@ ], "expression": { "argumentTypes": null, - "id": 2287, + "id": 2447, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "11861:6:5", + "referencedDeclaration": 1738, + "src": "11948:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2288, + "id": 2448, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "11861:16:5", + "referencedDeclaration": 1334, + "src": "11948:16:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 2291, + "id": 2451, "isConstant": false, "isLValue": false, "isPure": false, @@ -26511,41 +26997,41 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11861:34:5", + "src": "11948:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11806:89:5", + "src": "11893:89:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 2293, + "id": 2453, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11805:91:5", + "src": "11892:91:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2264, - "id": 2294, + "functionReturnParameters": 2424, + "id": 2454, "nodeType": "Return", - "src": "11798:98:5" + "src": "11885:98:7" } ] }, "documentation": "@notice Determines whether the provided proposal ID has a challenge which can be resolved\n@param _propID The proposal ID whose challenge to inspect", - "id": 2296, + "id": 2456, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26553,16 +27039,16 @@ "name": "challengeCanBeResolved", "nodeType": "FunctionDefinition", "parameters": { - "id": 2261, + "id": 2421, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2260, + "id": 2420, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11632:15:5", + "scope": 2456, + "src": "11719:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26570,10 +27056,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2259, + "id": 2419, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11632:7:5", + "src": "11719:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26583,20 +27069,20 @@ "visibility": "internal" } ], - "src": "11631:17:5" + "src": "11718:17:7" }, "payable": false, "returnParameters": { - "id": 2264, + "id": 2424, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2263, + "id": 2423, "name": "", "nodeType": "VariableDeclaration", - "scope": 2296, - "src": "11670:4:5", + "scope": 2456, + "src": "11757:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26604,10 +27090,10 @@ "typeString": "bool" }, "typeName": { - "id": 2262, + "id": 2422, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11670:4:5", + "src": "11757:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26617,19 +27103,19 @@ "visibility": "internal" } ], - "src": "11669:6:5" + "src": "11756:6:7" }, - "scope": 2490, - "src": "11600:301:5", + "scope": 2653, + "src": "11687:301:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2331, + "id": 2494, "nodeType": "Block", - "src": "12146:293:5", + "src": "12233:302:7", "statements": [ { "condition": { @@ -26638,7 +27124,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2308, + "id": 2468, "isConstant": false, "isLValue": false, "isPure": false, @@ -26648,12 +27134,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2305, + "id": 2465, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12202:12:5", + "referencedDeclaration": 2458, + "src": "12289:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26669,32 +27155,32 @@ ], "expression": { "argumentTypes": null, - "id": 2303, + "id": 2463, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "12156:6:5", + "referencedDeclaration": 1738, + "src": "12243:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2304, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "12156:45:5", + "referencedDeclaration": 1313, + "src": "12243:45:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 2306, + "id": 2466, "isConstant": false, "isLValue": false, "isPure": false, @@ -26702,7 +27188,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12156:59:5", + "src": "12243:59:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26713,14 +27199,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2307, + "id": 2467, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12219:1:5", + "src": "12306:1:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26728,119 +27214,139 @@ }, "value": "0" }, - "src": "12156:64:5", + "src": "12243:64:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2317, + "id": 2478, "nodeType": "IfStatement", - "src": "12152:195:5", + "src": "12239:198:7", "trueBody": { - "id": 2316, + "id": 2477, "nodeType": "Block", - "src": "12222:125:5", + "src": "12309:128:7", "statements": [ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2314, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "32", - "id": 2309, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "12306:1:5", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 2310, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12310:10:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" - } + "hexValue": "32", + "id": 2474, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "12428:1:7", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" }, - "id": 2312, - "indexExpression": { + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + } + ], + "expression": { + "argumentTypes": null, + "expression": { "argumentTypes": null, - "id": 2311, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12321:12:5", + "baseExpression": { + "argumentTypes": null, + "id": 2469, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12393:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2471, + "indexExpression": { + "argumentTypes": null, + "id": 2470, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12404:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12393:24:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" } }, + "id": 2472, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12310:24:5", + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 1715, + "src": "12393:30:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2313, + "id": 2473, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "stake", + "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 1568, - "src": "12310:30:5", + "referencedDeclaration": 3832, + "src": "12393:34:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "12306:34:5", + "id": 2475, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12393:37:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2302, - "id": 2315, + "functionReturnParameters": 2462, + "id": 2476, "nodeType": "Return", - "src": "12299:41:5" + "src": "12386:44:7" } ] } @@ -26848,198 +27354,238 @@ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2329, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ - { + "arguments": [ + { + "argumentTypes": null, + "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "baseExpression": { + "argumentTypes": null, + "id": 2488, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12494:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } }, - "id": 2323, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "id": 2490, + "indexExpression": { "argumentTypes": null, - "hexValue": "32", - "id": 2318, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "12361:1:5", - "subdenomination": null, + "id": 2489, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12505:12:7", "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12494:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2491, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 1709, + "src": "12494:35:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "components": [ + { "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { + "arguments": [ + { "argumentTypes": null, - "id": 2319, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12365:10:5", + "hexValue": "32", + "id": 2484, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "12486:1:7", + "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" } - }, - "id": 2321, - "indexExpression": { + ], + "expression": { "argumentTypes": null, - "id": 2320, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12376:12:5", + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2479, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1730, + "src": "12451:10:7", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", + "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" + } + }, + "id": 2481, + "indexExpression": { + "argumentTypes": null, + "id": 2480, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2458, + "src": "12462:12:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "12451:24:7", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$1722_storage", + "typeString": "struct Parameterizer.Challenge storage ref" + } + }, + "id": 2482, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 1715, + "src": "12451:30:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, + "id": 2483, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12365:24:5", + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "12451:34:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2322, + "id": 2485, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "stake", - "nodeType": "MemberAccess", - "referencedDeclaration": 1568, - "src": "12365:30:5", + "names": [], + "nodeType": "FunctionCall", + "src": "12451:37:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "src": "12361:34:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "id": 2324, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "12360:36:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 2325, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "12399:10:5", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", - "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" - } - }, - "id": 2327, - "indexExpression": { - "argumentTypes": null, - "id": 2326, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2298, - "src": "12410:12:5", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" } - }, + ], + "id": 2486, "isConstant": false, - "isLValue": true, + "isInlineArray": false, + "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "12399:24:5", + "nodeType": "TupleExpression", + "src": "12450:39:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", - "typeString": "struct Parameterizer.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2328, + "id": 2487, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "rewardPool", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "12399:35:5", + "referencedDeclaration": 3866, + "src": "12450:43:7", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "12360:74:5", + "id": 2492, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12450:80:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2302, - "id": 2330, + "functionReturnParameters": 2462, + "id": 2493, "nodeType": "Return", - "src": "12353:81:5" + "src": "12443:87:7" } ] }, "documentation": "@notice Determines the number of tokens to awarded to the winning party in a challenge\n@param _challengeID The challengeID to determine a reward for", - "id": 2332, + "id": 2495, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27047,16 +27593,16 @@ "name": "challengeWinnerReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2299, + "id": 2459, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2298, + "id": 2458, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2332, - "src": "12100:17:5", + "scope": 2495, + "src": "12187:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27064,10 +27610,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2297, + "id": 2457, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12100:4:5", + "src": "12187:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27077,20 +27623,20 @@ "visibility": "internal" } ], - "src": "12099:19:5" + "src": "12186:19:7" }, "payable": false, "returnParameters": { - "id": 2302, + "id": 2462, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2301, + "id": 2461, "name": "", "nodeType": "VariableDeclaration", - "scope": 2332, - "src": "12140:4:5", + "scope": 2495, + "src": "12227:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27098,10 +27644,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2300, + "id": 2460, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12140:4:5", + "src": "12227:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27111,37 +27657,37 @@ "visibility": "internal" } ], - "src": "12139:6:5" + "src": "12226:6:7" }, - "scope": 2490, - "src": "12069:370:5", + "scope": 2653, + "src": "12156:379:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2348, + "id": 2511, "nodeType": "Block", - "src": "12655:60:5", + "src": "12751:60:7", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2339, + "id": 2502, "name": "params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "12668:6:5", + "referencedDeclaration": 1726, + "src": "12764:6:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" } }, - "id": 2346, + "id": 2509, "indexExpression": { "argumentTypes": null, "arguments": [ @@ -27150,12 +27696,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2343, + "id": 2506, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2334, - "src": "12702:5:5", + "referencedDeclaration": 2497, + "src": "12798:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -27171,18 +27717,18 @@ ], "expression": { "argumentTypes": null, - "id": 2341, + "id": 2504, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "12685:3:5", + "referencedDeclaration": 4140, + "src": "12781:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 2342, + "id": 2505, "isConstant": false, "isLValue": false, "isPure": true, @@ -27190,13 +27736,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12685:16:5", + "src": "12781:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 2344, + "id": 2507, "isConstant": false, "isLValue": false, "isPure": false, @@ -27204,7 +27750,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12685:23:5", + "src": "12781:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -27218,18 +27764,18 @@ "typeString": "bytes memory" } ], - "id": 2340, + "id": 2503, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "12675:9:5", + "referencedDeclaration": 4147, + "src": "12771:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 2345, + "id": 2508, "isConstant": false, "isLValue": false, "isPure": false, @@ -27237,7 +27783,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12675:34:5", + "src": "12771:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -27248,21 +27794,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12668:42:5", + "src": "12764:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2338, - "id": 2347, + "functionReturnParameters": 2501, + "id": 2510, "nodeType": "Return", - "src": "12661:49:5" + "src": "12757:49:7" } ] }, "documentation": "@notice gets the parameter keyed by the provided name value from the params mapping\n@param _name the key whose value is to be determined", - "id": 2349, + "id": 2512, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27270,16 +27816,16 @@ "name": "get", "nodeType": "FunctionDefinition", "parameters": { - "id": 2335, + "id": 2498, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2334, + "id": 2497, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2349, - "src": "12608:12:5", + "scope": 2512, + "src": "12704:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27287,10 +27833,10 @@ "typeString": "string" }, "typeName": { - "id": 2333, + "id": 2496, "name": "string", "nodeType": "ElementaryTypeName", - "src": "12608:6:5", + "src": "12704:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -27300,20 +27846,20 @@ "visibility": "internal" } ], - "src": "12607:14:5" + "src": "12703:14:7" }, "payable": false, "returnParameters": { - "id": 2338, + "id": 2501, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2337, + "id": 2500, "name": "value", "nodeType": "VariableDeclaration", - "scope": 2349, - "src": "12643:10:5", + "scope": 2512, + "src": "12739:10:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27321,10 +27867,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2336, + "id": 2499, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12643:4:5", + "src": "12739:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27334,19 +27880,19 @@ "visibility": "internal" } ], - "src": "12642:12:5" + "src": "12738:12:7" }, - "scope": 2490, - "src": "12595:120:5", + "scope": 2653, + "src": "12691:120:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2365, + "id": 2528, "nodeType": "Block", - "src": "13013:62:5", + "src": "13109:62:7", "statements": [ { "expression": { @@ -27357,26 +27903,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2358, + "id": 2521, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "13026:10:5", + "referencedDeclaration": 1730, + "src": "13122:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2360, + "id": 2523, "indexExpression": { "argumentTypes": null, - "id": 2359, + "id": 2522, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2351, - "src": "13037:12:5", + "referencedDeclaration": 2514, + "src": "13133:12:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27387,35 +27933,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13026:24:5", + "src": "13122:24:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2361, + "id": 2524, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 1574, - "src": "13026:36:5", + "referencedDeclaration": 1721, + "src": "13122:36:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2363, + "id": 2526, "indexExpression": { "argumentTypes": null, - "id": 2362, + "id": 2525, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2353, - "src": "13063:6:5", + "referencedDeclaration": 2516, + "src": "13159:6:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27426,21 +27972,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13026:44:5", + "src": "13122:44:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2357, - "id": 2364, + "functionReturnParameters": 2520, + "id": 2527, "nodeType": "Return", - "src": "13019:51:5" + "src": "13115:51:7" } ] }, "documentation": "@dev Getter for Challenge tokenClaims mappings\n@param _challengeID The challengeID to query\n@param _voter The voter whose claim status to query for the provided challengeID", - "id": 2366, + "id": 2529, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27448,16 +27994,16 @@ "name": "tokenClaims", "nodeType": "FunctionDefinition", "parameters": { - "id": 2354, + "id": 2517, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2351, + "id": 2514, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "12951:17:5", + "scope": 2529, + "src": "13047:17:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27465,10 +28011,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2350, + "id": 2513, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12951:4:5", + "src": "13047:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27479,11 +28025,11 @@ }, { "constant": false, - "id": 2353, + "id": 2516, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "12970:14:5", + "scope": 2529, + "src": "13066:14:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27491,10 +28037,10 @@ "typeString": "address" }, "typeName": { - "id": 2352, + "id": 2515, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12970:7:5", + "src": "13066:7:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27504,20 +28050,20 @@ "visibility": "internal" } ], - "src": "12950:35:5" + "src": "13046:35:7" }, "payable": false, "returnParameters": { - "id": 2357, + "id": 2520, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2356, + "id": 2519, "name": "", "nodeType": "VariableDeclaration", - "scope": 2366, - "src": "13007:4:5", + "scope": 2529, + "src": "13103:4:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27525,10 +28071,10 @@ "typeString": "bool" }, "typeName": { - "id": 2355, + "id": 2518, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13007:4:5", + "src": "13103:4:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27538,47 +28084,47 @@ "visibility": "internal" } ], - "src": "13006:6:5" + "src": "13102:6:7" }, - "scope": 2490, - "src": "12930:145:5", + "scope": 2653, + "src": "13026:145:7", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2469, + "id": 2632, "nodeType": "Block", - "src": "13403:1025:5", + "src": "13499:1025:7", "statements": [ { "assignments": [ - 2372 + 2535 ], "declarations": [ { "constant": false, - "id": 2372, + "id": 2535, "name": "prop", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13409:25:5", + "scope": 2633, + "src": "13505:25:7", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal" }, "typeName": { "contractScope": null, - "id": 2371, + "id": 2534, "name": "ParamProposal", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1560, - "src": "13409:13:5", + "referencedDeclaration": 1707, + "src": "13505:13:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage_ptr", "typeString": "struct Parameterizer.ParamProposal" } }, @@ -27586,31 +28132,31 @@ "visibility": "internal" } ], - "id": 2376, + "id": 2539, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2373, + "id": 2536, "name": "proposals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1587, - "src": "13437:9:5", + "referencedDeclaration": 1734, + "src": "13533:9:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1560_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_ParamProposal_$1707_storage_$", "typeString": "mapping(bytes32 => struct Parameterizer.ParamProposal storage ref)" } }, - "id": 2375, + "id": 2538, "indexExpression": { "argumentTypes": null, - "id": 2374, + "id": 2537, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "13447:7:5", + "referencedDeclaration": 2531, + "src": "13543:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -27621,42 +28167,42 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13437:18:5", + "src": "13533:18:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_storage", + "typeIdentifier": "t_struct$_ParamProposal_$1707_storage", "typeString": "struct Parameterizer.ParamProposal storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "13409:46:5" + "src": "13505:46:7" }, { "assignments": [ - 2378 + 2541 ], "declarations": [ { "constant": false, - "id": 2378, + "id": 2541, "name": "challenge", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13461:27:5", + "scope": 2633, + "src": "13557:27:7", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" }, "typeName": { "contractScope": null, - "id": 2377, + "id": 2540, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1575, - "src": "13461:9:5", + "referencedDeclaration": 1722, + "src": "13557:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge" } }, @@ -27664,47 +28210,47 @@ "visibility": "internal" } ], - "id": 2383, + "id": 2546, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2379, + "id": 2542, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "13491:10:5", + "referencedDeclaration": 1730, + "src": "13587:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2382, + "id": 2545, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2380, + "id": 2543, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13502:4:5", + "referencedDeclaration": 2535, + "src": "13598:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2381, + "id": 2544, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13502:16:5", + "referencedDeclaration": 1696, + "src": "13598:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27715,27 +28261,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13491:28:5", + "src": "13587:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "13461:58:5" + "src": "13557:58:7" }, { "assignments": [ - 2385 + 2548 ], "declarations": [ { "constant": false, - "id": 2385, + "id": 2548, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13611:11:5", + "scope": 2633, + "src": "13707:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27743,10 +28289,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2384, + "id": 2547, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13611:4:5", + "src": "13707:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27756,7 +28302,7 @@ "visibility": "internal" } ], - "id": 2390, + "id": 2553, "initialValue": { "argumentTypes": null, "arguments": [ @@ -27764,26 +28310,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2387, + "id": 2550, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13647:4:5", + "referencedDeclaration": 2535, + "src": "13743:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2388, + "id": 2551, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13647:16:5", + "referencedDeclaration": 1696, + "src": "13743:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27797,18 +28343,18 @@ "typeString": "uint256" } ], - "id": 2386, + "id": 2549, "name": "challengeWinnerReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2332, - "src": "13625:21:5", + "referencedDeclaration": 2495, + "src": "13721:21:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view returns (uint256)" } }, - "id": 2389, + "id": 2552, "isConstant": false, "isLValue": false, "isPure": false, @@ -27816,19 +28362,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13625:39:5", + "src": "13721:39:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "13611:53:5" + "src": "13707:53:7" }, { "expression": { "argumentTypes": null, - "id": 2399, + "id": 2562, "isConstant": false, "isLValue": false, "isPure": false, @@ -27837,26 +28383,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2391, + "id": 2554, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "13671:9:5", + "referencedDeclaration": 2541, + "src": "13767:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2393, + "id": 2556, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "13671:23:5", + "referencedDeclaration": 1717, + "src": "13767:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27871,26 +28417,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2396, + "id": 2559, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13743:4:5", + "referencedDeclaration": 2535, + "src": "13839:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2397, + "id": 2560, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13743:16:5", + "referencedDeclaration": 1696, + "src": "13839:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27906,32 +28452,32 @@ ], "expression": { "argumentTypes": null, - "id": 2394, + "id": 2557, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "13697:6:5", + "referencedDeclaration": 1738, + "src": "13793:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2395, + "id": 2558, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "13697:45:5", + "referencedDeclaration": 1313, + "src": "13793:45:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 2398, + "id": 2561, "isConstant": false, "isLValue": false, "isPure": false, @@ -27939,26 +28485,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13697:63:5", + "src": "13793:63:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13671:89:5", + "src": "13767:89:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2400, + "id": 2563, "nodeType": "ExpressionStatement", - "src": "13671:89:5" + "src": "13767:89:7" }, { "expression": { "argumentTypes": null, - "id": 2405, + "id": 2568, "isConstant": false, "isLValue": false, "isPure": false, @@ -27967,26 +28513,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2401, + "id": 2564, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "13766:9:5", + "referencedDeclaration": 2541, + "src": "13862:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2403, + "id": 2566, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 1566, - "src": "13766:18:5", + "referencedDeclaration": 1713, + "src": "13862:18:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27997,14 +28543,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2404, + "id": 2567, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "13787:4:5", + "src": "13883:4:7", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -28012,15 +28558,15 @@ }, "value": "true" }, - "src": "13766:25:5", + "src": "13862:25:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2406, + "id": 2569, "nodeType": "ExpressionStatement", - "src": "13766:25:5" + "src": "13862:25:7" }, { "condition": { @@ -28030,26 +28576,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2409, + "id": 2572, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13818:4:5", + "referencedDeclaration": 2535, + "src": "13914:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2410, + "id": 2573, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13818:16:5", + "referencedDeclaration": 1696, + "src": "13914:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28065,32 +28611,32 @@ ], "expression": { "argumentTypes": null, - "id": 2407, + "id": 2570, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1591, - "src": "13802:6:5", + "referencedDeclaration": 1738, + "src": "13898:6:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2408, + "id": 2571, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "isPassed", "nodeType": "MemberAccess", - "referencedDeclaration": 1138, - "src": "13802:15:5", + "referencedDeclaration": 1285, + "src": "13898:15:7", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 2411, + "id": 2574, "isConstant": false, "isLValue": false, "isPure": false, @@ -28098,16 +28644,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13802:33:5", + "src": "13898:33:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2467, + "id": 2630, "nodeType": "Block", - "src": "14147:277:5", + "src": "14243:277:7", "statements": [ { "eventCall": { @@ -28115,12 +28661,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2446, + "id": 2609, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "14232:7:5", + "referencedDeclaration": 2531, + "src": "14328:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28130,26 +28676,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2447, + "id": 2610, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14249:4:5", + "referencedDeclaration": 2535, + "src": "14345:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2448, + "id": 2611, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "14249:16:5", + "referencedDeclaration": 1696, + "src": "14345:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28159,26 +28705,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2449, + "id": 2612, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14275:9:5", + "referencedDeclaration": 2541, + "src": "14371:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2450, + "id": 2613, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "14275:20:5", + "referencedDeclaration": 1709, + "src": "14371:20:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28188,26 +28734,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2451, + "id": 2614, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14305:9:5", + "referencedDeclaration": 2541, + "src": "14401:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2452, + "id": 2615, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "14305:23:5", + "referencedDeclaration": 1717, + "src": "14401:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28233,18 +28779,18 @@ "typeString": "uint256" } ], - "id": 2445, + "id": 2608, "name": "_ChallengeSucceeded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1524, - "src": "14203:19:5", + "referencedDeclaration": 1671, + "src": "14299:19:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 2453, + "id": 2616, "isConstant": false, "isLValue": false, "isPure": false, @@ -28252,15 +28798,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14203:133:5", + "src": "14299:133:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2454, + "id": 2617, "nodeType": "EmitStatement", - "src": "14198:138:5" + "src": "14294:138:7" }, { "expression": { @@ -28275,42 +28821,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2458, + "id": 2621, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "14368:10:5", + "referencedDeclaration": 1730, + "src": "14464:10:7", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1575_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$1722_storage_$", "typeString": "mapping(uint256 => struct Parameterizer.Challenge storage ref)" } }, - "id": 2461, + "id": 2624, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2459, + "id": 2622, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14379:4:5", + "referencedDeclaration": 2535, + "src": "14475:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2460, + "id": 2623, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "14379:16:5", + "referencedDeclaration": 1696, + "src": "14475:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28321,21 +28867,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14368:28:5", + "src": "14464:28:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage", + "typeIdentifier": "t_struct$_Challenge_$1722_storage", "typeString": "struct Parameterizer.Challenge storage ref" } }, - "id": 2462, + "id": 2625, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challenger", "nodeType": "MemberAccess", - "referencedDeclaration": 1564, - "src": "14368:39:5", + "referencedDeclaration": 1711, + "src": "14464:39:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28343,12 +28889,12 @@ }, { "argumentTypes": null, - "id": 2463, + "id": 2626, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "14409:6:5", + "referencedDeclaration": 2548, + "src": "14505:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28368,32 +28914,32 @@ ], "expression": { "argumentTypes": null, - "id": 2456, + "id": 2619, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "14353:5:5", + "referencedDeclaration": 1736, + "src": "14449:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2457, + "id": 2620, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "14353:14:5", + "referencedDeclaration": 551, + "src": "14449:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2464, + "id": 2627, "isConstant": false, "isLValue": false, "isPure": false, @@ -28401,7 +28947,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14353:63:5", + "src": "14449:63:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28415,21 +28961,21 @@ "typeString": "bool" } ], - "id": 2455, + "id": 2618, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "14345:7:5", + "referencedDeclaration": 4156, + "src": "14441:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2465, + "id": 2628, "isConstant": false, "isLValue": false, "isPure": false, @@ -28437,25 +28983,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14345:72:5", + "src": "14441:72:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2466, + "id": 2629, "nodeType": "ExpressionStatement", - "src": "14345:72:5" + "src": "14441:72:7" } ] }, - "id": 2468, + "id": 2631, "nodeType": "IfStatement", - "src": "13798:626:5", + "src": "13894:626:7", "trueBody": { - "id": 2444, + "id": 2607, "nodeType": "Block", - "src": "13837:304:5", + "src": "13933:304:7", "statements": [ { "condition": { @@ -28464,7 +29010,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2415, + "id": 2578, "isConstant": false, "isLValue": false, "isPure": false, @@ -28473,26 +29019,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2412, + "id": 2575, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13873:4:5", + "referencedDeclaration": 2535, + "src": "13969:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2413, + "id": 2576, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "processBy", "nodeType": "MemberAccess", - "referencedDeclaration": 1557, - "src": "13873:14:5", + "referencedDeclaration": 1704, + "src": "13969:14:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28502,31 +29048,31 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 2414, + "id": 2577, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "13890:3:5", + "referencedDeclaration": 4155, + "src": "13986:3:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13873:20:5", + "src": "13969:20:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2424, + "id": 2587, "nodeType": "IfStatement", - "src": "13869:71:5", + "src": "13965:71:7", "trueBody": { - "id": 2423, + "id": 2586, "nodeType": "Block", - "src": "13895:45:5", + "src": "13991:45:7", "statements": [ { "expression": { @@ -28536,26 +29082,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2417, + "id": 2580, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13909:4:5", + "referencedDeclaration": 2535, + "src": "14005:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2418, + "id": 2581, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "name", "nodeType": "MemberAccess", - "referencedDeclaration": 1553, - "src": "13909:9:5", + "referencedDeclaration": 1700, + "src": "14005:9:7", "typeDescriptions": { "typeIdentifier": "t_string_memory", "typeString": "string memory" @@ -28565,26 +29111,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2419, + "id": 2582, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13920:4:5", + "referencedDeclaration": 2535, + "src": "14016:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2420, + "id": 2583, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 1559, - "src": "13920:10:5", + "referencedDeclaration": 1706, + "src": "14016:10:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28602,18 +29148,18 @@ "typeString": "uint256" } ], - "id": 2416, + "id": 2579, "name": "set", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2489, - "src": "13905:3:5", + "referencedDeclaration": 2652, + "src": "14001:3:7", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$__$", "typeString": "function (string memory,uint256)" } }, - "id": 2421, + "id": 2584, "isConstant": false, "isLValue": false, "isPure": false, @@ -28621,15 +29167,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13905:26:5", + "src": "14001:26:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2422, + "id": 2585, "nodeType": "ExpressionStatement", - "src": "13905:26:5" + "src": "14001:26:7" } ] } @@ -28640,12 +29186,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2426, + "id": 2589, "name": "_propID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2368, - "src": "13978:7:5", + "referencedDeclaration": 2531, + "src": "14074:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28655,26 +29201,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2427, + "id": 2590, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "13995:4:5", + "referencedDeclaration": 2535, + "src": "14091:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2428, + "id": 2591, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 1549, - "src": "13995:16:5", + "referencedDeclaration": 1696, + "src": "14091:16:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28684,26 +29230,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2429, + "id": 2592, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14021:9:5", + "referencedDeclaration": 2541, + "src": "14117:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2430, + "id": 2593, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 1562, - "src": "14021:20:5", + "referencedDeclaration": 1709, + "src": "14117:20:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28713,26 +29259,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2431, + "id": 2594, "name": "challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2378, - "src": "14051:9:5", + "referencedDeclaration": 2541, + "src": "14147:9:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$1575_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$1722_storage_ptr", "typeString": "struct Parameterizer.Challenge storage pointer" } }, - "id": 2432, + "id": 2595, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "winningTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1570, - "src": "14051:23:5", + "referencedDeclaration": 1717, + "src": "14147:23:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28758,18 +29304,18 @@ "typeString": "uint256" } ], - "id": 2425, + "id": 2588, "name": "_ChallengeFailed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1534, - "src": "13952:16:5", + "referencedDeclaration": 1681, + "src": "14048:16:7", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 2433, + "id": 2596, "isConstant": false, "isLValue": false, "isPure": false, @@ -28777,15 +29323,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13952:130:5", + "src": "14048:130:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2434, + "id": 2597, "nodeType": "EmitStatement", - "src": "13947:135:5" + "src": "14043:135:7" }, { "expression": { @@ -28798,26 +29344,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2438, + "id": 2601, "name": "prop", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2372, - "src": "14114:4:5", + "referencedDeclaration": 2535, + "src": "14210:4:7", "typeDescriptions": { - "typeIdentifier": "t_struct$_ParamProposal_$1560_memory_ptr", + "typeIdentifier": "t_struct$_ParamProposal_$1707_memory_ptr", "typeString": "struct Parameterizer.ParamProposal memory" } }, - "id": 2439, + "id": 2602, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 1555, - "src": "14114:10:5", + "referencedDeclaration": 1702, + "src": "14210:10:7", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28825,12 +29371,12 @@ }, { "argumentTypes": null, - "id": 2440, + "id": 2603, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "14126:6:5", + "referencedDeclaration": 2548, + "src": "14222:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28850,32 +29396,32 @@ ], "expression": { "argumentTypes": null, - "id": 2436, + "id": 2599, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1589, - "src": "14099:5:5", + "referencedDeclaration": 1736, + "src": "14195:5:7", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2437, + "id": 2600, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "14099:14:5", + "referencedDeclaration": 551, + "src": "14195:14:7", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2441, + "id": 2604, "isConstant": false, "isLValue": false, "isPure": false, @@ -28883,7 +29429,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14099:34:5", + "src": "14195:34:7", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28897,21 +29443,21 @@ "typeString": "bool" } ], - "id": 2435, + "id": 2598, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "14091:7:5", + "referencedDeclaration": 4156, + "src": "14187:7:7", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2442, + "id": 2605, "isConstant": false, "isLValue": false, "isPure": false, @@ -28919,15 +29465,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14091:43:5", + "src": "14187:43:7", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2443, + "id": 2606, "nodeType": "ExpressionStatement", - "src": "14091:43:5" + "src": "14187:43:7" } ] } @@ -28935,7 +29481,7 @@ ] }, "documentation": "@dev resolves a challenge for the provided _propID. It must be checked in advance whether the _propID has a challenge on it\n@param _propID the proposal ID whose challenge is to be resolved.", - "id": 2470, + "id": 2633, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -28943,16 +29489,16 @@ "name": "resolveChallenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 2369, + "id": 2532, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2368, + "id": 2531, "name": "_propID", "nodeType": "VariableDeclaration", - "scope": 2470, - "src": "13378:15:5", + "scope": 2633, + "src": "13474:15:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28960,10 +29506,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2367, + "id": 2530, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13378:7:5", + "src": "13474:7:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28973,31 +29519,31 @@ "visibility": "internal" } ], - "src": "13377:17:5" + "src": "13473:17:7" }, "payable": false, "returnParameters": { - "id": 2370, + "id": 2533, "nodeType": "ParameterList", "parameters": [], - "src": "13403:0:5" + "src": "13499:0:7" }, - "scope": 2490, - "src": "13352:1076:5", + "scope": 2653, + "src": "13448:1076:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2488, + "id": 2651, "nodeType": "Block", - "src": "14662:62:5", + "src": "14758:62:7", "statements": [ { "expression": { "argumentTypes": null, - "id": 2486, + "id": 2649, "isConstant": false, "isLValue": false, "isPure": false, @@ -29006,18 +29552,18 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2477, + "id": 2640, "name": "params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "14668:6:5", + "referencedDeclaration": 1726, + "src": "14764:6:7", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_uint256_$", "typeString": "mapping(bytes32 => uint256)" } }, - "id": 2484, + "id": 2647, "indexExpression": { "argumentTypes": null, "arguments": [ @@ -29026,12 +29572,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2481, + "id": 2644, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2472, - "src": "14702:5:5", + "referencedDeclaration": 2635, + "src": "14798:5:7", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" @@ -29047,18 +29593,18 @@ ], "expression": { "argumentTypes": null, - "id": 2479, + "id": 2642, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, - "src": "14685:3:5", + "referencedDeclaration": 4140, + "src": "14781:3:7", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 2480, + "id": 2643, "isConstant": false, "isLValue": false, "isPure": true, @@ -29066,13 +29612,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14685:16:5", + "src": "14781:16:7", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 2482, + "id": 2645, "isConstant": false, "isLValue": false, "isPure": false, @@ -29080,7 +29626,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14685:23:5", + "src": "14781:23:7", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -29094,18 +29640,18 @@ "typeString": "bytes memory" } ], - "id": 2478, + "id": 2641, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3696, - "src": "14675:9:5", + "referencedDeclaration": 4147, + "src": "14771:9:7", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 2483, + "id": 2646, "isConstant": false, "isLValue": false, "isPure": false, @@ -29113,7 +29659,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14675:34:5", + "src": "14771:34:7", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29124,7 +29670,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "14668:42:5", + "src": "14764:42:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29134,31 +29680,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2485, + "id": 2648, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2474, - "src": "14713:6:5", + "referencedDeclaration": 2637, + "src": "14809:6:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "14668:51:5", + "src": "14764:51:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2487, + "id": 2650, "nodeType": "ExpressionStatement", - "src": "14668:51:5" + "src": "14764:51:7" } ] }, "documentation": "@dev sets the param keted by the provided name to the provided value\n@param _name the name of the param to be set\n@param _value the value to set the param to be set", - "id": 2489, + "id": 2652, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -29166,16 +29712,16 @@ "name": "set", "nodeType": "FunctionDefinition", "parameters": { - "id": 2475, + "id": 2638, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2472, + "id": 2635, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2489, - "src": "14627:12:5", + "scope": 2652, + "src": "14723:12:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29183,10 +29729,10 @@ "typeString": "string" }, "typeName": { - "id": 2471, + "id": 2634, "name": "string", "nodeType": "ElementaryTypeName", - "src": "14627:6:5", + "src": "14723:6:7", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -29197,11 +29743,11 @@ }, { "constant": false, - "id": 2474, + "id": 2637, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 2489, - "src": "14641:11:5", + "scope": 2652, + "src": "14737:11:7", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29209,10 +29755,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2473, + "id": 2636, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14641:4:5", + "src": "14737:4:7", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29222,27 +29768,27 @@ "visibility": "internal" } ], - "src": "14626:27:5" + "src": "14722:27:7" }, "payable": false, "returnParameters": { - "id": 2476, + "id": 2639, "nodeType": "ParameterList", "parameters": [], - "src": "14662:0:5" + "src": "14758:0:7" }, - "scope": 2490, - "src": "14614:110:5", + "scope": 2653, + "src": "14710:110:7", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 2491, - "src": "101:14625:5" + "scope": 2654, + "src": "101:14721:7" } ], - "src": "0:14727:5" + "src": "0:14823:7" }, "compiler": { "name": "solc", @@ -29250,5 +29796,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.369Z" + "updatedAt": "2018-06-26T02:58:22.334Z" } \ No newline at end of file diff --git a/build/contracts/Registry.json b/build/contracts/Registry.json index 67a8a39..118533d 100644 --- a/build/contracts/Registry.json +++ b/build/contracts/Registry.json @@ -701,73 +701,73 @@ "type": "function" } ], - "bytecode": "0x60806040523480156200001157600080fd5b50604051620033da380380620033da8339810180604052810190808051906020019092919080519060200190929190805190602001909291908051820192919050505083600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600590805190602001906200012f9291906200013a565b5050505050620001e9565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017d57805160ff1916838001178555620001ae565b82800160010185558215620001ae579182015b82811115620001ad57825182559160200191906001019062000190565b5b509050620001bd9190620001c1565b5090565b620001e691905b80821115620001e2576000816000905550600101620001c8565b5090565b90565b6131e180620001f96000396000f30060806040526004361061011d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806301a5e3fe14610122578063040cf0201461016b57806306fdde03146101a65780630ca36263146102365780631b7bbecb146102675780631de26e16146102b057806343cffefe146102eb578063691a38ab1461034857806377609a411461039157806386bb8f37146103da57806389bb55c7146104115780638a59eb56146104645780638cf8151f146104955780638f1d3776146104de578063a5ba3b1e1461056b578063a7aad3db146105d0578063c18b8db41461063b578063c8187cf1146106cc578063e1e3f9151461070d578063fc0c546a14610764578063fce1ccca146107bb575b600080fd5b34801561012e57600080fd5b506101516004803603810190808035600019169060200190929190505050610812565b604051808215151515815260200191505060405180910390f35b34801561017757600080fd5b506101a4600480360381019080803560001916906020019092919080359060200190929190505050610847565b005b3480156101b257600080fd5b506101bb610b69565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101fb5780820151818401526020810190506101e0565b50505050905090810190601f1680156102285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561024257600080fd5b506102656004803603810190808035600019169060200190929190505050610c07565b005b34801561027357600080fd5b506102966004803603810190808035600019169060200190929190505050610d17565b604051808215151515815260200191505060405180910390f35b3480156102bc57600080fd5b506102e9600480360381019080803560001916906020019092919080359060200190929190505050610d91565b005b3480156102f757600080fd5b506103326004803603810190808035600019169060200190929190803590602001908201803590602001919091929391929390505050610fc3565b6040518082815260200191505060405180910390f35b34801561035457600080fd5b506103776004803603810190808035600019169060200190929190505050611a51565b604051808215151515815260200191505060405180910390f35b34801561039d57600080fd5b506103c06004803603810190808035600019169060200190929190505050611b0f565b604051808215151515815260200191505060405180910390f35b3480156103e657600080fd5b5061040f6004803603810190808035906020019092919080359060200190929190505050611c1b565b005b34801561041d57600080fd5b50610462600480360381019080803560001916906020019092919080359060200190929190803590602001908201803590602001919091929391929390505050611fed565b005b34801561047057600080fd5b50610493600480360381019080803560001916906020019092919050505061248f565b005b3480156104a157600080fd5b506104c460048036038101908080356000191690602001909291905050506124d0565b604051808215151515815260200191505060405180910390f35b3480156104ea57600080fd5b50610509600480360381019080803590602001909291905050506124fa565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b34801561057757600080fd5b506105b660048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061255d565b604051808215151515815260200191505060405180910390f35b3480156105dc57600080fd5b50610625600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291905050506125c7565b6040518082815260200191505060405180910390f35b34801561064757600080fd5b5061066a6004803603810190808035600019169060200190929190505050612721565b60405180868152602001851515151581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019550505050505060405180910390f35b3480156106d857600080fd5b506106f760048036038101908080359060200190929190505050612784565b6040518082815260200191505060405180910390f35b34801561071957600080fd5b506107226129b5565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561077057600080fd5b506107796129db565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156107c757600080fd5b506107d0612a01565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900460ff169050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156108c457600080fd5b806002015482111515156108d757600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561099957600080fd5b505af11580156109ad573d6000803e3d6000fd5b505050506040513d60208110156109c357600080fd5b810190808051906020019092919050505082826002015403101515156109e857600080fd5b818160020160008282540392505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610abf57600080fd5b505af1158015610ad3573d6000803e3d6000fd5b505050506040513d6020811015610ae957600080fd5b81019080805190602001909291905050501515610b0557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167f9d9ed58779badf90c56d72f3b54def9f73dc875d8f86416c8334b55328c6c106848460020154604051808381526020018281526020019250505060405180910390a3505050565b60058054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610bff5780601f10610bd457610100808354040283529160200191610bff565b820191906000526020600020905b815481529060010190602001808311610be257829003601f168201915b505050505081565b600060016000836000191660001916815260200190815260200160002090508060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610c8457600080fd5b610c8d82610812565b1515610c9857600080fd5b600081600301541480610cce57506000808260030154815260200190815260200160002060010160149054906101000a900460ff165b1515610cd957600080fd5b610ce282612a27565b81600019167f8a51904a50ce4451be09dc08242bd2d5565b05cf0f4f5aa88c77f96fdf538b4260405160405180910390a25050565b600080600160008460001916600019168152602001908152602001600020600301549050600060016000856000191660001916815260200190815260200160002060030154118015610d89575060008082815260200190815260200160002060010160149054906101000a900460ff16155b915050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610e0e57600080fd5b818160020160008282540192505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015610f1957600080fd5b505af1158015610f2d573d6000803e3d6000fd5b505050506040513d6020811015610f4357600080fd5b81019080805190602001909291905050501515610f5f57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167ff63fcfb210c709154f0260502b2586fcee5550d17dc828be3127ccdedec620ab848460020154604051808381526020018281526020019250505060405180910390a3505050565b600080600080600080600160008a600019166000191681526020019081526020016000209450600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156110ab57600080fd5b505af11580156110bf573d6000803e3d6000fd5b505050506040513d60208110156110d557600080fd5b810190808051906020019092919050505093506110f1896124d0565b8061110a57508460010160009054906101000a900460ff165b151561111557600080fd5b60008560030154148061114b57506000808660030154815260200190815260200160002060010160149054906101000a900460ff165b151561115657600080fd5b83856002015410156111a55761116b89612a27565b88600019167f4a9ee335af9e32f32f2229943dc7a0d3b5adf7e4c5c4062b372eae8c476d928660405160405180910390a260009550611a45565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d60600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f766f746551756f72756d00000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156112a557600080fd5b505af11580156112b9573d6000803e3d6000fd5b505050506040513d60208110156112cf57600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f636f6d6d697453746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156113a257600080fd5b505af11580156113b6573d6000803e3d6000fd5b505050506040513d60208110156113cc57600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f72657665616c53746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561149f57600080fd5b505af11580156114b3573d6000803e3d6000fd5b505050506040513d60208110156114c957600080fd5b81019080805190602001909291905050506040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561153a57600080fd5b505af115801561154e573d6000803e3d6000fd5b505050506040513d602081101561156457600080fd5b8101908080519060200190929190505050925060a060405190810160405280606486600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600f8152602001807f64697370656e736174696f6e5063740000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561164857600080fd5b505af115801561165c573d6000803e3d6000fd5b505050506040513d602081101561167257600080fd5b81019080805190602001909291905050506064030281151561169057fe5b0481526020013373ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200185815260200160008152506000808581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff0219169083151502179055506060820151816002015560808201518160030155905050828560030181905550838560020160008282540392505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561187457600080fd5b505af1158015611888573d6000803e3d6000fd5b505050506040513d602081101561189e57600080fd5b810190808051906020019092919050505015156118ba57600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b15801561194b57600080fd5b505af115801561195f573d6000803e3d6000fd5b505050506040513d60a081101561197557600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1689600019167ff98a08756a3603420a080d66764f73deb1e30896c315cfed03e17f88f5eb30f7858b8b8787604051808681526020018060200184815260200183815260200182810382528686828181526020019250808284378201915050965050505050505060405180910390a38295505b50505050509392505050565b600080600160008460001916600019168152602001908152602001600020600301549050611a7e836124d0565b8015611aa757504260016000856000191660001916815260200190815260200160002060000154105b8015611ab95750611ab783610812565b155b8015611af657506000811480611af557506001151560008083815260200190815260200160002060010160149054906101000a900460ff161515145b5b15611b045760019150611b09565b600091505b50919050565b600080600160008460001916600019168152602001908152602001600020600301549050611b3c83610d17565b1515611b4757600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830826040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015611bd857600080fd5b505af1158015611bec573d6000803e3d6000fd5b505050506040513d6020811015611c0257600080fd5b8101908080519060200190929190505050915050919050565b6000806000151560008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611c9057600080fd5b6001151560008086815260200190815260200160002060010160149054906101000a900460ff161515141515611cc557600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611d9257600080fd5b505af1158015611da6573d6000803e3d6000fd5b505050506040513d6020811015611dbc57600080fd5b81019080805190602001909291905050509150611dda3385856125c7565b905081600080868152602001908152602001600020600301600082825403925050819055508060008086815260200190815260200160002060000160008282540392505081905550600160008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611f5257600080fd5b505af1158015611f66573d6000803e3d6000fd5b505050506040513d6020811015611f7c57600080fd5b81019080805190602001909291905050501515611f9857600080fd5b3373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a350505050565b6000611ff885610812565b15151561200457600080fd5b61200d856124d0565b15151561201957600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156120db57600080fd5b505af11580156120ef573d6000803e3d6000fd5b505050506040513d602081101561210557600080fd5b8101908080519060200190929190505050841015151561212457600080fd5b6001600086600019166000191681526020019081526020016000209050338160010160016101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550612293600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600d8152602001807f6170706c7953746167654c656e00000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561224957600080fd5b505af115801561225d573d6000803e3d6000fd5b505050506040513d602081101561227357600080fd5b810190808051906020019092919050505042612c8290919063ffffffff16565b8160000181905550838160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1630876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156123c157600080fd5b505af11580156123d5573d6000803e3d6000fd5b505050506040513d60208110156123eb57600080fd5b8101908080519060200190929190505050151561240757600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fa27f550c3c7a7c6d8369e5383fdc7a3b4850d8ce9e20066f9d496f6989f0086486846000015487876040518085815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a35050505050565b61249881611a51565b156124ab576124a681612c9e565b6124cd565b6124b481611b0f565b156124c7576124c281612d3b565b6124cc565b600080fd5b5b50565b60008060016000846000191660001916815260200190815260200160002060000154119050919050565b60006020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b600080600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600080600080878152602001908152602001600020600301549250600080878152602001908152602001600020600001549150600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b1580156126ca57600080fd5b505af11580156126de573d6000803e3d6000fd5b505050506040513d60208110156126f457600080fd5b810190808051906020019092919050505090508282820281151561271457fe5b0493505050509392505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900460ff16908060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060020154908060030154905085565b600080600083815260200190815260200160002060010160149054906101000a900460ff1615801561287e5750600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561284257600080fd5b505af1158015612856573d6000803e3d6000fd5b505050506040513d602081101561286c57600080fd5b81019080805190602001909291905050505b151561288957600080fd5b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561291c57600080fd5b505af1158015612930573d6000803e3d6000fd5b505050506040513d602081101561294657600080fd5b8101908080519060200190929190505050141561297d576000808381526020019081526020016000206002015460020290506129b0565b60008083815260200190815260200160002060000154600080848152602001908152602001600020600201546002020390505b919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600060016000856000191660001916815260200190815260200160002092508260010160009054906101000a900460ff1615612a965783600019167fd1ffb796b7108387b2f02adf47b4b81a1690cf2a190422c87a4f670780103e6360405160405180910390a2612ac8565b83600019167f2e5ec035f6eac8ff1cf7cdf36cfeca7c85413f9f67652dc2c13d20f337204a2660405160405180910390a25b8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506001600085600019166000191681526020019081526020016000206000808201600090556001820160006101000a81549060ff02191690556001820160016101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556002820160009055600382016000905550506000811115612c7c57600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015612c3557600080fd5b505af1158015612c49573d6000803e3d6000fd5b505050506040513d6020811015612c5f57600080fd5b81019080805190602001909291905050501515612c7b57600080fd5b5b50505050565b60008183019050828110151515612c9557fe5b80905092915050565b60016000826000191660001916815260200190815260200160002060010160009054906101000a900460ff161515612d025780600019167fa7bc1d57d9006d9d248707c7b6828c1bab8c51719cc06d78c82a3ee891ef967c60405160405180910390a25b6001806000836000191660001916815260200190815260200160002060010160006101000a81548160ff02191690831515021790555050565b600080600160008460001916600019168152602001908152602001600020600301549150612d6882612784565b9050600160008084815260200190815260200160002060010160146101000a81548160ff021916908315150217905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612e2957600080fd5b505af1158015612e3d573d6000803e3d6000fd5b505050506040513d6020811015612e5357600080fd5b810190808051906020019092919050505060008084815260200190815260200160002060030181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349403183836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612f0e57600080fd5b505af1158015612f22573d6000803e3d6000fd5b505050506040513d6020811015612f3857600080fd5b810190808051906020019092919050505015612ff757612f5783612c9e565b80600160008560001916600019168152602001908152602001600020600201600082825401925050819055508183600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c16000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a36131b0565b61300083612a27565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb60008085815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156130fa57600080fd5b505af115801561310e573d6000803e3d6000fd5b505050506040513d602081101561312457600080fd5b8101908080519060200190929190505050151561314057600080fd5b8183600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe66000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a35b5050505600a165627a7a723058208e19e1f1a28ad99ba4dcd3b291c4ef77a840fb7aafab5fdf9a47f06eecdb774b0029", - "deployedBytecode": "0x60806040526004361061011d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806301a5e3fe14610122578063040cf0201461016b57806306fdde03146101a65780630ca36263146102365780631b7bbecb146102675780631de26e16146102b057806343cffefe146102eb578063691a38ab1461034857806377609a411461039157806386bb8f37146103da57806389bb55c7146104115780638a59eb56146104645780638cf8151f146104955780638f1d3776146104de578063a5ba3b1e1461056b578063a7aad3db146105d0578063c18b8db41461063b578063c8187cf1146106cc578063e1e3f9151461070d578063fc0c546a14610764578063fce1ccca146107bb575b600080fd5b34801561012e57600080fd5b506101516004803603810190808035600019169060200190929190505050610812565b604051808215151515815260200191505060405180910390f35b34801561017757600080fd5b506101a4600480360381019080803560001916906020019092919080359060200190929190505050610847565b005b3480156101b257600080fd5b506101bb610b69565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101fb5780820151818401526020810190506101e0565b50505050905090810190601f1680156102285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561024257600080fd5b506102656004803603810190808035600019169060200190929190505050610c07565b005b34801561027357600080fd5b506102966004803603810190808035600019169060200190929190505050610d17565b604051808215151515815260200191505060405180910390f35b3480156102bc57600080fd5b506102e9600480360381019080803560001916906020019092919080359060200190929190505050610d91565b005b3480156102f757600080fd5b506103326004803603810190808035600019169060200190929190803590602001908201803590602001919091929391929390505050610fc3565b6040518082815260200191505060405180910390f35b34801561035457600080fd5b506103776004803603810190808035600019169060200190929190505050611a51565b604051808215151515815260200191505060405180910390f35b34801561039d57600080fd5b506103c06004803603810190808035600019169060200190929190505050611b0f565b604051808215151515815260200191505060405180910390f35b3480156103e657600080fd5b5061040f6004803603810190808035906020019092919080359060200190929190505050611c1b565b005b34801561041d57600080fd5b50610462600480360381019080803560001916906020019092919080359060200190929190803590602001908201803590602001919091929391929390505050611fed565b005b34801561047057600080fd5b50610493600480360381019080803560001916906020019092919050505061248f565b005b3480156104a157600080fd5b506104c460048036038101908080356000191690602001909291905050506124d0565b604051808215151515815260200191505060405180910390f35b3480156104ea57600080fd5b50610509600480360381019080803590602001909291905050506124fa565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b34801561057757600080fd5b506105b660048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061255d565b604051808215151515815260200191505060405180910390f35b3480156105dc57600080fd5b50610625600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190803590602001909291905050506125c7565b6040518082815260200191505060405180910390f35b34801561064757600080fd5b5061066a6004803603810190808035600019169060200190929190505050612721565b60405180868152602001851515151581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019550505050505060405180910390f35b3480156106d857600080fd5b506106f760048036038101908080359060200190929190505050612784565b6040518082815260200191505060405180910390f35b34801561071957600080fd5b506107226129b5565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561077057600080fd5b506107796129db565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156107c757600080fd5b506107d0612a01565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900460ff169050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156108c457600080fd5b806002015482111515156108d757600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561099957600080fd5b505af11580156109ad573d6000803e3d6000fd5b505050506040513d60208110156109c357600080fd5b810190808051906020019092919050505082826002015403101515156109e857600080fd5b818160020160008282540392505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610abf57600080fd5b505af1158015610ad3573d6000803e3d6000fd5b505050506040513d6020811015610ae957600080fd5b81019080805190602001909291905050501515610b0557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167f9d9ed58779badf90c56d72f3b54def9f73dc875d8f86416c8334b55328c6c106848460020154604051808381526020018281526020019250505060405180910390a3505050565b60058054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610bff5780601f10610bd457610100808354040283529160200191610bff565b820191906000526020600020905b815481529060010190602001808311610be257829003601f168201915b505050505081565b600060016000836000191660001916815260200190815260200160002090508060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610c8457600080fd5b610c8d82610812565b1515610c9857600080fd5b600081600301541480610cce57506000808260030154815260200190815260200160002060010160149054906101000a900460ff165b1515610cd957600080fd5b610ce282612a27565b81600019167f8a51904a50ce4451be09dc08242bd2d5565b05cf0f4f5aa88c77f96fdf538b4260405160405180910390a25050565b600080600160008460001916600019168152602001908152602001600020600301549050600060016000856000191660001916815260200190815260200160002060030154118015610d89575060008082815260200190815260200160002060010160149054906101000a900460ff16155b915050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610e0e57600080fd5b818160020160008282540192505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015610f1957600080fd5b505af1158015610f2d573d6000803e3d6000fd5b505050506040513d6020811015610f4357600080fd5b81019080805190602001909291905050501515610f5f57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167ff63fcfb210c709154f0260502b2586fcee5550d17dc828be3127ccdedec620ab848460020154604051808381526020018281526020019250505060405180910390a3505050565b600080600080600080600160008a600019166000191681526020019081526020016000209450600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156110ab57600080fd5b505af11580156110bf573d6000803e3d6000fd5b505050506040513d60208110156110d557600080fd5b810190808051906020019092919050505093506110f1896124d0565b8061110a57508460010160009054906101000a900460ff165b151561111557600080fd5b60008560030154148061114b57506000808660030154815260200190815260200160002060010160149054906101000a900460ff165b151561115657600080fd5b83856002015410156111a55761116b89612a27565b88600019167f4a9ee335af9e32f32f2229943dc7a0d3b5adf7e4c5c4062b372eae8c476d928660405160405180910390a260009550611a45565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d60600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f766f746551756f72756d00000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156112a557600080fd5b505af11580156112b9573d6000803e3d6000fd5b505050506040513d60208110156112cf57600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f636f6d6d697453746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156113a257600080fd5b505af11580156113b6573d6000803e3d6000fd5b505050506040513d60208110156113cc57600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f72657665616c53746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561149f57600080fd5b505af11580156114b3573d6000803e3d6000fd5b505050506040513d60208110156114c957600080fd5b81019080805190602001909291905050506040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561153a57600080fd5b505af115801561154e573d6000803e3d6000fd5b505050506040513d602081101561156457600080fd5b8101908080519060200190929190505050925060a060405190810160405280606486600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600f8152602001807f64697370656e736174696f6e5063740000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561164857600080fd5b505af115801561165c573d6000803e3d6000fd5b505050506040513d602081101561167257600080fd5b81019080805190602001909291905050506064030281151561169057fe5b0481526020013373ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200185815260200160008152506000808581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff0219169083151502179055506060820151816002015560808201518160030155905050828560030181905550838560020160008282540392505081905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561187457600080fd5b505af1158015611888573d6000803e3d6000fd5b505050506040513d602081101561189e57600080fd5b810190808051906020019092919050505015156118ba57600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b15801561194b57600080fd5b505af115801561195f573d6000803e3d6000fd5b505050506040513d60a081101561197557600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1689600019167ff98a08756a3603420a080d66764f73deb1e30896c315cfed03e17f88f5eb30f7858b8b8787604051808681526020018060200184815260200183815260200182810382528686828181526020019250808284378201915050965050505050505060405180910390a38295505b50505050509392505050565b600080600160008460001916600019168152602001908152602001600020600301549050611a7e836124d0565b8015611aa757504260016000856000191660001916815260200190815260200160002060000154105b8015611ab95750611ab783610812565b155b8015611af657506000811480611af557506001151560008083815260200190815260200160002060010160149054906101000a900460ff161515145b5b15611b045760019150611b09565b600091505b50919050565b600080600160008460001916600019168152602001908152602001600020600301549050611b3c83610d17565b1515611b4757600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830826040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015611bd857600080fd5b505af1158015611bec573d6000803e3d6000fd5b505050506040513d6020811015611c0257600080fd5b8101908080519060200190929190505050915050919050565b6000806000151560008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611c9057600080fd5b6001151560008086815260200190815260200160002060010160149054906101000a900460ff161515141515611cc557600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611d9257600080fd5b505af1158015611da6573d6000803e3d6000fd5b505050506040513d6020811015611dbc57600080fd5b81019080805190602001909291905050509150611dda3385856125c7565b905081600080868152602001908152602001600020600301600082825403925050819055508060008086815260200190815260200160002060000160008282540392505081905550600160008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611f5257600080fd5b505af1158015611f66573d6000803e3d6000fd5b505050506040513d6020811015611f7c57600080fd5b81019080805190602001909291905050501515611f9857600080fd5b3373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a350505050565b6000611ff885610812565b15151561200457600080fd5b61200d856124d0565b15151561201957600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156120db57600080fd5b505af11580156120ef573d6000803e3d6000fd5b505050506040513d602081101561210557600080fd5b8101908080519060200190929190505050841015151561212457600080fd5b6001600086600019166000191681526020019081526020016000209050338160010160016101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550612293600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600d8152602001807f6170706c7953746167654c656e00000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561224957600080fd5b505af115801561225d573d6000803e3d6000fd5b505050506040513d602081101561227357600080fd5b810190808051906020019092919050505042612c8290919063ffffffff16565b8160000181905550838160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1630876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156123c157600080fd5b505af11580156123d5573d6000803e3d6000fd5b505050506040513d60208110156123eb57600080fd5b8101908080519060200190929190505050151561240757600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fa27f550c3c7a7c6d8369e5383fdc7a3b4850d8ce9e20066f9d496f6989f0086486846000015487876040518085815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a35050505050565b61249881611a51565b156124ab576124a681612c9e565b6124cd565b6124b481611b0f565b156124c7576124c281612d3b565b6124cc565b600080fd5b5b50565b60008060016000846000191660001916815260200190815260200160002060000154119050919050565b60006020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b600080600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600080600080878152602001908152602001600020600301549250600080878152602001908152602001600020600001549150600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b1580156126ca57600080fd5b505af11580156126de573d6000803e3d6000fd5b505050506040513d60208110156126f457600080fd5b810190808051906020019092919050505090508282820281151561271457fe5b0493505050509392505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900460ff16908060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060020154908060030154905085565b600080600083815260200190815260200160002060010160149054906101000a900460ff1615801561287e5750600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561284257600080fd5b505af1158015612856573d6000803e3d6000fd5b505050506040513d602081101561286c57600080fd5b81019080805190602001909291905050505b151561288957600080fd5b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561291c57600080fd5b505af1158015612930573d6000803e3d6000fd5b505050506040513d602081101561294657600080fd5b8101908080519060200190929190505050141561297d576000808381526020019081526020016000206002015460020290506129b0565b60008083815260200190815260200160002060000154600080848152602001908152602001600020600201546002020390505b919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600060016000856000191660001916815260200190815260200160002092508260010160009054906101000a900460ff1615612a965783600019167fd1ffb796b7108387b2f02adf47b4b81a1690cf2a190422c87a4f670780103e6360405160405180910390a2612ac8565b83600019167f2e5ec035f6eac8ff1cf7cdf36cfeca7c85413f9f67652dc2c13d20f337204a2660405160405180910390a25b8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506001600085600019166000191681526020019081526020016000206000808201600090556001820160006101000a81549060ff02191690556001820160016101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556002820160009055600382016000905550506000811115612c7c57600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015612c3557600080fd5b505af1158015612c49573d6000803e3d6000fd5b505050506040513d6020811015612c5f57600080fd5b81019080805190602001909291905050501515612c7b57600080fd5b5b50505050565b60008183019050828110151515612c9557fe5b80905092915050565b60016000826000191660001916815260200190815260200160002060010160009054906101000a900460ff161515612d025780600019167fa7bc1d57d9006d9d248707c7b6828c1bab8c51719cc06d78c82a3ee891ef967c60405160405180910390a25b6001806000836000191660001916815260200190815260200160002060010160006101000a81548160ff02191690831515021790555050565b600080600160008460001916600019168152602001908152602001600020600301549150612d6882612784565b9050600160008084815260200190815260200160002060010160146101000a81548160ff021916908315150217905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612e2957600080fd5b505af1158015612e3d573d6000803e3d6000fd5b505050506040513d6020811015612e5357600080fd5b810190808051906020019092919050505060008084815260200190815260200160002060030181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349403183836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612f0e57600080fd5b505af1158015612f22573d6000803e3d6000fd5b505050506040513d6020811015612f3857600080fd5b810190808051906020019092919050505015612ff757612f5783612c9e565b80600160008560001916600019168152602001908152602001600020600201600082825401925050819055508183600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c16000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a36131b0565b61300083612a27565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb60008085815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156130fa57600080fd5b505af115801561310e573d6000803e3d6000fd5b505050506040513d602081101561312457600080fd5b8101908080519060200190929190505050151561314057600080fd5b8183600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe66000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a35b5050505600a165627a7a723058208e19e1f1a28ad99ba4dcd3b291c4ef77a840fb7aafab5fdf9a47f06eecdb774b0029", - "sourceMap": "131:17419:6:-;;;2866:253;8:9:-1;5:2;;;30:1;27;20:12;5:2;2866:253:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3001:10;2987:5;;:25;;;;;;;;;;;;;;;;;;3038:9;3018:6;;:30;;;;;;;;;;;;;;;;;;3084:11;3054:13;;:42;;;;;;;;;;;;;;;;;;3109:5;3102:4;:12;;;;;;;;;;;;:::i;:::-;;2866:253;;;;131:17419;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;", - "deployedSourceMap": "131:17419:6:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12227:136;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12227:136:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5240:501;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5240:501:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2481:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2481:18:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;2481:18:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5994:434;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5994:434:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12839:229;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12839:229:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4606:375;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4606:375:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6939:1627;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6939:1627:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11361:704;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11361:704:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13303:233;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13303:233:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9473:912;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9473:912:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3615:734;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3615:734:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8795:268;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8795:268:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12523:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12523:138:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2219:44;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2219:44:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14375:145;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14375:145:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10841:357;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10841:357:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2323:43;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2323:43:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13714:446;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13714:446:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2443:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2443:34:6;;;;;;;;;;;;;;;;;;;;;;;;;;;2393:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2393:18:6;;;;;;;;;;;;;;;;;;;;;;;;;;;2415:24;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2415:24:6;;;;;;;;;;;;;;;;;;;;;;;;;;;12227:136;12293:16;12324:8;:22;12333:12;12324:22;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;12317:41;;12227:136;;;:::o;5240:501::-;5309:23;5335:8;:22;5344:12;5335:22;;;;;;;;;;;;;;;;;5309:48;;5389:10;5372:27;;:7;:13;;;;;;;;;;;;:27;;;5364:36;;;;;;;;5425:7;:23;;;5414:7;:34;;5406:43;;;;;;;;5500:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5500:31:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5500:31:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5500:31:6;;;;;;;;;;;;;;;;5489:7;5463;:23;;;:33;:68;;5455:77;;;;;;;;5566:7;5539;:23;;;:34;;;;;;;;;;;5587:5;;;;;;;;;;;:14;;;5602:10;5614:7;5587:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5587:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5587:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5587:35:6;;;;;;;;;;;;;;;;5579:44;;;;;;;;5720:10;5635:101;;5654:12;5635:101;;;;5674:7;5689;:23;;;5635:101;;;;;;;;;;;;;;;;;;;;;;;;5240:501;;;:::o;2481:18::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;5994:434::-;6045:23;6071:8;:22;6080:12;6071:22;;;;;;;;;;;;;;;;;6045:48;;6122:7;:13;;;;;;;;;;;;6108:27;;:10;:27;;;6100:36;;;;;;;;6150:27;6164:12;6150:13;:27::i;:::-;6142:36;;;;;;;;6260:1;6237:7;:19;;;:24;:68;;;;6265:10;:31;6276:7;:19;;;6265:31;;;;;;;;;;;:40;;;;;;;;;;;;6237:68;6229:77;;;;;;;;6355:26;6368:12;6355;:26::i;:::-;6410:12;6392:31;;;;;;;;;;;;;5994:434;;:::o;12839:229::-;12907:4;12919:16;12938:8;:22;12947:12;12938:22;;;;;;;;;;;;;;;;;:34;;;12919:53;;13024:1;12987:8;:22;12996:12;12987:22;;;;;;;;;;;;;;;;;:34;;;:38;:75;;;;;13030:10;:23;13041:11;13030:23;;;;;;;;;;;:32;;;;;;;;;;;;13029:33;12987:75;12979:84;;12839:229;;;;:::o;4606:375::-;4674:23;4700:8;:22;4709:12;4700:22;;;;;;;;;;;;;;;;;4674:48;;4754:10;4737:27;;:7;:13;;;;;;;;;;;;:27;;;4729:36;;;;;;;;4799:7;4772;:23;;;:34;;;;;;;;;;;4820:5;;;;;;;;;;;:18;;;4839:10;4851:4;4857:7;4820:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4820:45:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4820:45:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4820:45:6;;;;;;;;;;;;;;;;4812:54;;;;;;;;4960:10;4878:98;;4894:12;4878:98;;;;4914:7;4929;:23;;;4878:98;;;;;;;;;;;;;;;;;;;;;;;;4606:375;;;:::o;6939:1627::-;7012:16;7036:23;7090:15;7614:11;8302:18;8326;7062:8;:22;7071:12;7062:22;;;;;;;;;;;;;;;;;7036:48;;7108:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7108:31:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7108:31:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7108:31:6;;;;;;;;;;;;;;;;7090:49;;7220:24;7231:12;7220:10;:24::i;:::-;:47;;;;7248:7;:19;;;;;;;;;;;;7220:47;7212:56;;;;;;;;7340:1;7317:7;:19;;;:24;:68;;;;7345:10;:31;7356:7;:19;;;7345:31;;;;;;;;;;;:40;;;;;;;;;;;;7317:68;7309:77;;;;;;;;7423:10;7397:7;:23;;;:36;7393:196;;;7497:26;7510:12;7497;:26::i;:::-;7553:12;7536:30;;;;;;;;;;;;;7581:1;7574:8;;;;7393:196;7628:6;;;;;;;;;;;:16;;;7652:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7652:31:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7652:31:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7652:31:6;;;;;;;;;;;;;;;;7691:13;;;;;;;;;;;:17;;;:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7691:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7691:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7691:35:6;;;;;;;;;;;;;;;;7734:13;;;;;;;;;;;:17;;;:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7734:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7734:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7734:35:6;;;;;;;;;;;;;;;;7628:147;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7628:147:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7628:147:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7628:147:6;;;;;;;;;;;;;;;;7614:161;;7803:202;;;;;;;;;7925:3;7911:10;7871:13;;;;;;;;;;;:17;;;:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7871:36:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7871:36:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7871:36:6;;;;;;;;;;;;;;;;7865:3;:42;7864:57;7863:65;;;;;;;;7803:202;;;;7833:10;7803:202;;;;;;7971:5;7803:202;;;;;;7943:10;7803:202;;;;7997:1;7803:202;;;7782:10;:18;7793:6;7782:18;;;;;;;;;;;:223;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8092:6;8070:7;:19;;:28;;;;8185:10;8158:7;:23;;;:37;;;;;;;;;;;8246:5;;;;;;;;;;;:18;;;8265:10;8277:4;8283:10;8246:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8246:48:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8246:48:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;8246:48:6;;;;;;;;;;;;;;;;8238:57;;;;;;;;8384:6;;;;;;;;;;;:14;;;8399:6;8384:22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8384:22:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8384:22:6;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;8384:22:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8350:56;;;;;;;;;;;;;;8525:10;8418:123;;8436:12;8418:123;;;;8456:6;8470:5;;8483:13;8504;8418:123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8555:6;8548:13;;6939:1627;;;;;;;;;;;:::o;11361:704::-;11430:4;11442:16;11461:8;:22;11470:12;11461:22;;;;;;;;;;;;;;;;;:34;;;11442:53;;11757:24;11768:12;11757:10;:24::i;:::-;:117;;;;;11871:3;11828:8;:22;11837:12;11828:22;;;;;;;;;;;;;;;;;:40;;;:46;11757:117;:192;;;;;11922:27;11936:12;11922:13;:27::i;:::-;11921:28;11757:192;:264;;;;;11975:1;11960:11;:16;:60;;;;12016:4;11980:40;;:10;:23;11991:11;11980:23;;;;;;;;;;;:32;;;;;;;;;;;;:40;;;11960:60;11757:264;11709:333;;;12036:4;12029:11;;;;11709:333;12055:5;12048:12;;11361:704;;;;;:::o;13303:233::-;13378:4;13390:16;13409:8;:22;13418:12;13409:22;;;;;;;;;;;;;;;;;:34;;;13390:53;;13458:29;13474:12;13458:15;:29::i;:::-;13450:38;;;;;;;;13502:6;;;;;;;;;;;:16;;;13519:11;13502:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13502:29:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13502:29:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13502:29:6;;;;;;;;;;;;;;;;13495:36;;13303:233;;;;:::o;9473:912::-;9765:16;9849:11;9696:5;9644:57;;:10;:24;9655:12;9644:24;;;;;;;;;;;:36;;:48;9681:10;9644:48;;;;;;;;;;;;;;;;;;;;;;;;;:57;;;9636:66;;;;;;;;9753:4;9716:41;;:10;:24;9727:12;9716:24;;;;;;;;;;;:33;;;;;;;;;;;;:41;;;9708:50;;;;;;;;9784:6;;;;;;;;;;;:26;;;9811:10;9823:12;9837:5;9784:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9784:59:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9784:59:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9784:59:6;;;;;;;;;;;;;;;;9765:78;;9863:44;9875:10;9887:12;9901:5;9863:11;:44::i;:::-;9849:58;;10097:11;10057:10;:24;10068:12;10057:24;;;;;;;;;;;:36;;;:51;;;;;;;;;;;10153:6;10114:10;:24;10125:12;10114:24;;;;;;;;;;;:35;;;:45;;;;;;;;;;;10266:4;10215:10;:24;10226:12;10215:24;;;;;;;;;;;:36;;:48;10252:10;10215:48;;;;;;;;;;;;;;;;:55;;;;;;;;;;;;;;;;;;10285:5;;;;;;;;;;;:14;;;10300:10;10312:6;10285:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10285:34:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10285:34:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;10285:34:6;;;;;;;;;;;;;;;;10277:43;;;;;;;;10369:10;10332:48;;10347:12;10332:48;10361:6;10332:48;;;;;;;;;;;;;;;;;;9473:912;;;;:::o;3615:734::-;3854:23;3704:27;3718:12;3704:13;:27::i;:::-;3703:28;3695:37;;;;;;;;3747:24;3758:12;3747:10;:24::i;:::-;3746:25;3738:34;;;;;;;;3797:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3797:31:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3797:31:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3797:31:6;;;;;;;;;;;;;;;;3786:7;:42;;3778:51;;;;;;;;3880:8;:22;3889:12;3880:22;;;;;;;;;;;;;;;;;3854:48;;3924:10;3908:7;:13;;;:26;;;;;;;;;;;;;;;;;;4002:55;4022:13;;;;;;;;;;;:17;;;:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4022:34:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4022:34:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4022:34:6;;;;;;;;;;;;;;;;4002:15;:19;;:55;;;;:::i;:::-;3974:7;:25;;:83;;;;4089:7;4063;:23;;:33;;;;4166:5;;;;;;;;;;;:18;;;4185:7;:13;;;;;;;;;;;;4200:4;4206:7;4166:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4166:48:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4166:48:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4166:48:6;;;;;;;;;;;;;;;;4158:57;;;;;;;;4328:10;4227:117;;4247:12;4227:117;;;;4267:7;4282;:25;;;4315:5;;4227:117;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3615:734;;;;;:::o;8795:268::-;8856:30;8873:12;8856:16;:30::i;:::-;8852:207;;;8896:34;8917:12;8896:20;:34::i;:::-;8852:207;;;8947:36;8970:12;8947:22;:36::i;:::-;8943:116;;;8993:30;9010:12;8993:16;:30::i;:::-;8943:116;;;9044:8;;;8943:116;8852:207;8795:268;:::o;12523:138::-;12586:11;12655:1;12612:8;:22;12621:12;12612:22;;;;;;;;;;;;;;;;;:40;;;:44;12605:51;;12523:138;;;:::o;2219:44::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;14375:145::-;14452:4;14471:10;:24;14482:12;14471:24;;;;;;;;;;;:36;;:44;14508:6;14471:44;;;;;;;;;;;;;;;;;;;;;;;;;14464:51;;14375:145;;;;:::o;10841:357::-;10932:4;10946:16;11007:15;11066:16;10965:10;:24;10976:12;10965:24;;;;;;;;;;;:36;;;10946:55;;11025:10;:24;11036:12;11025:24;;;;;;;;;;;:35;;;11007:53;;11085:6;;;;;;;;;;;:26;;;11112:6;11120:12;11134:5;11085:55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11085:55:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11085:55:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11085:55:6;;;;;;;;;;;;;;;;11066:74;;11182:11;11168:10;11154:11;:24;11153:40;;;;;;;;11146:47;;10841:357;;;;;;;;:::o;2323:43::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;13714:446::-;13779:4;13800:10;:24;13811:12;13800:24;;;;;;;;;;;:33;;;;;;;;;;;;13799:34;:68;;;;;13837:6;;;;;;;;;;;:16;;;13854:12;13837:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13837:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13837:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13837:30:6;;;;;;;;;;;;;;;;13799:68;13791:77;;;;;;;;14009:1;13946:6;;;;;;;;;;;:45;;;13992:12;13946:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13946:59:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13946:59:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13946:59:6;;;;;;;;;;;;;;;;:64;13942:126;;;14031:10;:24;14042:12;14031:24;;;;;;;;;;;:30;;;14027:1;:34;14020:41;;;;13942:126;14120:10;:24;14131:12;14120:24;;;;;;;;;;;:35;;;14086:10;:24;14097:12;14086:24;;;;;;;;;;;:30;;;14082:1;:34;14081:74;14074:81;;13714:446;;;;:::o;2443:34::-;;;;;;;;;;;;;:::o;2393:18::-;;;;;;;;;;;;;:::o;2415:24::-;;;;;;;;;;;;;:::o;16907:641::-;16965:23;17277:13;17312:20;16991:8;:22;17000:12;16991:22;;;;;;;;;;;;;;;;;16965:48;;17099:7;:19;;;;;;;;;;;;17095:133;;;17149:12;17133:29;;;;;;;;;;;;;17095:133;;;17208:12;17188:33;;;;;;;;;;;;;17095:133;17293:7;:13;;;;;;;;;;;;17277:29;;17335:7;:23;;;17312:46;;17371:8;:22;17380:12;17371:22;;;;;;;;;;;;;;;;;;17364:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17479:1;17461:15;:19;17457:87;;;17498:5;;;;;;;;;;;:14;;;17513:5;17520:15;17498:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;17498:38:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;17498:38:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;17498:38:6;;;;;;;;;;;;;;;;17490:47;;;;;;;;17457:87;16907:641;;;;:::o;1213:123:7:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;16542:203:6:-;16613:8;:22;16622:12;16613:22;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;16612:35;16608:86;;;16679:12;16655:37;;;;;;;;;;;;;16608:86;16736:4;16699:8;:22;16708:12;16699:22;;;;;;;;;;;;;;;;;:34;;;:41;;;;;;;;;;;;;;;;;;16542:203;:::o;14844:1364::-;14906:16;15080:11;14925:8;:22;14934:12;14925:22;;;;;;;;;;;;;;;;;:34;;;14906:53;;15094:28;15110:11;15094:15;:28::i;:::-;15080:42;;15210:4;15175:10;:23;15186:11;15175:23;;;;;;;;;;;:32;;;:39;;;;;;;;;;;;;;;;;;15346:6;;;;;;;;;;;:45;;;15392:11;15346:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15346:58:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15346:58:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15346:58:6;;;;;;;;;;;;;;;;15308:10;:23;15319:11;15308:23;;;;;;;;;;;:35;;:96;;;;15445:6;;;;;;;;;;;:15;;;15461:11;15445:28;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15445:28:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15445:28:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15445:28:6;;;;;;;;;;;;;;;;15441:763;;;15483:34;15504:12;15483:20;:34::i;:::-;15634:6;15592:8;:22;15601:12;15592:22;;;;;;;;;;;;;;;;;:38;;;:48;;;;;;;;;;;15702:11;15680:12;15654:156;;;;15723:10;:23;15734:11;15723:23;;;;;;;;;;;:34;;;15767:10;:23;15778:11;15767:23;;;;;;;;;;;:35;;;15654:156;;;;;;;;;;;;;;;;;;;;;;;;15441:763;;;15876:26;15889:12;15876;:26::i;:::-;15965:5;;;;;;;;;;;:14;;;15980:10;:23;15991:11;15980:23;;;;;;;;;;;:34;;;;;;;;;;;;16016:6;15965:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15965:58:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15965:58:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15965:58:6;;;;;;;;;;;;;;;;15957:67;;;;;;;;16089:11;16067:12;16038:159;;;;16110:10;:23;16121:11;16110:23;;;;;;;;;;;:34;;;16154:10;:23;16165:11;16154:23;;;;;;;;;;;:35;;;16038:159;;;;;;;;;;;;;;;;;;;;;;;;15441:763;14844:1364;;;:::o", - "source": "pragma solidity 0.4.24;\n\nimport \"./ERC20.sol\";\nimport \"./Parameterizer.sol\";\nimport \"./PLCRVoting.sol\";\nimport \"./SafeMath.sol\";\n\n\ncontract Registry {\n\n // ------\n // EVENTS\n // ------\n\n event _Application(bytes32 indexed listingHash, uint deposit, uint appEndDate, string data, address indexed applicant);\n event _Challenge(bytes32 indexed listingHash, uint challengeID, string data, uint commitEndDate, uint revealEndDate, address indexed challenger);\n event _Deposit(bytes32 indexed listingHash, uint added, uint newTotal, address indexed owner);\n event _Withdrawal(bytes32 indexed listingHash, uint withdrew, uint newTotal, address indexed owner);\n event _ApplicationWhitelisted(bytes32 indexed listingHash);\n event _ApplicationRemoved(bytes32 indexed listingHash);\n event _ListingRemoved(bytes32 indexed listingHash);\n event _ListingWithdrawn(bytes32 indexed listingHash);\n event _TouchAndRemoved(bytes32 indexed listingHash);\n event _ChallengeFailed(bytes32 indexed listingHash, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _ChallengeSucceeded(bytes32 indexed listingHash, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _RewardClaimed(uint indexed challengeID, uint reward, address indexed voter);\n\n using SafeMath for uint;\n\n struct Listing {\n uint applicationExpiry; // Expiration date of apply stage\n bool whitelisted; // Indicates registry status\n address owner; // Owner of Listing\n uint unstakedDeposit; // Number of tokens in the listing not locked in a challenge\n uint challengeID; // Corresponds to a PollID in PLCRVoting\n }\n\n struct Challenge {\n uint rewardPool; // (remaining) Pool of tokens to be distributed to winning voters\n address challenger; // Owner of Challenge\n bool resolved; // Indication of if challenge is resolved\n uint stake; // Number of tokens at stake for either party during challenge\n uint totalTokens; // (remaining) Number of tokens used in voting by the winning side\n mapping(address => bool) tokenClaims; // Indicates whether a voter has claimed a reward yet\n }\n\n // Maps challengeIDs to associated challenge data\n mapping(uint => Challenge) public challenges;\n\n // Maps listingHashes to associated listingHash data\n mapping(bytes32 => Listing) public listings;\n\n // Global Variables\n ERC20 public token;\n PLCRVoting public voting;\n Parameterizer public parameterizer;\n string public name;\n\n // ------------\n // CONSTRUCTOR:\n // ------------\n\n /**\n @dev Contructor Sets the addresses for token, voting, and parameterizer\n @param _tokenAddr Address of the TCR's intrinsic ERC20 token\n @param _plcrAddr Address of a PLCR voting contract for the provided token\n @param _paramsAddr Address of a Parameterizer contract\n */\n constructor(\n address _tokenAddr,\n address _plcrAddr,\n address _paramsAddr,\n string _name\n ) public\n {\n token = ERC20(_tokenAddr);\n voting = PLCRVoting(_plcrAddr);\n parameterizer = Parameterizer(_paramsAddr);\n name = _name;\n }\n\n // --------------------\n // PUBLISHER INTERFACE:\n // --------------------\n\n /**\n @dev Allows a user to start an application. Takes tokens from user and sets\n apply stage end time.\n @param _listingHash The hash of a potential listing a user is applying to add to the registry\n @param _amount The number of ERC20 tokens a user is willing to potentially stake\n @param _data Extra data relevant to the application. Think IPFS hashes.\n */\n function apply(bytes32 _listingHash, uint _amount, string _data) external {\n require(!isWhitelisted(_listingHash));\n require(!appWasMade(_listingHash));\n require(_amount >= parameterizer.get(\"minDeposit\"));\n\n // Sets owner\n Listing storage listing = listings[_listingHash];\n listing.owner = msg.sender;\n\n // Sets apply stage end time\n listing.applicationExpiry = block.timestamp.add(parameterizer.get(\"applyStageLen\"));\n listing.unstakedDeposit = _amount;\n\n // Transfers tokens from user to Registry contract\n require(token.transferFrom(listing.owner, this, _amount));\n\n emit _Application(\n _listingHash,\n _amount,\n listing.applicationExpiry,\n _data,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to increase their unstaked deposit.\n @param _listingHash A listingHash msg.sender is the owner of\n @param _amount The number of ERC20 tokens to increase a user's unstaked deposit\n */\n function deposit(bytes32 _listingHash, uint _amount) external {\n Listing storage listing = listings[_listingHash];\n\n require(listing.owner == msg.sender);\n\n listing.unstakedDeposit += _amount;\n require(token.transferFrom(msg.sender, this, _amount));\n\n emit _Deposit(\n _listingHash,\n _amount,\n listing.unstakedDeposit,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to decrease their unstaked deposit.\n @param _listingHash A listingHash msg.sender is the owner of.\n @param _amount The number of ERC20 tokens to withdraw from the unstaked deposit.\n */\n function withdraw(bytes32 _listingHash, uint _amount) external {\n Listing storage listing = listings[_listingHash];\n\n require(listing.owner == msg.sender);\n require(_amount <= listing.unstakedDeposit);\n require(listing.unstakedDeposit - _amount >= parameterizer.get(\"minDeposit\"));\n\n listing.unstakedDeposit -= _amount;\n require(token.transfer(msg.sender, _amount));\n\n emit _Withdrawal(\n _listingHash,\n _amount,\n listing.unstakedDeposit,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to remove the listingHash from the whitelist\n Returns all tokens to the owner of the listingHash\n @param _listingHash A listingHash msg.sender is the owner of.\n */\n function exit(bytes32 _listingHash) external {\n Listing storage listing = listings[_listingHash];\n\n require(msg.sender == listing.owner);\n require(isWhitelisted(_listingHash));\n\n // Cannot exit during ongoing challenge\n require(listing.challengeID == 0 || challenges[listing.challengeID].resolved);\n\n // Remove listingHash & return tokens\n resetListing(_listingHash);\n emit _ListingWithdrawn(_listingHash);\n }\n\n // -----------------------\n // TOKEN HOLDER INTERFACE:\n // -----------------------\n\n /**\n @dev Starts a poll for a listingHash which is either in the apply stage or\n already in the whitelist. Tokens are taken from the challenger and the\n applicant's deposits are locked.\n @param _listingHash The listingHash being challenged, whether listed or in application\n @param _data Extra data relevant to the challenge. Think IPFS hashes.\n */\n function challenge(bytes32 _listingHash, string _data) external returns (uint challengeID) {\n Listing storage listing = listings[_listingHash];\n uint minDeposit = parameterizer.get(\"minDeposit\");\n\n // Listing must be in apply stage or already on the whitelist\n require(appWasMade(_listingHash) || listing.whitelisted);\n // Prevent multiple challenges\n require(listing.challengeID == 0 || challenges[listing.challengeID].resolved);\n\n if (listing.unstakedDeposit < minDeposit) {\n // Not enough tokens, listingHash auto-delisted\n resetListing(_listingHash);\n emit _TouchAndRemoved(_listingHash);\n return 0;\n }\n\n // Starts poll\n uint pollID = voting.startPoll(\n parameterizer.get(\"voteQuorum\"),\n parameterizer.get(\"commitStageLen\"),\n parameterizer.get(\"revealStageLen\")\n );\n\n challenges[pollID] = Challenge({\n challenger: msg.sender,\n rewardPool: ((100 - parameterizer.get(\"dispensationPct\")) * minDeposit) / 100,\n stake: minDeposit,\n resolved: false,\n totalTokens: 0\n });\n\n // Updates listingHash to store most recent challenge\n listing.challengeID = pollID;\n\n // Locks tokens for listingHash during challenge\n listing.unstakedDeposit -= minDeposit;\n\n // Takes tokens from challenger\n require(token.transferFrom(msg.sender, this, minDeposit));\n\n uint commitEndDate;\n uint revealEndDate;\n (commitEndDate, revealEndDate,) = voting.pollMap(pollID);\n\n emit _Challenge(\n _listingHash,\n pollID,\n _data,\n commitEndDate,\n revealEndDate,\n msg.sender\n );\n\n return pollID;\n }\n\n /**\n @dev Updates a listingHash's status from 'application' to 'listing' or resolves\n a challenge if one exists.\n @param _listingHash The listingHash whose status is being updated\n */\n function updateStatus(bytes32 _listingHash) public {\n if (canBeWhitelisted(_listingHash)) {\n whitelistApplication(_listingHash);\n } else if (challengeCanBeResolved(_listingHash)) {\n resolveChallenge(_listingHash);\n } else {\n revert();\n }\n }\n\n // ----------------\n // TOKEN FUNCTIONS:\n // ----------------\n\n /**\n @dev Called by a voter to claim their reward for each completed vote. Someone\n must call updateStatus() before this can be called.\n @param _challengeID The PLCR pollID of the challenge a reward is being claimed for\n @param _salt The salt of a voter's commit hash in the given poll\n */\n function claimReward(uint _challengeID, uint _salt) public {\n // Ensures the voter has not already claimed tokens and challenge results have been processed\n require(challenges[_challengeID].tokenClaims[msg.sender] == false);\n require(challenges[_challengeID].resolved == true);\n\n uint voterTokens = voting.getNumPassingTokens(msg.sender, _challengeID, _salt);\n uint reward = voterReward(msg.sender, _challengeID, _salt);\n\n // Subtracts the voter's information to preserve the participation ratios\n // of other voters compared to the remaining pool of rewards\n challenges[_challengeID].totalTokens -= voterTokens;\n challenges[_challengeID].rewardPool -= reward;\n\n // Ensures a voter cannot claim tokens again\n challenges[_challengeID].tokenClaims[msg.sender] = true;\n\n require(token.transfer(msg.sender, reward));\n\n emit _RewardClaimed(_challengeID, reward, msg.sender);\n }\n\n // --------\n // GETTERS:\n // --------\n\n /**\n @dev Calculates the provided voter's token reward for the given poll.\n @param _voter The address of the voter whose reward balance is to be returned\n @param _challengeID The pollID of the challenge a reward balance is being queried for\n @param _salt The salt of the voter's commit hash in the given poll\n @return The uint indicating the voter's reward\n */\n function voterReward(address _voter, uint _challengeID, uint _salt)\n public view returns (uint)\n {\n uint totalTokens = challenges[_challengeID].totalTokens;\n uint rewardPool = challenges[_challengeID].rewardPool;\n uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt);\n return (voterTokens * rewardPool) / totalTokens;\n }\n\n /**\n @dev Determines whether the given listingHash be whitelisted.\n @param _listingHash The listingHash whose status is to be examined\n */\n function canBeWhitelisted(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n // Ensures that the application was made,\n // the application period has ended,\n // the listingHash can be whitelisted,\n // and either: the challengeID == 0, or the challenge has been resolved.\n if (\n /* solium-disable-next-line */\n appWasMade(_listingHash) &&\n /* solium-disable-next-line */\n listings[_listingHash].applicationExpiry < now &&\n /* solium-disable-next-line */\n !isWhitelisted(_listingHash) &&\n (challengeID == 0 || challenges[challengeID].resolved == true)\n ) {return true;}\n\n return false;\n }\n\n /**\n @dev Returns true if the provided listingHash is whitelisted\n @param _listingHash The listingHash whose status is to be examined\n */\n function isWhitelisted(bytes32 _listingHash) view public returns (bool whitelisted) {\n return listings[_listingHash].whitelisted;\n }\n\n /**\n @dev Returns true if apply was called for this listingHash\n @param _listingHash The listingHash whose status is to be examined\n */\n function appWasMade(bytes32 _listingHash) view public returns (bool exists) {\n return listings[_listingHash].applicationExpiry > 0;\n }\n\n /**\n @dev Returns true if the application/listingHash has an unresolved challenge\n @param _listingHash The listingHash whose status is to be examined\n */\n function challengeExists(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n return (listings[_listingHash].challengeID > 0 && !challenges[challengeID].resolved);\n }\n\n /**\n @dev Determines whether voting has concluded in a challenge for a given\n listingHash. Throws if no challenge exists.\n @param _listingHash A listingHash with an unresolved challenge\n */\n function challengeCanBeResolved(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n require(challengeExists(_listingHash));\n\n return voting.pollEnded(challengeID);\n }\n\n /**\n @dev Determines the number of tokens awarded to the winning party in a challenge.\n @param _challengeID The challengeID to determine a reward for\n */\n function determineReward(uint _challengeID) public view returns (uint) {\n require(!challenges[_challengeID].resolved && voting.pollEnded(_challengeID));\n\n // Edge case, nobody voted, give all tokens to the challenger.\n if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) {\n return 2 * challenges[_challengeID].stake;\n }\n\n return (2 * challenges[_challengeID].stake) - challenges[_challengeID].rewardPool;\n }\n\n /**\n @dev Getter for Challenge tokenClaims mappings\n @param _challengeID The challengeID to query\n @param _voter The voter whose claim status to query for the provided challengeID\n */\n function tokenClaims(uint _challengeID, address _voter) public view returns (bool) {\n return challenges[_challengeID].tokenClaims[_voter];\n }\n\n // ----------------\n // PRIVATE FUNCTIONS:\n // ----------------\n\n /**\n @dev Determines the winner in a challenge. Rewards the winner tokens and\n either whitelists or de-whitelists the listingHash.\n @param _listingHash A listingHash with a challenge that is to be resolved\n */\n function resolveChallenge(bytes32 _listingHash) private {\n uint challengeID = listings[_listingHash].challengeID;\n\n // Calculates the winner's reward,\n // which is: (winner's full stake) + (dispensationPct * loser's stake)\n uint reward = determineReward(challengeID);\n\n // Sets flag on challenge being processed\n challenges[challengeID].resolved = true;\n\n // Stores the total tokens used for voting by the winning side for reward purposes\n challenges[challengeID].totalTokens = voting.getTotalNumberOfTokensForWinningOption(challengeID);\n\n // Case: challenge failed\n if (voting.isPassed(challengeID)) {\n whitelistApplication(_listingHash);\n // Unlock stake so that it can be retrieved by the applicant\n listings[_listingHash].unstakedDeposit += reward;\n\n emit _ChallengeFailed(\n _listingHash,\n challengeID,\n challenges[challengeID].rewardPool,\n challenges[challengeID].totalTokens\n );\n } else { // Case: challenge succeeded or nobody voted\n resetListing(_listingHash);\n // Transfer the reward to the challenger\n require(token.transfer(challenges[challengeID].challenger, reward));\n\n emit _ChallengeSucceeded(\n _listingHash,\n challengeID,\n challenges[challengeID].rewardPool,\n challenges[challengeID].totalTokens\n );\n }\n }\n\n /**\n @dev Called by updateStatus() if the applicationExpiry date passed without a\n challenge being made. Called by resolveChallenge() if an\n application/listing beat a challenge.\n @param _listingHash The listingHash of an application/listingHash to be whitelisted\n */\n function whitelistApplication(bytes32 _listingHash) private {\n if (!listings[_listingHash].whitelisted) {emit _ApplicationWhitelisted(_listingHash);}\n listings[_listingHash].whitelisted = true;\n }\n\n /**\n @dev Deletes a listingHash from the whitelist and transfers tokens back to owner\n @param _listingHash The listing hash to delete\n */\n function resetListing(bytes32 _listingHash) private {\n Listing storage listing = listings[_listingHash];\n\n // Emit events before deleting listing to check whether is whitelisted\n if (listing.whitelisted) {\n emit _ListingRemoved(_listingHash);\n } else {\n emit _ApplicationRemoved(_listingHash);\n }\n\n // Deleting listing to prevent reentry\n address owner = listing.owner;\n uint unstakedDeposit = listing.unstakedDeposit;\n delete listings[_listingHash];\n\n // Transfers any remaining balance back to the owner\n if (unstakedDeposit > 0) {\n require(token.transfer(owner, unstakedDeposit));\n }\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/Registry.sol", + "bytecode": "0x60806040523480156200001157600080fd5b5060405162003549380380620035498339810180604052810190808051906020019092919080519060200190929190805190602001909291908051820192919050505083600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600590805190602001906200012f9291906200013a565b5050505050620001e9565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017d57805160ff1916838001178555620001ae565b82800160010185558215620001ae579182015b82811115620001ad57825182559160200191906001019062000190565b5b509050620001bd9190620001c1565b5090565b620001e691905b80821115620001e2576000816000905550600101620001c8565b5090565b90565b61335080620001f96000396000f30060806040526004361061011d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806301a5e3fe14610122578063040cf0201461016b57806306fdde03146101a65780630ca36263146102365780631b7bbecb146102675780631de26e16146102b057806343cffefe146102eb578063691a38ab1461034857806377609a411461039157806386bb8f37146103da57806389bb55c7146104115780638a59eb56146104645780638cf8151f146104955780638f1d3776146104de578063a5ba3b1e1461056b578063a7aad3db146105d0578063c18b8db41461063b578063c8187cf1146106cc578063e1e3f9151461070d578063fc0c546a14610764578063fce1ccca146107bb575b600080fd5b34801561012e57600080fd5b506101516004803603810190808035600019169060200190929190505050610812565b604051808215151515815260200191505060405180910390f35b34801561017757600080fd5b506101a4600480360381019080803560001916906020019092919080359060200190929190505050610847565b005b3480156101b257600080fd5b506101bb610b86565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101fb5780820151818401526020810190506101e0565b50505050905090810190601f1680156102285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561024257600080fd5b506102656004803603810190808035600019169060200190929190505050610c24565b005b34801561027357600080fd5b506102966004803603810190808035600019169060200190929190505050610d34565b604051808215151515815260200191505060405180910390f35b3480156102bc57600080fd5b506102e9600480360381019080803560001916906020019092919080359060200190929190505050610dae565b005b3480156102f757600080fd5b506103326004803603810190808035600019169060200190929190803590602001908201803590602001919091929391929390505050610fed565b6040518082815260200191505060405180910390f35b34801561035457600080fd5b506103776004803603810190808035600019169060200190929190505050611aaf565b604051808215151515815260200191505060405180910390f35b34801561039d57600080fd5b506103c06004803603810190808035600019169060200190929190505050611b6d565b604051808215151515815260200191505060405180910390f35b3480156103e657600080fd5b5061040f6004803603810190808035906020019092919080359060200190929190505050611c79565b005b34801561041d57600080fd5b50610462600480360381019080803560001916906020019092919080359060200190929190803590602001908201803590602001919091929391929390505050612087565b005b34801561047057600080fd5b506104936004803603810190808035600019169060200190929190505050612529565b005b3480156104a157600080fd5b506104c4600480360381019080803560001916906020019092919050505061256a565b604051808215151515815260200191505060405180910390f35b3480156104ea57600080fd5b5061050960048036038101908080359060200190929190505050612594565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b34801561057757600080fd5b506105b660048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506125f7565b604051808215151515815260200191505060405180910390f35b3480156105dc57600080fd5b50610625600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612661565b6040518082815260200191505060405180910390f35b34801561064757600080fd5b5061066a60048036038101908080356000191690602001909291905050506127d2565b60405180868152602001851515151581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019550505050505060405180910390f35b3480156106d857600080fd5b506106f760048036038101908080359060200190929190505050612835565b6040518082815260200191505060405180910390f35b34801561071957600080fd5b50610722612a96565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561077057600080fd5b50610779612abc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156107c757600080fd5b506107d0612ae2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900460ff169050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156108c457600080fd5b806002015482111515156108d757600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561099957600080fd5b505af11580156109ad573d6000803e3d6000fd5b505050506040513d60208110156109c357600080fd5b81019080805190602001909291905050506109eb838360020154612b0890919063ffffffff16565b101515156109f857600080fd5b610a0f828260020154612b0890919063ffffffff16565b8160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b81019080805190602001909291905050501515610b2257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167f9d9ed58779badf90c56d72f3b54def9f73dc875d8f86416c8334b55328c6c106848460020154604051808381526020018281526020019250505060405180910390a3505050565b60058054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610c1c5780601f10610bf157610100808354040283529160200191610c1c565b820191906000526020600020905b815481529060010190602001808311610bff57829003601f168201915b505050505081565b600060016000836000191660001916815260200190815260200160002090508060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610ca157600080fd5b610caa82610812565b1515610cb557600080fd5b600081600301541480610ceb57506000808260030154815260200190815260200160002060010160149054906101000a900460ff165b1515610cf657600080fd5b610cff82612b21565b81600019167f8a51904a50ce4451be09dc08242bd2d5565b05cf0f4f5aa88c77f96fdf538b4260405160405180910390a25050565b600080600160008460001916600019168152602001908152602001600020600301549050600060016000856000191660001916815260200190815260200160002060030154118015610da6575060008082815260200190815260200160002060010160149054906101000a900460ff16155b915050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610e2b57600080fd5b610e42828260020154612d7c90919063ffffffff16565b8160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015610f4357600080fd5b505af1158015610f57573d6000803e3d6000fd5b505050506040513d6020811015610f6d57600080fd5b81019080805190602001909291905050501515610f8957600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167ff63fcfb210c709154f0260502b2586fcee5550d17dc828be3127ccdedec620ab848460020154604051808381526020018281526020019250505060405180910390a3505050565b600080600080600080600160008a600019166000191681526020019081526020016000209450600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156110d557600080fd5b505af11580156110e9573d6000803e3d6000fd5b505050506040513d60208110156110ff57600080fd5b8101908080519060200190929190505050935061111b8961256a565b8061113457508460010160009054906101000a900460ff165b151561113f57600080fd5b60008560030154148061117557506000808660030154815260200190815260200160002060010160149054906101000a900460ff165b151561118057600080fd5b83856002015410156111cf5761119589612b21565b88600019167f4a9ee335af9e32f32f2229943dc7a0d3b5adf7e4c5c4062b372eae8c476d928660405160405180910390a260009550611aa3565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d60600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f766f746551756f72756d00000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156112cf57600080fd5b505af11580156112e3573d6000803e3d6000fd5b505050506040513d60208110156112f957600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f636f6d6d697453746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156113cc57600080fd5b505af11580156113e0573d6000803e3d6000fd5b505050506040513d60208110156113f657600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f72657665616c53746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156114c957600080fd5b505af11580156114dd573d6000803e3d6000fd5b505050506040513d60208110156114f357600080fd5b81019080805190602001909291905050506040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561156457600080fd5b505af1158015611578573d6000803e3d6000fd5b505050506040513d602081101561158e57600080fd5b8101908080519060200190929190505050925060a0604051908101604052806116e260646116d4886116c6600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600f8152602001807f64697370656e736174696f6e5063740000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561167b57600080fd5b505af115801561168f573d6000803e3d6000fd5b505050506040513d60208110156116a557600080fd5b81019080805190602001909291905050506064612b0890919063ffffffff16565b612d9890919063ffffffff16565b612dd090919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200185815260200160008152506000808581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508285600301819055506117d1848660020154612b0890919063ffffffff16565b8560020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156118d257600080fd5b505af11580156118e6573d6000803e3d6000fd5b505050506040513d60208110156118fc57600080fd5b8101908080519060200190929190505050151561191857600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b1580156119a957600080fd5b505af11580156119bd573d6000803e3d6000fd5b505050506040513d60a08110156119d357600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1689600019167ff98a08756a3603420a080d66764f73deb1e30896c315cfed03e17f88f5eb30f7858b8b8787604051808681526020018060200184815260200183815260200182810382528686828181526020019250808284378201915050965050505050505060405180910390a38295505b50505050509392505050565b600080600160008460001916600019168152602001908152602001600020600301549050611adc8361256a565b8015611b0557504260016000856000191660001916815260200190815260200160002060000154105b8015611b175750611b1583610812565b155b8015611b5457506000811480611b5357506001151560008083815260200190815260200160002060010160149054906101000a900460ff161515145b5b15611b625760019150611b67565b600091505b50919050565b600080600160008460001916600019168152602001908152602001600020600301549050611b9a83610d34565b1515611ba557600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830826040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015611c3657600080fd5b505af1158015611c4a573d6000803e3d6000fd5b505050506040513d6020811015611c6057600080fd5b8101908080519060200190929190505050915050919050565b6000806000151560008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cee57600080fd5b6001151560008086815260200190815260200160002060010160149054906101000a900460ff161515141515611d2357600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611df057600080fd5b505af1158015611e04573d6000803e3d6000fd5b505050506040513d6020811015611e1a57600080fd5b81019080805190602001909291905050509150611e38338585612661565b9050611e628260008087815260200190815260200160002060030154612b0890919063ffffffff16565b60008086815260200190815260200160002060030181905550611ea38160008087815260200190815260200160002060000154612b0890919063ffffffff16565b60008086815260200190815260200160002060000181905550600160008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611fec57600080fd5b505af1158015612000573d6000803e3d6000fd5b505050506040513d602081101561201657600080fd5b8101908080519060200190929190505050151561203257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a350505050565b600061209285610812565b15151561209e57600080fd5b6120a78561256a565b1515156120b357600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561217557600080fd5b505af1158015612189573d6000803e3d6000fd5b505050506040513d602081101561219f57600080fd5b810190808051906020019092919050505084101515156121be57600080fd5b6001600086600019166000191681526020019081526020016000209050338160010160016101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061232d600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600d8152602001807f6170706c7953746167654c656e00000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156122e357600080fd5b505af11580156122f7573d6000803e3d6000fd5b505050506040513d602081101561230d57600080fd5b810190808051906020019092919050505042612d7c90919063ffffffff16565b8160000181905550838160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1630876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561245b57600080fd5b505af115801561246f573d6000803e3d6000fd5b505050506040513d602081101561248557600080fd5b810190808051906020019092919050505015156124a157600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fa27f550c3c7a7c6d8369e5383fdc7a3b4850d8ce9e20066f9d496f6989f0086486846000015487876040518085815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a35050505050565b61253281611aaf565b156125455761254081612de6565b612567565b61254e81611b6d565b156125615761255c81612e83565b612566565b600080fd5b5b50565b60008060016000846000191660001916815260200190815260200160002060000154119050919050565b60006020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b600080600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600080600080878152602001908152602001600020600301549250600080878152602001908152602001600020600001549150600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b15801561276457600080fd5b505af1158015612778573d6000803e3d6000fd5b505050506040513d602081101561278e57600080fd5b810190808051906020019092919050505090506127c6836127b88484612d9890919063ffffffff16565b612dd090919063ffffffff16565b93505050509392505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900460ff16908060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060020154908060030154905085565b600080600083815260200190815260200160002060010160149054906101000a900460ff1615801561292f5750600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156128f357600080fd5b505af1158015612907573d6000803e3d6000fd5b505050506040513d602081101561291d57600080fd5b81019080805190602001909291905050505b151561293a57600080fd5b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156129cd57600080fd5b505af11580156129e1573d6000803e3d6000fd5b505050506040513d60208110156129f757600080fd5b81019080805190602001909291905050501415612a3e57612a37600080848152602001908152602001600020600201546002612d9890919063ffffffff16565b9050612a91565b612a8e60008084815260200190815260200160002060000154612a80600080868152602001908152602001600020600201546002612d9890919063ffffffff16565b612b0890919063ffffffff16565b90505b919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000828211151515612b1657fe5b818303905092915050565b600080600060016000856000191660001916815260200190815260200160002092508260010160009054906101000a900460ff1615612b905783600019167fd1ffb796b7108387b2f02adf47b4b81a1690cf2a190422c87a4f670780103e6360405160405180910390a2612bc2565b83600019167f2e5ec035f6eac8ff1cf7cdf36cfeca7c85413f9f67652dc2c13d20f337204a2660405160405180910390a25b8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506001600085600019166000191681526020019081526020016000206000808201600090556001820160006101000a81549060ff02191690556001820160016101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556002820160009055600382016000905550506000811115612d7657600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015612d2f57600080fd5b505af1158015612d43573d6000803e3d6000fd5b505050506040513d6020811015612d5957600080fd5b81019080805190602001909291905050501515612d7557600080fd5b5b50505050565b60008183019050828110151515612d8f57fe5b80905092915050565b600080831415612dab5760009050612dca565b8183029050818382811515612dbc57fe5b04141515612dc657fe5b8090505b92915050565b60008183811515612ddd57fe5b04905092915050565b60016000826000191660001916815260200190815260200160002060010160009054906101000a900460ff161515612e4a5780600019167fa7bc1d57d9006d9d248707c7b6828c1bab8c51719cc06d78c82a3ee891ef967c60405160405180910390a25b6001806000836000191660001916815260200190815260200160002060010160006101000a81548160ff02191690831515021790555050565b600080600160008460001916600019168152602001908152602001600020600301549150612eb082612835565b9050600160008084815260200190815260200160002060010160146101000a81548160ff021916908315150217905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612f7157600080fd5b505af1158015612f85573d6000803e3d6000fd5b505050506040513d6020811015612f9b57600080fd5b810190808051906020019092919050505060008084815260200190815260200160002060030181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349403183836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561305657600080fd5b505af115801561306a573d6000803e3d6000fd5b505050506040513d602081101561308057600080fd5b8101908080519060200190929190505050156131665761309f83612de6565b6130d08160016000866000191660001916815260200190815260200160002060020154612d7c90919063ffffffff16565b600160008560001916600019168152602001908152602001600020600201819055508183600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c16000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a361331f565b61316f83612b21565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb60008085815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561326957600080fd5b505af115801561327d573d6000803e3d6000fd5b505050506040513d602081101561329357600080fd5b810190808051906020019092919050505015156132af57600080fd5b8183600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe66000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a35b5050505600a165627a7a72305820f67c68529967670b3782a1c9b4ce00e10fd757b3311a13ec8d2b72976179ddc30029", + "deployedBytecode": "0x60806040526004361061011d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806301a5e3fe14610122578063040cf0201461016b57806306fdde03146101a65780630ca36263146102365780631b7bbecb146102675780631de26e16146102b057806343cffefe146102eb578063691a38ab1461034857806377609a411461039157806386bb8f37146103da57806389bb55c7146104115780638a59eb56146104645780638cf8151f146104955780638f1d3776146104de578063a5ba3b1e1461056b578063a7aad3db146105d0578063c18b8db41461063b578063c8187cf1146106cc578063e1e3f9151461070d578063fc0c546a14610764578063fce1ccca146107bb575b600080fd5b34801561012e57600080fd5b506101516004803603810190808035600019169060200190929190505050610812565b604051808215151515815260200191505060405180910390f35b34801561017757600080fd5b506101a4600480360381019080803560001916906020019092919080359060200190929190505050610847565b005b3480156101b257600080fd5b506101bb610b86565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101fb5780820151818401526020810190506101e0565b50505050905090810190601f1680156102285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561024257600080fd5b506102656004803603810190808035600019169060200190929190505050610c24565b005b34801561027357600080fd5b506102966004803603810190808035600019169060200190929190505050610d34565b604051808215151515815260200191505060405180910390f35b3480156102bc57600080fd5b506102e9600480360381019080803560001916906020019092919080359060200190929190505050610dae565b005b3480156102f757600080fd5b506103326004803603810190808035600019169060200190929190803590602001908201803590602001919091929391929390505050610fed565b6040518082815260200191505060405180910390f35b34801561035457600080fd5b506103776004803603810190808035600019169060200190929190505050611aaf565b604051808215151515815260200191505060405180910390f35b34801561039d57600080fd5b506103c06004803603810190808035600019169060200190929190505050611b6d565b604051808215151515815260200191505060405180910390f35b3480156103e657600080fd5b5061040f6004803603810190808035906020019092919080359060200190929190505050611c79565b005b34801561041d57600080fd5b50610462600480360381019080803560001916906020019092919080359060200190929190803590602001908201803590602001919091929391929390505050612087565b005b34801561047057600080fd5b506104936004803603810190808035600019169060200190929190505050612529565b005b3480156104a157600080fd5b506104c4600480360381019080803560001916906020019092919050505061256a565b604051808215151515815260200191505060405180910390f35b3480156104ea57600080fd5b5061050960048036038101908080359060200190929190505050612594565b604051808681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001841515151581526020018381526020018281526020019550505050505060405180910390f35b34801561057757600080fd5b506105b660048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506125f7565b604051808215151515815260200191505060405180910390f35b3480156105dc57600080fd5b50610625600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919080359060200190929190505050612661565b6040518082815260200191505060405180910390f35b34801561064757600080fd5b5061066a60048036038101908080356000191690602001909291905050506127d2565b60405180868152602001851515151581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019550505050505060405180910390f35b3480156106d857600080fd5b506106f760048036038101908080359060200190929190505050612835565b6040518082815260200191505060405180910390f35b34801561071957600080fd5b50610722612a96565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561077057600080fd5b50610779612abc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156107c757600080fd5b506107d0612ae2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900460ff169050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156108c457600080fd5b806002015482111515156108d757600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561099957600080fd5b505af11580156109ad573d6000803e3d6000fd5b505050506040513d60208110156109c357600080fd5b81019080805190602001909291905050506109eb838360020154612b0890919063ffffffff16565b101515156109f857600080fd5b610a0f828260020154612b0890919063ffffffff16565b8160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b81019080805190602001909291905050501515610b2257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167f9d9ed58779badf90c56d72f3b54def9f73dc875d8f86416c8334b55328c6c106848460020154604051808381526020018281526020019250505060405180910390a3505050565b60058054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610c1c5780601f10610bf157610100808354040283529160200191610c1c565b820191906000526020600020905b815481529060010190602001808311610bff57829003601f168201915b505050505081565b600060016000836000191660001916815260200190815260200160002090508060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610ca157600080fd5b610caa82610812565b1515610cb557600080fd5b600081600301541480610ceb57506000808260030154815260200190815260200160002060010160149054906101000a900460ff165b1515610cf657600080fd5b610cff82612b21565b81600019167f8a51904a50ce4451be09dc08242bd2d5565b05cf0f4f5aa88c77f96fdf538b4260405160405180910390a25050565b600080600160008460001916600019168152602001908152602001600020600301549050600060016000856000191660001916815260200190815260200160002060030154118015610da6575060008082815260200190815260200160002060010160149054906101000a900460ff16155b915050919050565b600060016000846000191660001916815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610e2b57600080fd5b610e42828260020154612d7c90919063ffffffff16565b8160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015610f4357600080fd5b505af1158015610f57573d6000803e3d6000fd5b505050506040513d6020811015610f6d57600080fd5b81019080805190602001909291905050501515610f8957600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1683600019167ff63fcfb210c709154f0260502b2586fcee5550d17dc828be3127ccdedec620ab848460020154604051808381526020018281526020019250505060405180910390a3505050565b600080600080600080600160008a600019166000191681526020019081526020016000209450600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156110d557600080fd5b505af11580156110e9573d6000803e3d6000fd5b505050506040513d60208110156110ff57600080fd5b8101908080519060200190929190505050935061111b8961256a565b8061113457508460010160009054906101000a900460ff165b151561113f57600080fd5b60008560030154148061117557506000808660030154815260200190815260200160002060010160149054906101000a900460ff165b151561118057600080fd5b83856002015410156111cf5761119589612b21565b88600019167f4a9ee335af9e32f32f2229943dc7a0d3b5adf7e4c5c4062b372eae8c476d928660405160405180910390a260009550611aa3565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166332ed3d60600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f766f746551756f72756d00000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156112cf57600080fd5b505af11580156112e3573d6000803e3d6000fd5b505050506040513d60208110156112f957600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f636f6d6d697453746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156113cc57600080fd5b505af11580156113e0573d6000803e3d6000fd5b505050506040513d60208110156113f657600080fd5b8101908080519060200190929190505050600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600e8152602001807f72657665616c53746167654c656e000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156114c957600080fd5b505af11580156114dd573d6000803e3d6000fd5b505050506040513d60208110156114f357600080fd5b81019080805190602001909291905050506040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018281526020019350505050602060405180830381600087803b15801561156457600080fd5b505af1158015611578573d6000803e3d6000fd5b505050506040513d602081101561158e57600080fd5b8101908080519060200190929190505050925060a0604051908101604052806116e260646116d4886116c6600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600f8152602001807f64697370656e736174696f6e5063740000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561167b57600080fd5b505af115801561168f573d6000803e3d6000fd5b505050506040513d60208110156116a557600080fd5b81019080805190602001909291905050506064612b0890919063ffffffff16565b612d9890919063ffffffff16565b612dd090919063ffffffff16565b81526020013373ffffffffffffffffffffffffffffffffffffffff16815260200160001515815260200185815260200160008152506000808581526020019081526020016000206000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160146101000a81548160ff02191690831515021790555060608201518160020155608082015181600301559050508285600301819055506117d1848660020154612b0890919063ffffffff16565b8560020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b1580156118d257600080fd5b505af11580156118e6573d6000803e3d6000fd5b505050506040513d60208110156118fc57600080fd5b8101908080519060200190929190505050151561191857600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636148fed5846040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505060a060405180830381600087803b1580156119a957600080fd5b505af11580156119bd573d6000803e3d6000fd5b505050506040513d60a08110156119d357600080fd5b81019080805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090915090505080925081935050503373ffffffffffffffffffffffffffffffffffffffff1689600019167ff98a08756a3603420a080d66764f73deb1e30896c315cfed03e17f88f5eb30f7858b8b8787604051808681526020018060200184815260200183815260200182810382528686828181526020019250808284378201915050965050505050505060405180910390a38295505b50505050509392505050565b600080600160008460001916600019168152602001908152602001600020600301549050611adc8361256a565b8015611b0557504260016000856000191660001916815260200190815260200160002060000154105b8015611b175750611b1583610812565b155b8015611b5457506000811480611b5357506001151560008083815260200190815260200160002060010160149054906101000a900460ff161515145b5b15611b625760019150611b67565b600091505b50919050565b600080600160008460001916600019168152602001908152602001600020600301549050611b9a83610d34565b1515611ba557600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830826040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015611c3657600080fd5b505af1158015611c4a573d6000803e3d6000fd5b505050506040513d6020811015611c6057600080fd5b8101908080519060200190929190505050915050919050565b6000806000151560008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515141515611cee57600080fd5b6001151560008086815260200190815260200160002060010160149054906101000a900460ff161515141515611d2357600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0693386866040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b158015611df057600080fd5b505af1158015611e04573d6000803e3d6000fd5b505050506040513d6020811015611e1a57600080fd5b81019080805190602001909291905050509150611e38338585612661565b9050611e628260008087815260200190815260200160002060030154612b0890919063ffffffff16565b60008086815260200190815260200160002060030181905550611ea38160008087815260200190815260200160002060000154612b0890919063ffffffff16565b60008086815260200190815260200160002060000181905550600160008086815260200190815260200160002060040160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb33836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015611fec57600080fd5b505af1158015612000573d6000803e3d6000fd5b505050506040513d602081101561201657600080fd5b8101908080519060200190929190505050151561203257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff16847f6f4c982acc31b0af2cf1dc1556f21c0325d893782d65e83c68a5534a33f59957836040518082815260200191505060405180910390a350505050565b600061209285610812565b15151561209e57600080fd5b6120a78561256a565b1515156120b357600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600a8152602001807f6d696e4465706f73697400000000000000000000000000000000000000000000815250602001915050602060405180830381600087803b15801561217557600080fd5b505af1158015612189573d6000803e3d6000fd5b505050506040513d602081101561219f57600080fd5b810190808051906020019092919050505084101515156121be57600080fd5b6001600086600019166000191681526020019081526020016000209050338160010160016101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061232d600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663693ec85e6040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180806020018281038252600d8152602001807f6170706c7953746167654c656e00000000000000000000000000000000000000815250602001915050602060405180830381600087803b1580156122e357600080fd5b505af11580156122f7573d6000803e3d6000fd5b505050506040513d602081101561230d57600080fd5b810190808051906020019092919050505042612d7c90919063ffffffff16565b8160000181905550838160020181905550600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166323b872dd8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff1630876040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561245b57600080fd5b505af115801561246f573d6000803e3d6000fd5b505050506040513d602081101561248557600080fd5b810190808051906020019092919050505015156124a157600080fd5b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fa27f550c3c7a7c6d8369e5383fdc7a3b4850d8ce9e20066f9d496f6989f0086486846000015487876040518085815260200184815260200180602001828103825284848281815260200192508082843782019150509550505050505060405180910390a35050505050565b61253281611aaf565b156125455761254081612de6565b612567565b61254e81611b6d565b156125615761255c81612e83565b612566565b600080fd5b5b50565b60008060016000846000191660001916815260200190815260200160002060000154119050919050565b60006020528060005260406000206000915090508060000154908060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060010160149054906101000a900460ff16908060020154908060030154905085565b600080600084815260200190815260200160002060040160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600080600080600080878152602001908152602001600020600301549250600080878152602001908152602001600020600001549150600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b43bd0698888886040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018281526020019350505050602060405180830381600087803b15801561276457600080fd5b505af1158015612778573d6000803e3d6000fd5b505050506040513d602081101561278e57600080fd5b810190808051906020019092919050505090506127c6836127b88484612d9890919063ffffffff16565b612dd090919063ffffffff16565b93505050509392505050565b60016020528060005260406000206000915090508060000154908060010160009054906101000a900460ff16908060010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060020154908060030154905085565b600080600083815260200190815260200160002060010160149054906101000a900460ff1615801561292f5750600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ee684830836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156128f357600080fd5b505af1158015612907573d6000803e3d6000fd5b505050506040513d602081101561291d57600080fd5b81019080805190602001909291905050505b151561293a57600080fd5b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b1580156129cd57600080fd5b505af11580156129e1573d6000803e3d6000fd5b505050506040513d60208110156129f757600080fd5b81019080805190602001909291905050501415612a3e57612a37600080848152602001908152602001600020600201546002612d9890919063ffffffff16565b9050612a91565b612a8e60008084815260200190815260200160002060000154612a80600080868152602001908152602001600020600201546002612d9890919063ffffffff16565b612b0890919063ffffffff16565b90505b919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000828211151515612b1657fe5b818303905092915050565b600080600060016000856000191660001916815260200190815260200160002092508260010160009054906101000a900460ff1615612b905783600019167fd1ffb796b7108387b2f02adf47b4b81a1690cf2a190422c87a4f670780103e6360405160405180910390a2612bc2565b83600019167f2e5ec035f6eac8ff1cf7cdf36cfeca7c85413f9f67652dc2c13d20f337204a2660405160405180910390a25b8260010160019054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150826002015490506001600085600019166000191681526020019081526020016000206000808201600090556001820160006101000a81549060ff02191690556001820160016101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556002820160009055600382016000905550506000811115612d7657600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015612d2f57600080fd5b505af1158015612d43573d6000803e3d6000fd5b505050506040513d6020811015612d5957600080fd5b81019080805190602001909291905050501515612d7557600080fd5b5b50505050565b60008183019050828110151515612d8f57fe5b80905092915050565b600080831415612dab5760009050612dca565b8183029050818382811515612dbc57fe5b04141515612dc657fe5b8090505b92915050565b60008183811515612ddd57fe5b04905092915050565b60016000826000191660001916815260200190815260200160002060010160009054906101000a900460ff161515612e4a5780600019167fa7bc1d57d9006d9d248707c7b6828c1bab8c51719cc06d78c82a3ee891ef967c60405160405180910390a25b6001806000836000191660001916815260200190815260200160002060010160006101000a81548160ff02191690831515021790555050565b600080600160008460001916600019168152602001908152602001600020600301549150612eb082612835565b9050600160008084815260200190815260200160002060010160146101000a81548160ff021916908315150217905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663053e71a6836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b158015612f7157600080fd5b505af1158015612f85573d6000803e3d6000fd5b505050506040513d6020811015612f9b57600080fd5b810190808051906020019092919050505060008084815260200190815260200160002060030181905550600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166349403183836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561305657600080fd5b505af115801561306a573d6000803e3d6000fd5b505050506040513d602081101561308057600080fd5b8101908080519060200190929190505050156131665761309f83612de6565b6130d08160016000866000191660001916815260200190815260200160002060020154612d7c90919063ffffffff16565b600160008560001916600019168152602001908152602001600020600201819055508183600019167fc4497224aa78dd50c9b3e344aab02596201ca1e6dca4057a91a6c02f83f4f6c16000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a361331f565b61316f83612b21565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb60008085815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561326957600080fd5b505af115801561327d573d6000803e3d6000fd5b505050506040513d602081101561329357600080fd5b810190808051906020019092919050505015156132af57600080fd5b8183600019167f362a12431f779a2baff4f77f75ba7960ae993a5c41b425df11f7fd0af2b9cbe66000808681526020019081526020016000206000015460008087815260200190815260200160002060030154604051808381526020018281526020019250505060405180910390a35b5050505600a165627a7a72305820f67c68529967670b3782a1c9b4ce00e10fd757b3311a13ec8d2b72976179ddc30029", + "sourceMap": "131:17664:8:-;;;2866:253;8:9:-1;5:2;;;30:1;27;20:12;5:2;2866:253:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3001:10;2987:5;;:25;;;;;;;;;;;;;;;;;;3038:9;3018:6;;:30;;;;;;;;;;;;;;;;;;3084:11;3054:13;;:42;;;;;;;;;;;;;;;;;;3109:5;3102:4;:12;;;;;;;;;;;;:::i;:::-;;2866:253;;;;131:17664;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;", + "deployedSourceMap": "131:17664:8:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12410:136;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12410:136:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5268:532;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5268:532:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2481:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2481:18:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;2481:18:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6053:434;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6053:434:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13022:229;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13022:229:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4606:403;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4606:403:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6998:1666;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6998:1666:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11544:704;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11544:704:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13486:233;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13486:233:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9571:993;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9571:993:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3615:734;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3615:734:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8893:268;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8893:268:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12706:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12706:138:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2219:44;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2219:44:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14577:145;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14577:145:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11020:361;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11020:361:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2323:43;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2323:43:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13897:465;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13897:465:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2443:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2443:34:8;;;;;;;;;;;;;;;;;;;;;;;;;;;2393:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2393:18:8;;;;;;;;;;;;;;;;;;;;;;;;;;;2415:24;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2415:24:8;;;;;;;;;;;;;;;;;;;;;;;;;;;12410:136;12476:16;12507:8;:22;12516:12;12507:22;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;12500:41;;12410:136;;;:::o;5268:532::-;5337:23;5363:8;:22;5372:12;5363:22;;;;;;;;;;;;;;;;;5337:48;;5417:10;5400:27;;:7;:13;;;;;;;;;;;;:27;;;5392:36;;;;;;;;5453:7;:23;;;5442:7;:34;;5434:43;;;;;;;;5531:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5531:31:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5531:31:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5531:31:8;;;;;;;;;;;;;;;;5491:36;5519:7;5491;:23;;;:27;;:36;;;;:::i;:::-;:71;;5483:80;;;;;;;;5596:36;5624:7;5596;:23;;;:27;;:36;;;;:::i;:::-;5570:7;:23;;:62;;;;5646:5;;;;;;;;;;;:14;;;5661:10;5673:7;5646:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5646:35:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5646:35:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;5646:35:8;;;;;;;;;;;;;;;;5638:44;;;;;;;;5779:10;5694:101;;5713:12;5694:101;;;;5733:7;5748;:23;;;5694:101;;;;;;;;;;;;;;;;;;;;;;;;5268:532;;;:::o;2481:18::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6053:434::-;6104:23;6130:8;:22;6139:12;6130:22;;;;;;;;;;;;;;;;;6104:48;;6181:7;:13;;;;;;;;;;;;6167:27;;:10;:27;;;6159:36;;;;;;;;6209:27;6223:12;6209:13;:27::i;:::-;6201:36;;;;;;;;6319:1;6296:7;:19;;;:24;:68;;;;6324:10;:31;6335:7;:19;;;6324:31;;;;;;;;;;;:40;;;;;;;;;;;;6296:68;6288:77;;;;;;;;6414:26;6427:12;6414;:26::i;:::-;6469:12;6451:31;;;;;;;;;;;;;6053:434;;:::o;13022:229::-;13090:4;13102:16;13121:8;:22;13130:12;13121:22;;;;;;;;;;;;;;;;;:34;;;13102:53;;13207:1;13170:8;:22;13179:12;13170:22;;;;;;;;;;;;;;;;;:34;;;:38;:75;;;;;13213:10;:23;13224:11;13213:23;;;;;;;;;;;:32;;;;;;;;;;;;13212:33;13170:75;13162:84;;13022:229;;;;:::o;4606:403::-;4674:23;4700:8;:22;4709:12;4700:22;;;;;;;;;;;;;;;;;4674:48;;4754:10;4737:27;;:7;:13;;;;;;;;;;;;:27;;;4729:36;;;;;;;;4798;4826:7;4798;:23;;;:27;;:36;;;;:::i;:::-;4772:7;:23;;:62;;;;4848:5;;;;;;;;;;;:18;;;4867:10;4879:4;4885:7;4848:45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4848:45:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4848:45:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4848:45:8;;;;;;;;;;;;;;;;4840:54;;;;;;;;4988:10;4906:98;;4922:12;4906:98;;;;4942:7;4957;:23;;;4906:98;;;;;;;;;;;;;;;;;;;;;;;;4606:403;;;:::o;6998:1666::-;7071:16;7095:23;7149:15;7673:11;8400:18;8424;7121:8;:22;7130:12;7121:22;;;;;;;;;;;;;;;;;7095:48;;7167:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7167:31:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7167:31:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7167:31:8;;;;;;;;;;;;;;;;7149:49;;7279:24;7290:12;7279:10;:24::i;:::-;:47;;;;7307:7;:19;;;;;;;;;;;;7279:47;7271:56;;;;;;;;7399:1;7376:7;:19;;;:24;:68;;;;7404:10;:31;7415:7;:19;;;7404:31;;;;;;;;;;;:40;;;;;;;;;;;;7376:68;7368:77;;;;;;;;7482:10;7456:7;:23;;;:36;7452:196;;;7556:26;7569:12;7556;:26::i;:::-;7612:12;7595:30;;;;;;;;;;;;;7640:1;7633:8;;;;7452:196;7687:6;;;;;;;;;;;:16;;;7711:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7711:31:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7711:31:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7711:31:8;;;;;;;;;;;;;;;;7750:13;;;;;;;;;;;:17;;;:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7750:35:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7750:35:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7750:35:8;;;;;;;;;;;;;;;;7793:13;;;;;;;;;;;:17;;;:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7793:35:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7793:35:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7793:35:8;;;;;;;;;;;;;;;;7687:147;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7687:147:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7687:147:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7687:147:8;;;;;;;;;;;;;;;;7673:161;;7862:213;;;;;;;;;7922:76;7994:3;7922:67;7978:10;7922:51;7936:13;;;;;;;;;;;:17;;;:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7936:36:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7936:36:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7936:36:8;;;;;;;;;;;;;;;;7927:3;7922:13;;:51;;;;:::i;:::-;:55;;:67;;;;:::i;:::-;:71;;:76;;;;:::i;:::-;7862:213;;;;7892:10;7862:213;;;;;;8041:5;7862:213;;;;;;8013:10;7862:213;;;;8067:1;7862:213;;;7841:10;:18;7852:6;7841:18;;;;;;;;;;;:234;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8162:6;8140:7;:19;;:28;;;;8254:39;8282:10;8254:7;:23;;;:27;;:39;;;;:::i;:::-;8228:7;:23;;:65;;;;8344:5;;;;;;;;;;;:18;;;8363:10;8375:4;8381:10;8344:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8344:48:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8344:48:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;8344:48:8;;;;;;;;;;;;;;;;8336:57;;;;;;;;8482:6;;;;;;;;;;;:14;;;8497:6;8482:22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8482:22:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8482:22:8;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;8482:22:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8448:56;;;;;;;;;;;;;;8623:10;8516:123;;8534:12;8516:123;;;;8554:6;8568:5;;8581:13;8602;8516:123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8653:6;8646:13;;6998:1666;;;;;;;;;;;:::o;11544:704::-;11613:4;11625:16;11644:8;:22;11653:12;11644:22;;;;;;;;;;;;;;;;;:34;;;11625:53;;11940:24;11951:12;11940:10;:24::i;:::-;:117;;;;;12054:3;12011:8;:22;12020:12;12011:22;;;;;;;;;;;;;;;;;:40;;;:46;11940:117;:192;;;;;12105:27;12119:12;12105:13;:27::i;:::-;12104:28;11940:192;:264;;;;;12158:1;12143:11;:16;:60;;;;12199:4;12163:40;;:10;:23;12174:11;12163:23;;;;;;;;;;;:32;;;;;;;;;;;;:40;;;12143:60;11940:264;11892:333;;;12219:4;12212:11;;;;11892:333;12238:5;12231:12;;11544:704;;;;;:::o;13486:233::-;13561:4;13573:16;13592:8;:22;13601:12;13592:22;;;;;;;;;;;;;;;;;:34;;;13573:53;;13641:29;13657:12;13641:15;:29::i;:::-;13633:38;;;;;;;;13685:6;;;;;;;;;;;:16;;;13702:11;13685:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13685:29:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13685:29:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13685:29:8;;;;;;;;;;;;;;;;13678:36;;13486:233;;;;:::o;9571:993::-;9863:16;9947:11;9794:5;9742:57;;:10;:24;9753:12;9742:24;;;;;;;;;;;:36;;:48;9779:10;9742:48;;;;;;;;;;;;;;;;;;;;;;;;;:57;;;9734:66;;;;;;;;9851:4;9814:41;;:10;:24;9825:12;9814:24;;;;;;;;;;;:33;;;;;;;;;;;;:41;;;9806:50;;;;;;;;9882:6;;;;;;;;;;;:26;;;9909:10;9921:12;9935:5;9882:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9882:59:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9882:59:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9882:59:8;;;;;;;;;;;;;;;;9863:78;;9961:44;9973:10;9985:12;9999:5;9961:11;:44::i;:::-;9947:58;;10194:53;10235:11;10194:10;:24;10205:12;10194:24;;;;;;;;;;;:36;;;:40;;:53;;;;:::i;:::-;10155:10;:24;10166:12;10155:24;;;;;;;;;;;:36;;:92;;;;10291:47;10331:6;10291:10;:24;10302:12;10291:24;;;;;;;;;;;:35;;;:39;;:47;;;;:::i;:::-;10253:10;:24;10264:12;10253:24;;;;;;;;;;;:35;;:85;;;;10445:4;10394:10;:24;10405:12;10394:24;;;;;;;;;;;:36;;:48;10431:10;10394:48;;;;;;;;;;;;;;;;:55;;;;;;;;;;;;;;;;;;10464:5;;;;;;;;;;;:14;;;10479:10;10491:6;10464:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10464:34:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10464:34:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;10464:34:8;;;;;;;;;;;;;;;;10456:43;;;;;;;;10548:10;10511:48;;10526:12;10511:48;10540:6;10511:48;;;;;;;;;;;;;;;;;;9571:993;;;;:::o;3615:734::-;3854:23;3704:27;3718:12;3704:13;:27::i;:::-;3703:28;3695:37;;;;;;;;3747:24;3758:12;3747:10;:24::i;:::-;3746:25;3738:34;;;;;;;;3797:13;;;;;;;;;;;:17;;;:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3797:31:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3797:31:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3797:31:8;;;;;;;;;;;;;;;;3786:7;:42;;3778:51;;;;;;;;3880:8;:22;3889:12;3880:22;;;;;;;;;;;;;;;;;3854:48;;3924:10;3908:7;:13;;;:26;;;;;;;;;;;;;;;;;;4002:55;4022:13;;;;;;;;;;;:17;;;:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4022:34:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4022:34:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4022:34:8;;;;;;;;;;;;;;;;4002:15;:19;;:55;;;;:::i;:::-;3974:7;:25;;:83;;;;4089:7;4063;:23;;:33;;;;4166:5;;;;;;;;;;;:18;;;4185:7;:13;;;;;;;;;;;;4200:4;4206:7;4166:48;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4166:48:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4166:48:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4166:48:8;;;;;;;;;;;;;;;;4158:57;;;;;;;;4328:10;4227:117;;4247:12;4227:117;;;;4267:7;4282;:25;;;4315:5;;4227:117;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3615:734;;;;;:::o;8893:268::-;8954:30;8971:12;8954:16;:30::i;:::-;8950:207;;;8994:34;9015:12;8994:20;:34::i;:::-;8950:207;;;9045:36;9068:12;9045:22;:36::i;:::-;9041:116;;;9091:30;9108:12;9091:16;:30::i;:::-;9041:116;;;9142:8;;;9041:116;8950:207;8893:268;:::o;12706:138::-;12769:11;12838:1;12795:8;:22;12804:12;12795:22;;;;;;;;;;;;;;;;;:40;;;:44;12788:51;;12706:138;;;:::o;2219:44::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;14577:145::-;14654:4;14673:10;:24;14684:12;14673:24;;;;;;;;;;;:36;;:44;14710:6;14673:44;;;;;;;;;;;;;;;;;;;;;;;;;14666:51;;14577:145;;;;:::o;11020:361::-;11111:4;11125:16;11186:15;11245:16;11144:10;:24;11155:12;11144:24;;;;;;;;;;;:36;;;11125:55;;11204:10;:24;11215:12;11204:24;;;;;;;;;;;:35;;;11186:53;;11264:6;;;;;;;;;;;:26;;;11291:6;11299:12;11313:5;11264:55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11264:55:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11264:55:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;11264:55:8;;;;;;;;;;;;;;;;11245:74;;11332:44;11364:11;11332:27;11348:10;11332:11;:15;;:27;;;;:::i;:::-;:31;;:44;;;;:::i;:::-;11325:51;;11020:361;;;;;;;;:::o;2323:43::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;13897:465::-;13962:4;13983:10;:24;13994:12;13983:24;;;;;;;;;;;:33;;;;;;;;;;;;13982:34;:68;;;;;14020:6;;;;;;;;;;;:16;;;14037:12;14020:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14020:30:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14020:30:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14020:30:8;;;;;;;;;;;;;;;;13982:68;13974:77;;;;;;;;14192:1;14129:6;;;;;;;;;;;:45;;;14175:12;14129:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14129:59:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14129:59:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;14129:59:8;;;;;;;;;;;;;;;;:64;14125:135;;;14210:43;14222:10;:24;14233:12;14222:24;;;;;;;;;;;:30;;;14215:1;14210:11;;:43;;;;:::i;:::-;14203:50;;;;14125:135;14273:84;14321:10;:24;14332:12;14321:24;;;;;;;;;;;:35;;;14273:43;14285:10;:24;14296:12;14285:24;;;;;;;;;;;:30;;;14278:1;14273:11;;:43;;;;:::i;:::-;:47;;:84;;;;:::i;:::-;14266:91;;13897:465;;;;:::o;2443:34::-;;;;;;;;;;;;;:::o;2393:18::-;;;;;;;;;;;;;:::o;2415:24::-;;;;;;;;;;;;;:::o;1041:110:9:-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;17152:641:8:-;17210:23;17522:13;17557:20;17236:8;:22;17245:12;17236:22;;;;;;;;;;;;;;;;;17210:48;;17344:7;:19;;;;;;;;;;;;17340:133;;;17394:12;17378:29;;;;;;;;;;;;;17340:133;;;17453:12;17433:33;;;;;;;;;;;;;17340:133;17538:7;:13;;;;;;;;;;;;17522:29;;17580:7;:23;;;17557:46;;17616:8;:22;17625:12;17616:22;;;;;;;;;;;;;;;;;;17609:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17724:1;17706:15;:19;17702:87;;;17743:5;;;;;;;;;;;:14;;;17758:5;17765:15;17743:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;17743:38:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;17743:38:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;17743:38:8;;;;;;;;;;;;;;;;17735:47;;;;;;;;17702:87;17152:641;;;;:::o;1213:123:9:-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o;202:373::-;260:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;531:1;527;:5;523:9;;554:1;549;545;:5;;;;;;;;:10;538:18;;;;;;569:1;562:8;;202:373;;;;;:::o;657:272::-;715:7;923:1;919;:5;;;;;;;;912:12;;657:272;;;;:::o;16787:203:8:-;16858:8;:22;16867:12;16858:22;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;16857:35;16853:86;;;16924:12;16900:37;;;;;;;;;;;;;16853:86;16981:4;16944:8;:22;16953:12;16944:22;;;;;;;;;;;;;;;;;:34;;;:41;;;;;;;;;;;;;;;;;;16787:203;:::o;15046:1407::-;15108:16;15282:11;15127:8;:22;15136:12;15127:22;;;;;;;;;;;;;;;;;:34;;;15108:53;;15296:28;15312:11;15296:15;:28::i;:::-;15282:42;;15412:4;15377:10;:23;15388:11;15377:23;;;;;;;;;;;:32;;;:39;;;;;;;;;;;;;;;;;;15548:6;;;;;;;;;;;:45;;;15594:11;15548:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15548:58:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15548:58:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15548:58:8;;;;;;;;;;;;;;;;15510:10;:23;15521:11;15510:23;;;;;;;;;;;:35;;:96;;;;15647:6;;;;;;;;;;;:15;;;15663:11;15647:28;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15647:28:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15647:28:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15647:28:8;;;;;;;;;;;;;;;;15643:806;;;15685:34;15706:12;15685:20;:34::i;:::-;15835:50;15878:6;15835:8;:22;15844:12;15835:22;;;;;;;;;;;;;;;;;:38;;;:42;;:50;;;;:::i;:::-;15794:8;:22;15803:12;15794:22;;;;;;;;;;;;;;;;;:38;;:91;;;;15947:11;15925:12;15899:156;;;;15968:10;:23;15979:11;15968:23;;;;;;;;;;;:34;;;16012:10;:23;16023:11;16012:23;;;;;;;;;;;:35;;;15899:156;;;;;;;;;;;;;;;;;;;;;;;;15643:806;;;16121:26;16134:12;16121;:26::i;:::-;16210:5;;;;;;;;;;;:14;;;16225:10;:23;16236:11;16225:23;;;;;;;;;;;:34;;;;;;;;;;;;16261:6;16210:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16210:58:8;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16210:58:8;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16210:58:8;;;;;;;;;;;;;;;;16202:67;;;;;;;;16334:11;16312:12;16283:159;;;;16355:10;:23;16366:11;16355:23;;;;;;;;;;;:34;;;16399:10;:23;16410:11;16399:23;;;;;;;;;;;:35;;;16283:159;;;;;;;;;;;;;;;;;;;;;;;;15643:806;15046:1407;;;:::o", + "source": "pragma solidity 0.4.24;\n\nimport \"./ERC20.sol\";\nimport \"./Parameterizer.sol\";\nimport \"./PLCRVoting.sol\";\nimport \"./SafeMath.sol\";\n\n\ncontract Registry {\n\n // ------\n // EVENTS\n // ------\n\n event _Application(bytes32 indexed listingHash, uint deposit, uint appEndDate, string data, address indexed applicant);\n event _Challenge(bytes32 indexed listingHash, uint challengeID, string data, uint commitEndDate, uint revealEndDate, address indexed challenger);\n event _Deposit(bytes32 indexed listingHash, uint added, uint newTotal, address indexed owner);\n event _Withdrawal(bytes32 indexed listingHash, uint withdrew, uint newTotal, address indexed owner);\n event _ApplicationWhitelisted(bytes32 indexed listingHash);\n event _ApplicationRemoved(bytes32 indexed listingHash);\n event _ListingRemoved(bytes32 indexed listingHash);\n event _ListingWithdrawn(bytes32 indexed listingHash);\n event _TouchAndRemoved(bytes32 indexed listingHash);\n event _ChallengeFailed(bytes32 indexed listingHash, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _ChallengeSucceeded(bytes32 indexed listingHash, uint indexed challengeID, uint rewardPool, uint totalTokens);\n event _RewardClaimed(uint indexed challengeID, uint reward, address indexed voter);\n\n using SafeMath for uint;\n\n struct Listing {\n uint applicationExpiry; // Expiration date of apply stage\n bool whitelisted; // Indicates registry status\n address owner; // Owner of Listing\n uint unstakedDeposit; // Number of tokens in the listing not locked in a challenge\n uint challengeID; // Corresponds to a PollID in PLCRVoting\n }\n\n struct Challenge {\n uint rewardPool; // (remaining) Pool of tokens to be distributed to winning voters\n address challenger; // Owner of Challenge\n bool resolved; // Indication of if challenge is resolved\n uint stake; // Number of tokens at stake for either party during challenge\n uint totalTokens; // (remaining) Number of tokens used in voting by the winning side\n mapping(address => bool) tokenClaims; // Indicates whether a voter has claimed a reward yet\n }\n\n // Maps challengeIDs to associated challenge data\n mapping(uint => Challenge) public challenges;\n\n // Maps listingHashes to associated listingHash data\n mapping(bytes32 => Listing) public listings;\n\n // Global Variables\n ERC20 public token;\n PLCRVoting public voting;\n Parameterizer public parameterizer;\n string public name;\n\n // ------------\n // CONSTRUCTOR:\n // ------------\n\n /**\n @dev Contructor Sets the addresses for token, voting, and parameterizer\n @param _tokenAddr Address of the TCR's intrinsic ERC20 token\n @param _plcrAddr Address of a PLCR voting contract for the provided token\n @param _paramsAddr Address of a Parameterizer contract\n */\n constructor(\n address _tokenAddr,\n address _plcrAddr,\n address _paramsAddr,\n string _name\n ) public\n {\n token = ERC20(_tokenAddr);\n voting = PLCRVoting(_plcrAddr);\n parameterizer = Parameterizer(_paramsAddr);\n name = _name;\n }\n\n // --------------------\n // PUBLISHER INTERFACE:\n // --------------------\n\n /**\n @dev Allows a user to start an application. Takes tokens from user and sets\n apply stage end time.\n @param _listingHash The hash of a potential listing a user is applying to add to the registry\n @param _amount The number of ERC20 tokens a user is willing to potentially stake\n @param _data Extra data relevant to the application. Think IPFS hashes.\n */\n function apply(bytes32 _listingHash, uint _amount, string _data) external {\n require(!isWhitelisted(_listingHash));\n require(!appWasMade(_listingHash));\n require(_amount >= parameterizer.get(\"minDeposit\"));\n\n // Sets owner\n Listing storage listing = listings[_listingHash];\n listing.owner = msg.sender;\n\n // Sets apply stage end time\n listing.applicationExpiry = block.timestamp.add(parameterizer.get(\"applyStageLen\"));\n listing.unstakedDeposit = _amount;\n\n // Transfers tokens from user to Registry contract\n require(token.transferFrom(listing.owner, this, _amount));\n\n emit _Application(\n _listingHash,\n _amount,\n listing.applicationExpiry,\n _data,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to increase their unstaked deposit.\n @param _listingHash A listingHash msg.sender is the owner of\n @param _amount The number of ERC20 tokens to increase a user's unstaked deposit\n */\n function deposit(bytes32 _listingHash, uint _amount) external {\n Listing storage listing = listings[_listingHash];\n\n require(listing.owner == msg.sender);\n\n listing.unstakedDeposit = listing.unstakedDeposit.add(_amount);\n require(token.transferFrom(msg.sender, this, _amount));\n\n emit _Deposit(\n _listingHash,\n _amount,\n listing.unstakedDeposit,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to decrease their unstaked deposit.\n @param _listingHash A listingHash msg.sender is the owner of.\n @param _amount The number of ERC20 tokens to withdraw from the unstaked deposit.\n */\n function withdraw(bytes32 _listingHash, uint _amount) external {\n Listing storage listing = listings[_listingHash];\n\n require(listing.owner == msg.sender);\n require(_amount <= listing.unstakedDeposit);\n require(listing.unstakedDeposit.sub(_amount) >= parameterizer.get(\"minDeposit\"));\n\n listing.unstakedDeposit = listing.unstakedDeposit.sub(_amount);\n require(token.transfer(msg.sender, _amount));\n\n emit _Withdrawal(\n _listingHash,\n _amount,\n listing.unstakedDeposit,\n msg.sender\n );\n }\n\n /**\n @dev Allows the owner of a listingHash to remove the listingHash from the whitelist\n Returns all tokens to the owner of the listingHash\n @param _listingHash A listingHash msg.sender is the owner of.\n */\n function exit(bytes32 _listingHash) external {\n Listing storage listing = listings[_listingHash];\n\n require(msg.sender == listing.owner);\n require(isWhitelisted(_listingHash));\n\n // Cannot exit during ongoing challenge\n require(listing.challengeID == 0 || challenges[listing.challengeID].resolved);\n\n // Remove listingHash & return tokens\n resetListing(_listingHash);\n emit _ListingWithdrawn(_listingHash);\n }\n\n // -----------------------\n // TOKEN HOLDER INTERFACE:\n // -----------------------\n\n /**\n @dev Starts a poll for a listingHash which is either in the apply stage or\n already in the whitelist. Tokens are taken from the challenger and the\n applicant's deposits are locked.\n @param _listingHash The listingHash being challenged, whether listed or in application\n @param _data Extra data relevant to the challenge. Think IPFS hashes.\n */\n function challenge(bytes32 _listingHash, string _data) external returns (uint challengeID) {\n Listing storage listing = listings[_listingHash];\n uint minDeposit = parameterizer.get(\"minDeposit\");\n\n // Listing must be in apply stage or already on the whitelist\n require(appWasMade(_listingHash) || listing.whitelisted);\n // Prevent multiple challenges\n require(listing.challengeID == 0 || challenges[listing.challengeID].resolved);\n\n if (listing.unstakedDeposit < minDeposit) {\n // Not enough tokens, listingHash auto-delisted\n resetListing(_listingHash);\n emit _TouchAndRemoved(_listingHash);\n return 0;\n }\n\n // Starts poll\n uint pollID = voting.startPoll(\n parameterizer.get(\"voteQuorum\"),\n parameterizer.get(\"commitStageLen\"),\n parameterizer.get(\"revealStageLen\")\n );\n\n challenges[pollID] = Challenge({\n challenger: msg.sender,\n rewardPool: uint(100).sub(parameterizer.get(\"dispensationPct\")).mul(minDeposit).div(100),\n stake: minDeposit,\n resolved: false,\n totalTokens: 0\n });\n\n // Updates listingHash to store most recent challenge\n listing.challengeID = pollID;\n\n // Locks tokens for listingHash during challenge\n listing.unstakedDeposit = listing.unstakedDeposit.sub(minDeposit);\n\n // Takes tokens from challenger\n require(token.transferFrom(msg.sender, this, minDeposit));\n\n uint commitEndDate;\n uint revealEndDate;\n (commitEndDate, revealEndDate,) = voting.pollMap(pollID);\n\n emit _Challenge(\n _listingHash,\n pollID,\n _data,\n commitEndDate,\n revealEndDate,\n msg.sender\n );\n\n return pollID;\n }\n\n /**\n @dev Updates a listingHash's status from 'application' to 'listing' or resolves\n a challenge if one exists.\n @param _listingHash The listingHash whose status is being updated\n */\n function updateStatus(bytes32 _listingHash) public {\n if (canBeWhitelisted(_listingHash)) {\n whitelistApplication(_listingHash);\n } else if (challengeCanBeResolved(_listingHash)) {\n resolveChallenge(_listingHash);\n } else {\n revert();\n }\n }\n\n // ----------------\n // TOKEN FUNCTIONS:\n // ----------------\n\n /**\n @dev Called by a voter to claim their reward for each completed vote. Someone\n must call updateStatus() before this can be called.\n @param _challengeID The PLCR pollID of the challenge a reward is being claimed for\n @param _salt The salt of a voter's commit hash in the given poll\n */\n function claimReward(uint _challengeID, uint _salt) public {\n // Ensures the voter has not already claimed tokens and challenge results have been processed\n require(challenges[_challengeID].tokenClaims[msg.sender] == false);\n require(challenges[_challengeID].resolved == true);\n\n uint voterTokens = voting.getNumPassingTokens(msg.sender, _challengeID, _salt);\n uint reward = voterReward(msg.sender, _challengeID, _salt);\n\n // Subtracts the voter's information to preserve the participation ratios\n // of other voters compared to the remaining pool of rewards\n challenges[_challengeID].totalTokens = challenges[_challengeID].totalTokens.sub(voterTokens);\n challenges[_challengeID].rewardPool = challenges[_challengeID].rewardPool.sub(reward);\n\n // Ensures a voter cannot claim tokens again\n challenges[_challengeID].tokenClaims[msg.sender] = true;\n\n require(token.transfer(msg.sender, reward));\n\n emit _RewardClaimed(_challengeID, reward, msg.sender);\n }\n\n // --------\n // GETTERS:\n // --------\n\n /**\n @dev Calculates the provided voter's token reward for the given poll.\n @param _voter The address of the voter whose reward balance is to be returned\n @param _challengeID The pollID of the challenge a reward balance is being queried for\n @param _salt The salt of the voter's commit hash in the given poll\n @return The uint indicating the voter's reward\n */\n function voterReward(address _voter, uint _challengeID, uint _salt)\n public view returns (uint)\n {\n uint totalTokens = challenges[_challengeID].totalTokens;\n uint rewardPool = challenges[_challengeID].rewardPool;\n uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt);\n return voterTokens.mul(rewardPool).div(totalTokens);\n }\n\n /**\n @dev Determines whether the given listingHash be whitelisted.\n @param _listingHash The listingHash whose status is to be examined\n */\n function canBeWhitelisted(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n // Ensures that the application was made,\n // the application period has ended,\n // the listingHash can be whitelisted,\n // and either: the challengeID == 0, or the challenge has been resolved.\n if (\n /* solium-disable-next-line */\n appWasMade(_listingHash) &&\n /* solium-disable-next-line */\n listings[_listingHash].applicationExpiry < now &&\n /* solium-disable-next-line */\n !isWhitelisted(_listingHash) &&\n (challengeID == 0 || challenges[challengeID].resolved == true)\n ) {return true;}\n\n return false;\n }\n\n /**\n @dev Returns true if the provided listingHash is whitelisted\n @param _listingHash The listingHash whose status is to be examined\n */\n function isWhitelisted(bytes32 _listingHash) view public returns (bool whitelisted) {\n return listings[_listingHash].whitelisted;\n }\n\n /**\n @dev Returns true if apply was called for this listingHash\n @param _listingHash The listingHash whose status is to be examined\n */\n function appWasMade(bytes32 _listingHash) view public returns (bool exists) {\n return listings[_listingHash].applicationExpiry > 0;\n }\n\n /**\n @dev Returns true if the application/listingHash has an unresolved challenge\n @param _listingHash The listingHash whose status is to be examined\n */\n function challengeExists(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n return (listings[_listingHash].challengeID > 0 && !challenges[challengeID].resolved);\n }\n\n /**\n @dev Determines whether voting has concluded in a challenge for a given\n listingHash. Throws if no challenge exists.\n @param _listingHash A listingHash with an unresolved challenge\n */\n function challengeCanBeResolved(bytes32 _listingHash) view public returns (bool) {\n uint challengeID = listings[_listingHash].challengeID;\n\n require(challengeExists(_listingHash));\n\n return voting.pollEnded(challengeID);\n }\n\n /**\n @dev Determines the number of tokens awarded to the winning party in a challenge.\n @param _challengeID The challengeID to determine a reward for\n */\n function determineReward(uint _challengeID) public view returns (uint) {\n require(!challenges[_challengeID].resolved && voting.pollEnded(_challengeID));\n\n // Edge case, nobody voted, give all tokens to the challenger.\n if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) {\n return uint(2).mul(challenges[_challengeID].stake);\n }\n\n return uint(2).mul(challenges[_challengeID].stake).sub(challenges[_challengeID].rewardPool);\n }\n\n /**\n @dev Getter for Challenge tokenClaims mappings\n @param _challengeID The challengeID to query\n @param _voter The voter whose claim status to query for the provided challengeID\n */\n function tokenClaims(uint _challengeID, address _voter) public view returns (bool) {\n return challenges[_challengeID].tokenClaims[_voter];\n }\n\n // ----------------\n // PRIVATE FUNCTIONS:\n // ----------------\n\n /**\n @dev Determines the winner in a challenge. Rewards the winner tokens and\n either whitelists or de-whitelists the listingHash.\n @param _listingHash A listingHash with a challenge that is to be resolved\n */\n function resolveChallenge(bytes32 _listingHash) private {\n uint challengeID = listings[_listingHash].challengeID;\n\n // Calculates the winner's reward,\n // which is: (winner's full stake) + (dispensationPct * loser's stake)\n uint reward = determineReward(challengeID);\n\n // Sets flag on challenge being processed\n challenges[challengeID].resolved = true;\n\n // Stores the total tokens used for voting by the winning side for reward purposes\n challenges[challengeID].totalTokens = voting.getTotalNumberOfTokensForWinningOption(challengeID);\n\n // Case: challenge failed\n if (voting.isPassed(challengeID)) {\n whitelistApplication(_listingHash);\n // Unlock stake so that it can be retrieved by the applicant\n listings[_listingHash].unstakedDeposit = listings[_listingHash].unstakedDeposit.add(reward);\n\n emit _ChallengeFailed(\n _listingHash,\n challengeID,\n challenges[challengeID].rewardPool,\n challenges[challengeID].totalTokens\n );\n } else { // Case: challenge succeeded or nobody voted\n resetListing(_listingHash);\n // Transfer the reward to the challenger\n require(token.transfer(challenges[challengeID].challenger, reward));\n\n emit _ChallengeSucceeded(\n _listingHash,\n challengeID,\n challenges[challengeID].rewardPool,\n challenges[challengeID].totalTokens\n );\n }\n }\n\n /**\n @dev Called by updateStatus() if the applicationExpiry date passed without a\n challenge being made. Called by resolveChallenge() if an\n application/listing beat a challenge.\n @param _listingHash The listingHash of an application/listingHash to be whitelisted\n */\n function whitelistApplication(bytes32 _listingHash) private {\n if (!listings[_listingHash].whitelisted) {emit _ApplicationWhitelisted(_listingHash);}\n listings[_listingHash].whitelisted = true;\n }\n\n /**\n @dev Deletes a listingHash from the whitelist and transfers tokens back to owner\n @param _listingHash The listing hash to delete\n */\n function resetListing(bytes32 _listingHash) private {\n Listing storage listing = listings[_listingHash];\n\n // Emit events before deleting listing to check whether is whitelisted\n if (listing.whitelisted) {\n emit _ListingRemoved(_listingHash);\n } else {\n emit _ApplicationRemoved(_listingHash);\n }\n\n // Deleting listing to prevent reentry\n address owner = listing.owner;\n uint unstakedDeposit = listing.unstakedDeposit;\n delete listings[_listingHash];\n\n // Transfers any remaining balance back to the owner\n if (unstakedDeposit > 0) {\n require(token.transfer(owner, unstakedDeposit));\n }\n }\n}\n", + "sourcePath": "/home/bharath/computable/contracts/Registry.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/Registry.sol", + "absolutePath": "/home/bharath/computable/contracts/Registry.sol", "exportedSymbols": { "Registry": [ - 3593 + 3797 ] }, - "id": 3594, + "id": 3798, "nodeType": "SourceUnit", "nodes": [ { - "id": 2492, + "id": 2655, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:6" + "src": "0:23:8" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 2493, + "id": 2656, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 409, - "src": "25:21:6", + "scope": 3798, + "sourceUnit": 529, + "src": "25:21:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/Parameterizer.sol", + "absolutePath": "/home/bharath/computable/contracts/Parameterizer.sol", "file": "./Parameterizer.sol", - "id": 2494, + "id": 2657, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 2491, - "src": "47:29:6", + "scope": 3798, + "sourceUnit": 2654, + "src": "47:29:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "file": "./PLCRVoting.sol", - "id": 2495, + "id": 2658, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 1472, - "src": "77:26:6", + "scope": 3798, + "sourceUnit": 1619, + "src": "77:26:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 2496, + "id": 2659, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 3688, - "src": "104:24:6", + "scope": 3798, + "sourceUnit": 3892, + "src": "104:24:8", "symbolAliases": [], "unitAlias": "" }, @@ -777,9 +777,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3593, + "id": 3797, "linearizedBaseContracts": [ - 3593 + 3797 ], "name": "Registry", "nodeType": "ContractDefinition", @@ -787,21 +787,21 @@ { "anonymous": false, "documentation": null, - "id": 2508, + "id": 2671, "name": "_Application", "nodeType": "EventDefinition", "parameters": { - "id": 2507, + "id": 2670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2498, + "id": 2661, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "210:27:6", + "scope": 2671, + "src": "210:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -809,10 +809,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2497, + "id": 2660, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "210:7:6", + "src": "210:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -823,12 +823,12 @@ }, { "constant": false, - "id": 2500, + "id": 2663, "indexed": false, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "239:12:6", + "scope": 2671, + "src": "239:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -836,10 +836,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2499, + "id": 2662, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "239:4:6", + "src": "239:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -850,12 +850,12 @@ }, { "constant": false, - "id": 2502, + "id": 2665, "indexed": false, "name": "appEndDate", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "253:15:6", + "scope": 2671, + "src": "253:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -863,10 +863,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2501, + "id": 2664, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "253:4:6", + "src": "253:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -877,12 +877,12 @@ }, { "constant": false, - "id": 2504, + "id": 2667, "indexed": false, "name": "data", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "270:11:6", + "scope": 2671, + "src": "270:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -890,10 +890,10 @@ "typeString": "string" }, "typeName": { - "id": 2503, + "id": 2666, "name": "string", "nodeType": "ElementaryTypeName", - "src": "270:6:6", + "src": "270:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -904,12 +904,12 @@ }, { "constant": false, - "id": 2506, + "id": 2669, "indexed": true, "name": "applicant", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "283:25:6", + "scope": 2671, + "src": "283:25:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -917,10 +917,10 @@ "typeString": "address" }, "typeName": { - "id": 2505, + "id": 2668, "name": "address", "nodeType": "ElementaryTypeName", - "src": "283:7:6", + "src": "283:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -930,28 +930,28 @@ "visibility": "internal" } ], - "src": "209:100:6" + "src": "209:100:8" }, - "src": "191:119:6" + "src": "191:119:8" }, { "anonymous": false, "documentation": null, - "id": 2522, + "id": 2685, "name": "_Challenge", "nodeType": "EventDefinition", "parameters": { - "id": 2521, + "id": 2684, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2510, + "id": 2673, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "330:27:6", + "scope": 2685, + "src": "330:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -959,10 +959,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2509, + "id": 2672, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "330:7:6", + "src": "330:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -973,12 +973,12 @@ }, { "constant": false, - "id": 2512, + "id": 2675, "indexed": false, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "359:16:6", + "scope": 2685, + "src": "359:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -986,10 +986,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2511, + "id": 2674, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "359:4:6", + "src": "359:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1000,12 +1000,12 @@ }, { "constant": false, - "id": 2514, + "id": 2677, "indexed": false, "name": "data", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "377:11:6", + "scope": 2685, + "src": "377:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1013,10 +1013,10 @@ "typeString": "string" }, "typeName": { - "id": 2513, + "id": 2676, "name": "string", "nodeType": "ElementaryTypeName", - "src": "377:6:6", + "src": "377:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -1027,12 +1027,12 @@ }, { "constant": false, - "id": 2516, + "id": 2679, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "390:18:6", + "scope": 2685, + "src": "390:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1040,10 +1040,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2515, + "id": 2678, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "390:4:6", + "src": "390:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1054,12 +1054,12 @@ }, { "constant": false, - "id": 2518, + "id": 2681, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "410:18:6", + "scope": 2685, + "src": "410:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1067,10 +1067,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2517, + "id": 2680, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "410:4:6", + "src": "410:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1081,12 +1081,12 @@ }, { "constant": false, - "id": 2520, + "id": 2683, "indexed": true, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "430:26:6", + "scope": 2685, + "src": "430:26:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1094,10 +1094,10 @@ "typeString": "address" }, "typeName": { - "id": 2519, + "id": 2682, "name": "address", "nodeType": "ElementaryTypeName", - "src": "430:7:6", + "src": "430:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1107,28 +1107,28 @@ "visibility": "internal" } ], - "src": "329:128:6" + "src": "329:128:8" }, - "src": "313:145:6" + "src": "313:145:8" }, { "anonymous": false, "documentation": null, - "id": 2532, + "id": 2695, "name": "_Deposit", "nodeType": "EventDefinition", "parameters": { - "id": 2531, + "id": 2694, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2524, + "id": 2687, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "476:27:6", + "scope": 2695, + "src": "476:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1136,10 +1136,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2523, + "id": 2686, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "476:7:6", + "src": "476:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1150,12 +1150,12 @@ }, { "constant": false, - "id": 2526, + "id": 2689, "indexed": false, "name": "added", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "505:10:6", + "scope": 2695, + "src": "505:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1163,10 +1163,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2525, + "id": 2688, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "505:4:6", + "src": "505:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1177,12 +1177,12 @@ }, { "constant": false, - "id": 2528, + "id": 2691, "indexed": false, "name": "newTotal", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "517:13:6", + "scope": 2695, + "src": "517:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1190,10 +1190,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2527, + "id": 2690, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "517:4:6", + "src": "517:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1204,12 +1204,12 @@ }, { "constant": false, - "id": 2530, + "id": 2693, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "532:21:6", + "scope": 2695, + "src": "532:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1217,10 +1217,10 @@ "typeString": "address" }, "typeName": { - "id": 2529, + "id": 2692, "name": "address", "nodeType": "ElementaryTypeName", - "src": "532:7:6", + "src": "532:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1230,28 +1230,28 @@ "visibility": "internal" } ], - "src": "475:79:6" + "src": "475:79:8" }, - "src": "461:94:6" + "src": "461:94:8" }, { "anonymous": false, "documentation": null, - "id": 2542, + "id": 2705, "name": "_Withdrawal", "nodeType": "EventDefinition", "parameters": { - "id": 2541, + "id": 2704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2534, + "id": 2697, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "576:27:6", + "scope": 2705, + "src": "576:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1259,10 +1259,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2533, + "id": 2696, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "576:7:6", + "src": "576:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1273,12 +1273,12 @@ }, { "constant": false, - "id": 2536, + "id": 2699, "indexed": false, "name": "withdrew", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "605:13:6", + "scope": 2705, + "src": "605:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1286,10 +1286,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2535, + "id": 2698, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "605:4:6", + "src": "605:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1300,12 +1300,12 @@ }, { "constant": false, - "id": 2538, + "id": 2701, "indexed": false, "name": "newTotal", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "620:13:6", + "scope": 2705, + "src": "620:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1313,10 +1313,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2537, + "id": 2700, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "620:4:6", + "src": "620:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1327,12 +1327,12 @@ }, { "constant": false, - "id": 2540, + "id": 2703, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "635:21:6", + "scope": 2705, + "src": "635:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1340,10 +1340,10 @@ "typeString": "address" }, "typeName": { - "id": 2539, + "id": 2702, "name": "address", "nodeType": "ElementaryTypeName", - "src": "635:7:6", + "src": "635:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1353,28 +1353,28 @@ "visibility": "internal" } ], - "src": "575:82:6" + "src": "575:82:8" }, - "src": "558:100:6" + "src": "558:100:8" }, { "anonymous": false, "documentation": null, - "id": 2546, + "id": 2709, "name": "_ApplicationWhitelisted", "nodeType": "EventDefinition", "parameters": { - "id": 2545, + "id": 2708, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2544, + "id": 2707, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2546, - "src": "691:27:6", + "scope": 2709, + "src": "691:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1382,10 +1382,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2543, + "id": 2706, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "691:7:6", + "src": "691:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1395,28 +1395,28 @@ "visibility": "internal" } ], - "src": "690:29:6" + "src": "690:29:8" }, - "src": "661:59:6" + "src": "661:59:8" }, { "anonymous": false, "documentation": null, - "id": 2550, + "id": 2713, "name": "_ApplicationRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2549, + "id": 2712, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2548, + "id": 2711, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2550, - "src": "749:27:6", + "scope": 2713, + "src": "749:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1424,10 +1424,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2547, + "id": 2710, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "749:7:6", + "src": "749:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1437,28 +1437,28 @@ "visibility": "internal" } ], - "src": "748:29:6" + "src": "748:29:8" }, - "src": "723:55:6" + "src": "723:55:8" }, { "anonymous": false, "documentation": null, - "id": 2554, + "id": 2717, "name": "_ListingRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2553, + "id": 2716, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2552, + "id": 2715, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2554, - "src": "803:27:6", + "scope": 2717, + "src": "803:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1466,10 +1466,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2551, + "id": 2714, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "803:7:6", + "src": "803:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1479,28 +1479,28 @@ "visibility": "internal" } ], - "src": "802:29:6" + "src": "802:29:8" }, - "src": "781:51:6" + "src": "781:51:8" }, { "anonymous": false, "documentation": null, - "id": 2558, + "id": 2721, "name": "_ListingWithdrawn", "nodeType": "EventDefinition", "parameters": { - "id": 2557, + "id": 2720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2556, + "id": 2719, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2558, - "src": "859:27:6", + "scope": 2721, + "src": "859:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1508,10 +1508,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2555, + "id": 2718, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "859:7:6", + "src": "859:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1521,28 +1521,28 @@ "visibility": "internal" } ], - "src": "858:29:6" + "src": "858:29:8" }, - "src": "835:53:6" + "src": "835:53:8" }, { "anonymous": false, "documentation": null, - "id": 2562, + "id": 2725, "name": "_TouchAndRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2561, + "id": 2724, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2560, + "id": 2723, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2562, - "src": "914:27:6", + "scope": 2725, + "src": "914:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1550,10 +1550,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2559, + "id": 2722, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "914:7:6", + "src": "914:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1563,28 +1563,28 @@ "visibility": "internal" } ], - "src": "913:29:6" + "src": "913:29:8" }, - "src": "891:52:6" + "src": "891:52:8" }, { "anonymous": false, "documentation": null, - "id": 2572, + "id": 2735, "name": "_ChallengeFailed", "nodeType": "EventDefinition", "parameters": { - "id": 2571, + "id": 2734, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2564, + "id": 2727, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "969:27:6", + "scope": 2735, + "src": "969:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1592,10 +1592,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2563, + "id": 2726, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "969:7:6", + "src": "969:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1606,12 +1606,12 @@ }, { "constant": false, - "id": 2566, + "id": 2729, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "998:24:6", + "scope": 2735, + "src": "998:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1619,10 +1619,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2565, + "id": 2728, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "998:4:6", + "src": "998:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1633,12 +1633,12 @@ }, { "constant": false, - "id": 2568, + "id": 2731, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "1024:15:6", + "scope": 2735, + "src": "1024:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1646,10 +1646,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2567, + "id": 2730, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1024:4:6", + "src": "1024:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1660,12 +1660,12 @@ }, { "constant": false, - "id": 2570, + "id": 2733, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "1041:16:6", + "scope": 2735, + "src": "1041:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1673,10 +1673,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2569, + "id": 2732, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1041:4:6", + "src": "1041:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1686,28 +1686,28 @@ "visibility": "internal" } ], - "src": "968:90:6" + "src": "968:90:8" }, - "src": "946:113:6" + "src": "946:113:8" }, { "anonymous": false, "documentation": null, - "id": 2582, + "id": 2745, "name": "_ChallengeSucceeded", "nodeType": "EventDefinition", "parameters": { - "id": 2581, + "id": 2744, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2574, + "id": 2737, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1088:27:6", + "scope": 2745, + "src": "1088:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1715,10 +1715,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2573, + "id": 2736, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1088:7:6", + "src": "1088:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1729,12 +1729,12 @@ }, { "constant": false, - "id": 2576, + "id": 2739, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1117:24:6", + "scope": 2745, + "src": "1117:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1742,10 +1742,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2575, + "id": 2738, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1117:4:6", + "src": "1117:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1756,12 +1756,12 @@ }, { "constant": false, - "id": 2578, + "id": 2741, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1143:15:6", + "scope": 2745, + "src": "1143:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1769,10 +1769,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2577, + "id": 2740, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1143:4:6", + "src": "1143:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1783,12 +1783,12 @@ }, { "constant": false, - "id": 2580, + "id": 2743, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1160:16:6", + "scope": 2745, + "src": "1160:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1796,10 +1796,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2579, + "id": 2742, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1160:4:6", + "src": "1160:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1809,28 +1809,28 @@ "visibility": "internal" } ], - "src": "1087:90:6" + "src": "1087:90:8" }, - "src": "1062:116:6" + "src": "1062:116:8" }, { "anonymous": false, "documentation": null, - "id": 2590, + "id": 2753, "name": "_RewardClaimed", "nodeType": "EventDefinition", "parameters": { - "id": 2589, + "id": 2752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2584, + "id": 2747, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1202:24:6", + "scope": 2753, + "src": "1202:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1838,10 +1838,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2583, + "id": 2746, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1202:4:6", + "src": "1202:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1852,12 +1852,12 @@ }, { "constant": false, - "id": 2586, + "id": 2749, "indexed": false, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1228:11:6", + "scope": 2753, + "src": "1228:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1865,10 +1865,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2585, + "id": 2748, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1228:4:6", + "src": "1228:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1879,12 +1879,12 @@ }, { "constant": false, - "id": 2588, + "id": 2751, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1241:21:6", + "scope": 2753, + "src": "1241:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1892,10 +1892,10 @@ "typeString": "address" }, "typeName": { - "id": 2587, + "id": 2750, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1241:7:6", + "src": "1241:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1905,31 +1905,31 @@ "visibility": "internal" } ], - "src": "1201:62:6" + "src": "1201:62:8" }, - "src": "1181:83:6" + "src": "1181:83:8" }, { - "id": 2593, + "id": 2756, "libraryName": { "contractScope": null, - "id": 2591, + "id": 2754, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "1274:8:6", + "referencedDeclaration": 3891, + "src": "1274:8:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "1268:24:6", + "src": "1268:24:8", "typeName": { - "id": 2592, + "id": 2755, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1287:4:6", + "src": "1287:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1938,15 +1938,15 @@ }, { "canonicalName": "Registry.Listing", - "id": 2604, + "id": 2767, "members": [ { "constant": false, - "id": 2595, + "id": 2758, "name": "applicationExpiry", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1317:22:6", + "scope": 2767, + "src": "1317:22:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1954,10 +1954,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2594, + "id": 2757, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1317:4:6", + "src": "1317:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1968,11 +1968,11 @@ }, { "constant": false, - "id": 2597, + "id": 2760, "name": "whitelisted", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1379:16:6", + "scope": 2767, + "src": "1379:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1980,10 +1980,10 @@ "typeString": "bool" }, "typeName": { - "id": 2596, + "id": 2759, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1379:4:6", + "src": "1379:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1994,11 +1994,11 @@ }, { "constant": false, - "id": 2599, + "id": 2762, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1436:13:6", + "scope": 2767, + "src": "1436:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2006,10 +2006,10 @@ "typeString": "address" }, "typeName": { - "id": 2598, + "id": 2761, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1436:7:6", + "src": "1436:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2020,11 +2020,11 @@ }, { "constant": false, - "id": 2601, + "id": 2764, "name": "unstakedDeposit", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1484:20:6", + "scope": 2767, + "src": "1484:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2032,10 +2032,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2600, + "id": 2763, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1484:4:6", + "src": "1484:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2046,11 +2046,11 @@ }, { "constant": false, - "id": 2603, + "id": 2766, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1573:16:6", + "scope": 2767, + "src": "1573:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2058,10 +2058,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2602, + "id": 2765, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1573:4:6", + "src": "1573:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2073,21 +2073,21 @@ ], "name": "Listing", "nodeType": "StructDefinition", - "scope": 3593, - "src": "1296:345:6", + "scope": 3797, + "src": "1296:345:8", "visibility": "public" }, { "canonicalName": "Registry.Challenge", - "id": 2619, + "id": 2782, "members": [ { "constant": false, - "id": 2606, + "id": 2769, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1668:15:6", + "scope": 2782, + "src": "1668:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2095,10 +2095,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2605, + "id": 2768, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1668:4:6", + "src": "1668:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2109,11 +2109,11 @@ }, { "constant": false, - "id": 2608, + "id": 2771, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1762:18:6", + "scope": 2782, + "src": "1762:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2121,10 +2121,10 @@ "typeString": "address" }, "typeName": { - "id": 2607, + "id": 2770, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1762:7:6", + "src": "1762:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2135,11 +2135,11 @@ }, { "constant": false, - "id": 2610, + "id": 2773, "name": "resolved", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1812:13:6", + "scope": 2782, + "src": "1812:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2147,10 +2147,10 @@ "typeString": "bool" }, "typeName": { - "id": 2609, + "id": 2772, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1812:4:6", + "src": "1812:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2161,11 +2161,11 @@ }, { "constant": false, - "id": 2612, + "id": 2775, "name": "stake", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1882:10:6", + "scope": 2782, + "src": "1882:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2173,10 +2173,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2611, + "id": 2774, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1882:4:6", + "src": "1882:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2187,11 +2187,11 @@ }, { "constant": false, - "id": 2614, + "id": 2777, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1973:16:6", + "scope": 2782, + "src": "1973:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2199,10 +2199,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2613, + "id": 2776, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1973:4:6", + "src": "1973:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2213,11 +2213,11 @@ }, { "constant": false, - "id": 2618, + "id": 2781, "name": "tokenClaims", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "2068:36:6", + "scope": 2782, + "src": "2068:36:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2225,28 +2225,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 2617, + "id": 2780, "keyType": { - "id": 2615, + "id": 2778, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2076:7:6", + "src": "2076:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "2068:24:6", + "src": "2068:24:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 2616, + "id": 2779, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "2087:4:6", + "src": "2087:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2259,50 +2259,50 @@ ], "name": "Challenge", "nodeType": "StructDefinition", - "scope": 3593, - "src": "1645:518:6", + "scope": 3797, + "src": "1645:518:8", "visibility": "public" }, { "constant": false, - "id": 2623, + "id": 2786, "name": "challenges", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2219:44:6", + "scope": 3797, + "src": "2219:44:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge)" }, "typeName": { - "id": 2622, + "id": 2785, "keyType": { - "id": 2620, + "id": 2783, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2227:4:6", + "src": "2227:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "2219:26:6", + "src": "2219:26:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge)" }, "valueType": { "contractScope": null, - "id": 2621, + "id": 2784, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2619, - "src": "2235:9:6", + "referencedDeclaration": 2782, + "src": "2235:9:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$2782_storage_ptr", "typeString": "struct Registry.Challenge" } } @@ -2312,44 +2312,44 @@ }, { "constant": false, - "id": 2627, + "id": 2790, "name": "listings", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2323:43:6", + "scope": 3797, + "src": "2323:43:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing)" }, "typeName": { - "id": 2626, + "id": 2789, "keyType": { - "id": 2624, + "id": 2787, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2331:7:6", + "src": "2331:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "2323:27:6", + "src": "2323:27:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing)" }, "valueType": { "contractScope": null, - "id": 2625, + "id": 2788, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "2342:7:6", + "referencedDeclaration": 2767, + "src": "2342:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } } @@ -2359,26 +2359,26 @@ }, { "constant": false, - "id": 2629, + "id": 2792, "name": "token", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2393:18:6", + "scope": 3797, + "src": "2393:18:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 2628, + "id": 2791, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "2393:5:6", + "referencedDeclaration": 528, + "src": "2393:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2387,26 +2387,26 @@ }, { "constant": false, - "id": 2631, + "id": 2794, "name": "voting", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2415:24:6", + "scope": 3797, + "src": "2415:24:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, "typeName": { "contractScope": null, - "id": 2630, + "id": 2793, "name": "PLCRVoting", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1471, - "src": "2415:10:6", + "referencedDeclaration": 1618, + "src": "2415:10:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -2415,26 +2415,26 @@ }, { "constant": false, - "id": 2633, + "id": 2796, "name": "parameterizer", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2443:34:6", + "scope": 3797, + "src": "2443:34:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, "typeName": { "contractScope": null, - "id": 2632, + "id": 2795, "name": "Parameterizer", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2490, - "src": "2443:13:6", + "referencedDeclaration": 2653, + "src": "2443:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, @@ -2443,11 +2443,11 @@ }, { "constant": false, - "id": 2635, + "id": 2798, "name": "name", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2481:18:6", + "scope": 3797, + "src": "2481:18:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -2455,10 +2455,10 @@ "typeString": "string" }, "typeName": { - "id": 2634, + "id": 2797, "name": "string", "nodeType": "ElementaryTypeName", - "src": "2481:6:6", + "src": "2481:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -2469,28 +2469,28 @@ }, { "body": { - "id": 2668, + "id": 2831, "nodeType": "Block", - "src": "2981:138:6", + "src": "2981:138:8", "statements": [ { "expression": { "argumentTypes": null, - "id": 2650, + "id": 2813, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2646, + "id": 2809, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "2987:5:6", + "referencedDeclaration": 2792, + "src": "2987:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -2501,12 +2501,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2648, + "id": 2811, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2637, - "src": "3001:10:6", + "referencedDeclaration": 2800, + "src": "3001:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2520,18 +2520,18 @@ "typeString": "address" } ], - "id": 2647, + "id": 2810, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "2995:5:6", + "referencedDeclaration": 528, + "src": "2995:5:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 2649, + "id": 2812, "isConstant": false, "isLValue": false, "isPure": false, @@ -2539,40 +2539,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2995:17:6", + "src": "2995:17:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "2987:25:6", + "src": "2987:25:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2651, + "id": 2814, "nodeType": "ExpressionStatement", - "src": "2987:25:6" + "src": "2987:25:8" }, { "expression": { "argumentTypes": null, - "id": 2656, + "id": 2819, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2652, + "id": 2815, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "3018:6:6", + "referencedDeclaration": 2794, + "src": "3018:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -2583,12 +2583,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2654, + "id": 2817, "name": "_plcrAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2639, - "src": "3038:9:6", + "referencedDeclaration": 2802, + "src": "3038:9:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2602,18 +2602,18 @@ "typeString": "address" } ], - "id": 2653, + "id": 2816, "name": "PLCRVoting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1471, - "src": "3027:10:6", + "referencedDeclaration": 1618, + "src": "3027:10:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1471_$", + "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1618_$", "typeString": "type(contract PLCRVoting)" } }, - "id": 2655, + "id": 2818, "isConstant": false, "isLValue": false, "isPure": false, @@ -2621,40 +2621,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3027:21:6", + "src": "3027:21:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "src": "3018:30:6", + "src": "3018:30:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2657, + "id": 2820, "nodeType": "ExpressionStatement", - "src": "3018:30:6" + "src": "3018:30:8" }, { "expression": { "argumentTypes": null, - "id": 2662, + "id": 2825, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2658, + "id": 2821, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "3054:13:6", + "referencedDeclaration": 2796, + "src": "3054:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, @@ -2665,12 +2665,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2660, + "id": 2823, "name": "_paramsAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2641, - "src": "3084:11:6", + "referencedDeclaration": 2804, + "src": "3084:11:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2684,18 +2684,18 @@ "typeString": "address" } ], - "id": 2659, + "id": 2822, "name": "Parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2490, - "src": "3070:13:6", + "referencedDeclaration": 2653, + "src": "3070:13:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_Parameterizer_$2490_$", + "typeIdentifier": "t_type$_t_contract$_Parameterizer_$2653_$", "typeString": "type(contract Parameterizer)" } }, - "id": 2661, + "id": 2824, "isConstant": false, "isLValue": false, "isPure": false, @@ -2703,38 +2703,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3070:26:6", + "src": "3070:26:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "src": "3054:42:6", + "src": "3054:42:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2663, + "id": 2826, "nodeType": "ExpressionStatement", - "src": "3054:42:6" + "src": "3054:42:8" }, { "expression": { "argumentTypes": null, - "id": 2666, + "id": 2829, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2664, + "id": 2827, "name": "name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2635, - "src": "3102:4:6", + "referencedDeclaration": 2798, + "src": "3102:4:8", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -2744,31 +2744,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2665, + "id": 2828, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2643, - "src": "3109:5:6", + "referencedDeclaration": 2806, + "src": "3109:5:8", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" } }, - "src": "3102:12:6", + "src": "3102:12:8", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" } }, - "id": 2667, + "id": 2830, "nodeType": "ExpressionStatement", - "src": "3102:12:6" + "src": "3102:12:8" } ] }, "documentation": "@dev Contructor Sets the addresses for token, voting, and parameterizer\n@param _tokenAddr Address of the TCR's intrinsic ERC20 token\n@param _plcrAddr Address of a PLCR voting contract for the provided token\n@param _paramsAddr Address of a Parameterizer contract", - "id": 2669, + "id": 2832, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -2776,16 +2776,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2644, + "id": 2807, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2637, + "id": 2800, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2883:18:6", + "scope": 2832, + "src": "2883:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2793,10 +2793,10 @@ "typeString": "address" }, "typeName": { - "id": 2636, + "id": 2799, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2883:7:6", + "src": "2883:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2807,11 +2807,11 @@ }, { "constant": false, - "id": 2639, + "id": 2802, "name": "_plcrAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2907:17:6", + "scope": 2832, + "src": "2907:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2819,10 +2819,10 @@ "typeString": "address" }, "typeName": { - "id": 2638, + "id": 2801, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2907:7:6", + "src": "2907:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2833,11 +2833,11 @@ }, { "constant": false, - "id": 2641, + "id": 2804, "name": "_paramsAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2930:19:6", + "scope": 2832, + "src": "2930:19:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2845,10 +2845,10 @@ "typeString": "address" }, "typeName": { - "id": 2640, + "id": 2803, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2930:7:6", + "src": "2930:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2859,11 +2859,11 @@ }, { "constant": false, - "id": 2643, + "id": 2806, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2955:12:6", + "scope": 2832, + "src": "2955:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2871,10 +2871,10 @@ "typeString": "string" }, "typeName": { - "id": 2642, + "id": 2805, "name": "string", "nodeType": "ElementaryTypeName", - "src": "2955:6:6", + "src": "2955:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -2884,26 +2884,26 @@ "visibility": "internal" } ], - "src": "2877:94:6" + "src": "2877:94:8" }, "payable": false, "returnParameters": { - "id": 2645, + "id": 2808, "nodeType": "ParameterList", "parameters": [], - "src": "2981:0:6" + "src": "2981:0:8" }, - "scope": 3593, - "src": "2866:253:6", + "scope": 3797, + "src": "2866:253:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2753, + "id": 2916, "nodeType": "Block", - "src": "3689:660:6", + "src": "3689:660:8", "statements": [ { "expression": { @@ -2911,7 +2911,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2682, + "id": 2845, "isConstant": false, "isLValue": false, "isPure": false, @@ -2919,18 +2919,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3703:28:6", + "src": "3703:28:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2680, + "id": 2843, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3718:12:6", + "referencedDeclaration": 2834, + "src": "3718:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2944,18 +2944,18 @@ "typeString": "bytes32" } ], - "id": 2679, + "id": 2842, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "3704:13:6", + "referencedDeclaration": 3476, + "src": "3704:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2681, + "id": 2844, "isConstant": false, "isLValue": false, "isPure": false, @@ -2963,7 +2963,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3704:27:6", + "src": "3704:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2982,21 +2982,21 @@ "typeString": "bool" } ], - "id": 2678, + "id": 2841, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3695:7:6", + "referencedDeclaration": 4156, + "src": "3695:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2683, + "id": 2846, "isConstant": false, "isLValue": false, "isPure": false, @@ -3004,15 +3004,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3695:37:6", + "src": "3695:37:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2684, + "id": 2847, "nodeType": "ExpressionStatement", - "src": "3695:37:6" + "src": "3695:37:8" }, { "expression": { @@ -3020,7 +3020,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2689, + "id": 2852, "isConstant": false, "isLValue": false, "isPure": false, @@ -3028,18 +3028,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3746:25:6", + "src": "3746:25:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2687, + "id": 2850, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3758:12:6", + "referencedDeclaration": 2834, + "src": "3758:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3053,18 +3053,18 @@ "typeString": "bytes32" } ], - "id": 2686, + "id": 2849, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "3747:10:6", + "referencedDeclaration": 3491, + "src": "3747:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2688, + "id": 2851, "isConstant": false, "isLValue": false, "isPure": false, @@ -3072,7 +3072,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3747:24:6", + "src": "3747:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3091,21 +3091,21 @@ "typeString": "bool" } ], - "id": 2685, + "id": 2848, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3738:7:6", + "referencedDeclaration": 4156, + "src": "3738:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2690, + "id": 2853, "isConstant": false, "isLValue": false, "isPure": false, @@ -3113,15 +3113,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3738:34:6", + "src": "3738:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2691, + "id": 2854, "nodeType": "ExpressionStatement", - "src": "3738:34:6" + "src": "3738:34:8" }, { "expression": { @@ -3133,19 +3133,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2698, + "id": 2861, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2693, + "id": 2856, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "3786:7:6", + "referencedDeclaration": 2836, + "src": "3786:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3159,14 +3159,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2696, + "id": 2859, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3815:12:6", + "src": "3815:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -3184,32 +3184,32 @@ ], "expression": { "argumentTypes": null, - "id": 2694, + "id": 2857, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "3797:13:6", + "referencedDeclaration": 2796, + "src": "3797:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2695, + "id": 2858, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "3797:17:6", + "referencedDeclaration": 2512, + "src": "3797:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2697, + "id": 2860, "isConstant": false, "isLValue": false, "isPure": false, @@ -3217,13 +3217,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3797:31:6", + "src": "3797:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3786:42:6", + "src": "3786:42:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3237,21 +3237,21 @@ "typeString": "bool" } ], - "id": 2692, + "id": 2855, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3778:7:6", + "referencedDeclaration": 4156, + "src": "3778:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2699, + "id": 2862, "isConstant": false, "isLValue": false, "isPure": false, @@ -3259,43 +3259,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3778:51:6", + "src": "3778:51:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2700, + "id": 2863, "nodeType": "ExpressionStatement", - "src": "3778:51:6" + "src": "3778:51:8" }, { "assignments": [ - 2702 + 2865 ], "declarations": [ { "constant": false, - "id": 2702, + "id": 2865, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3854:23:6", + "scope": 2917, + "src": "3854:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2701, + "id": 2864, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "3854:7:6", + "referencedDeclaration": 2767, + "src": "3854:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -3303,31 +3303,31 @@ "visibility": "internal" } ], - "id": 2706, + "id": 2869, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2703, + "id": 2866, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "3880:8:6", + "referencedDeclaration": 2790, + "src": "3880:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2705, + "id": 2868, "indexExpression": { "argumentTypes": null, - "id": 2704, + "id": 2867, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3889:12:6", + "referencedDeclaration": 2834, + "src": "3889:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3338,19 +3338,19 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3880:22:6", + "src": "3880:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "3854:48:6" + "src": "3854:48:8" }, { "expression": { "argumentTypes": null, - "id": 2712, + "id": 2875, "isConstant": false, "isLValue": false, "isPure": false, @@ -3359,26 +3359,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2707, + "id": 2870, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "3908:7:6", + "referencedDeclaration": 2865, + "src": "3908:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2709, + "id": 2872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "3908:13:6", + "referencedDeclaration": 2762, + "src": "3908:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3390,18 +3390,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2710, + "id": 2873, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3924:3:6", + "referencedDeclaration": 4153, + "src": "3924:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2711, + "id": 2874, "isConstant": false, "isLValue": false, "isPure": false, @@ -3409,26 +3409,26 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3924:10:6", + "src": "3924:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "3908:26:6", + "src": "3908:26:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2713, + "id": 2876, "nodeType": "ExpressionStatement", - "src": "3908:26:6" + "src": "3908:26:8" }, { "expression": { "argumentTypes": null, - "id": 2725, + "id": 2888, "isConstant": false, "isLValue": false, "isPure": false, @@ -3437,26 +3437,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2714, + "id": 2877, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "3974:7:6", + "referencedDeclaration": 2865, + "src": "3974:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2716, + "id": 2879, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "3974:25:6", + "referencedDeclaration": 2758, + "src": "3974:25:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3473,14 +3473,14 @@ { "argumentTypes": null, "hexValue": "6170706c7953746167654c656e", - "id": 2722, + "id": 2885, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4040:15:6", + "src": "4040:15:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8c03b11eba3b2d069479ae0d3837927171e72e193c0acb726bbd53bdd5902da", @@ -3498,32 +3498,32 @@ ], "expression": { "argumentTypes": null, - "id": 2720, + "id": 2883, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "4022:13:6", + "referencedDeclaration": 2796, + "src": "4022:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2721, + "id": 2884, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "4022:17:6", + "referencedDeclaration": 2512, + "src": "4022:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2723, + "id": 2886, "isConstant": false, "isLValue": false, "isPure": false, @@ -3531,7 +3531,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4022:34:6", + "src": "4022:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3549,18 +3549,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2717, + "id": 2880, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "4002:5:6", + "referencedDeclaration": 4143, + "src": "4002:5:8", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 2718, + "id": 2881, "isConstant": false, "isLValue": false, "isPure": false, @@ -3568,27 +3568,27 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4002:15:6", + "src": "4002:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2719, + "id": 2882, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "4002:19:6", + "referencedDeclaration": 3890, + "src": "4002:19:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2724, + "id": 2887, "isConstant": false, "isLValue": false, "isPure": false, @@ -3596,26 +3596,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4002:55:6", + "src": "4002:55:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3974:83:6", + "src": "3974:83:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2726, + "id": 2889, "nodeType": "ExpressionStatement", - "src": "3974:83:6" + "src": "3974:83:8" }, { "expression": { "argumentTypes": null, - "id": 2731, + "id": 2894, "isConstant": false, "isLValue": false, "isPure": false, @@ -3624,26 +3624,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2727, + "id": 2890, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4063:7:6", + "referencedDeclaration": 2865, + "src": "4063:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2729, + "id": 2892, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4063:23:6", + "referencedDeclaration": 2764, + "src": "4063:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3653,26 +3653,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2730, + "id": 2893, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4089:7:6", + "referencedDeclaration": 2836, + "src": "4089:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4063:33:6", + "src": "4063:33:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2732, + "id": 2895, "nodeType": "ExpressionStatement", - "src": "4063:33:6" + "src": "4063:33:8" }, { "expression": { @@ -3685,26 +3685,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2736, + "id": 2899, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4185:7:6", + "referencedDeclaration": 2865, + "src": "4185:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2737, + "id": 2900, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "4185:13:6", + "referencedDeclaration": 2762, + "src": "4185:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3712,25 +3712,25 @@ }, { "argumentTypes": null, - "id": 2738, + "id": 2901, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "4200:4:6", + "referencedDeclaration": 4186, + "src": "4200:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 2739, + "id": 2902, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4206:7:6", + "referencedDeclaration": 2836, + "src": "4206:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3744,7 +3744,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -3754,32 +3754,32 @@ ], "expression": { "argumentTypes": null, - "id": 2734, + "id": 2897, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "4166:5:6", + "referencedDeclaration": 2792, + "src": "4166:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2735, + "id": 2898, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "4166:18:6", + "referencedDeclaration": 510, + "src": "4166:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 2740, + "id": 2903, "isConstant": false, "isLValue": false, "isPure": false, @@ -3787,7 +3787,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4166:48:6", + "src": "4166:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3801,21 +3801,21 @@ "typeString": "bool" } ], - "id": 2733, + "id": 2896, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4158:7:6", + "referencedDeclaration": 4156, + "src": "4158:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2741, + "id": 2904, "isConstant": false, "isLValue": false, "isPure": false, @@ -3823,15 +3823,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4158:57:6", + "src": "4158:57:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2742, + "id": 2905, "nodeType": "ExpressionStatement", - "src": "4158:57:6" + "src": "4158:57:8" }, { "eventCall": { @@ -3839,12 +3839,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2744, + "id": 2907, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "4247:12:6", + "referencedDeclaration": 2834, + "src": "4247:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3852,12 +3852,12 @@ }, { "argumentTypes": null, - "id": 2745, + "id": 2908, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4267:7:6", + "referencedDeclaration": 2836, + "src": "4267:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3867,26 +3867,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2746, + "id": 2909, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4282:7:6", + "referencedDeclaration": 2865, + "src": "4282:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2747, + "id": 2910, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "4282:25:6", + "referencedDeclaration": 2758, + "src": "4282:25:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3894,12 +3894,12 @@ }, { "argumentTypes": null, - "id": 2748, + "id": 2911, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2675, - "src": "4315:5:6", + "referencedDeclaration": 2838, + "src": "4315:5:8", "typeDescriptions": { "typeIdentifier": "t_string_calldata_ptr", "typeString": "string calldata" @@ -3909,18 +3909,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2749, + "id": 2912, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4328:3:6", + "referencedDeclaration": 4153, + "src": "4328:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2750, + "id": 2913, "isConstant": false, "isLValue": false, "isPure": false, @@ -3928,7 +3928,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4328:10:6", + "src": "4328:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3958,18 +3958,18 @@ "typeString": "address" } ], - "id": 2743, + "id": 2906, "name": "_Application", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2508, - "src": "4227:12:6", + "referencedDeclaration": 2671, + "src": "4227:12:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,string memory,address)" } }, - "id": 2751, + "id": 2914, "isConstant": false, "isLValue": false, "isPure": false, @@ -3977,20 +3977,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4227:117:6", + "src": "4227:117:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2752, + "id": 2915, "nodeType": "EmitStatement", - "src": "4222:122:6" + "src": "4222:122:8" } ] }, "documentation": "@dev Allows a user to start an application. Takes tokens from user and sets\napply stage end time.\n@param _listingHash The hash of a potential listing a user is applying to add to the registry\n@param _amount The number of ERC20 tokens a user is willing to potentially stake\n@param _data Extra data relevant to the application. Think IPFS hashes.", - "id": 2754, + "id": 2917, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3998,16 +3998,16 @@ "name": "apply", "nodeType": "FunctionDefinition", "parameters": { - "id": 2676, + "id": 2839, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2671, + "id": 2834, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3630:20:6", + "scope": 2917, + "src": "3630:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4015,10 +4015,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2670, + "id": 2833, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3630:7:6", + "src": "3630:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4029,11 +4029,11 @@ }, { "constant": false, - "id": 2673, + "id": 2836, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3652:12:6", + "scope": 2917, + "src": "3652:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4041,10 +4041,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2672, + "id": 2835, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3652:4:6", + "src": "3652:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4055,11 +4055,11 @@ }, { "constant": false, - "id": 2675, + "id": 2838, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3666:12:6", + "scope": 2917, + "src": "3666:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4067,10 +4067,10 @@ "typeString": "string" }, "typeName": { - "id": 2674, + "id": 2837, "name": "string", "nodeType": "ElementaryTypeName", - "src": "3666:6:6", + "src": "3666:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -4080,54 +4080,54 @@ "visibility": "internal" } ], - "src": "3629:50:6" + "src": "3629:50:8" }, "payable": false, "returnParameters": { - "id": 2677, + "id": 2840, "nodeType": "ParameterList", "parameters": [], - "src": "3689:0:6" + "src": "3689:0:8" }, - "scope": 3593, - "src": "3615:734:6", + "scope": 3797, + "src": "3615:734:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2800, + "id": 2967, "nodeType": "Block", - "src": "4668:313:6", + "src": "4668:341:8", "statements": [ { "assignments": [ - 2762 + 2925 ], "declarations": [ { "constant": false, - "id": 2762, + "id": 2925, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4674:23:6", + "scope": 2968, + "src": "4674:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2761, + "id": 2924, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "4674:7:6", + "referencedDeclaration": 2767, + "src": "4674:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -4135,31 +4135,31 @@ "visibility": "internal" } ], - "id": 2766, + "id": 2929, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2763, + "id": 2926, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "4700:8:6", + "referencedDeclaration": 2790, + "src": "4700:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2765, + "id": 2928, "indexExpression": { "argumentTypes": null, - "id": 2764, + "id": 2927, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2756, - "src": "4709:12:6", + "referencedDeclaration": 2919, + "src": "4709:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4170,14 +4170,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4700:22:6", + "src": "4700:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "4674:48:6" + "src": "4674:48:8" }, { "expression": { @@ -4189,7 +4189,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2772, + "id": 2935, "isConstant": false, "isLValue": false, "isPure": false, @@ -4198,26 +4198,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2768, + "id": 2931, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4737:7:6", + "referencedDeclaration": 2925, + "src": "4737:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2769, + "id": 2932, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "4737:13:6", + "referencedDeclaration": 2762, + "src": "4737:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4229,18 +4229,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2770, + "id": 2933, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4754:3:6", + "referencedDeclaration": 4153, + "src": "4754:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2771, + "id": 2934, "isConstant": false, "isLValue": false, "isPure": false, @@ -4248,13 +4248,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4754:10:6", + "src": "4754:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4737:27:6", + "src": "4737:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4268,21 +4268,21 @@ "typeString": "bool" } ], - "id": 2767, + "id": 2930, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4729:7:6", + "referencedDeclaration": 4156, + "src": "4729:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2773, + "id": 2936, "isConstant": false, "isLValue": false, "isPure": false, @@ -4290,20 +4290,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4729:36:6", + "src": "4729:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2774, + "id": 2937, "nodeType": "ExpressionStatement", - "src": "4729:36:6" + "src": "4729:36:8" }, { "expression": { "argumentTypes": null, - "id": 2779, + "id": 2946, "isConstant": false, "isLValue": false, "isPure": false, @@ -4312,55 +4312,123 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2775, + "id": 2938, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4772:7:6", + "referencedDeclaration": 2925, + "src": "4772:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2777, + "id": 2940, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4772:23:6", + "referencedDeclaration": 2764, + "src": "4772:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2778, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4799:7:6", + "arguments": [ + { + "argumentTypes": null, + "id": 2944, + "name": "_amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2921, + "src": "4826:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2941, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2925, + "src": "4798:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 2942, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "4798:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2943, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "4798:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2945, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4798:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4772:34:6", + "src": "4772:62:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2780, + "id": 2947, "nodeType": "ExpressionStatement", - "src": "4772:34:6" + "src": "4772:62:8" }, { "expression": { @@ -4373,18 +4441,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2784, + "id": 2951, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4839:3:6", + "referencedDeclaration": 4153, + "src": "4867:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2785, + "id": 2952, "isConstant": false, "isLValue": false, "isPure": false, @@ -4392,7 +4460,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4839:10:6", + "src": "4867:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4400,25 +4468,25 @@ }, { "argumentTypes": null, - "id": 2786, + "id": 2953, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "4851:4:6", + "referencedDeclaration": 4186, + "src": "4879:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 2787, + "id": 2954, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4857:7:6", + "referencedDeclaration": 2921, + "src": "4885:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4432,7 +4500,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -4442,32 +4510,32 @@ ], "expression": { "argumentTypes": null, - "id": 2782, + "id": 2949, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "4820:5:6", + "referencedDeclaration": 2792, + "src": "4848:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2783, + "id": 2950, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "4820:18:6", + "referencedDeclaration": 510, + "src": "4848:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 2788, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": false, @@ -4475,7 +4543,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4820:45:6", + "src": "4848:45:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4489,21 +4557,21 @@ "typeString": "bool" } ], - "id": 2781, + "id": 2948, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4812:7:6", + "referencedDeclaration": 4156, + "src": "4840:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2789, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": false, @@ -4511,15 +4579,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4812:54:6", + "src": "4840:54:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2790, + "id": 2957, "nodeType": "ExpressionStatement", - "src": "4812:54:6" + "src": "4840:54:8" }, { "eventCall": { @@ -4527,12 +4595,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2792, + "id": 2959, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2756, - "src": "4894:12:6", + "referencedDeclaration": 2919, + "src": "4922:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4540,12 +4608,12 @@ }, { "argumentTypes": null, - "id": 2793, + "id": 2960, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4914:7:6", + "referencedDeclaration": 2921, + "src": "4942:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4555,26 +4623,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2794, + "id": 2961, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4929:7:6", + "referencedDeclaration": 2925, + "src": "4957:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2795, + "id": 2962, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4929:23:6", + "referencedDeclaration": 2764, + "src": "4957:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4584,18 +4652,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2796, + "id": 2963, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4960:3:6", + "referencedDeclaration": 4153, + "src": "4988:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2797, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": false, @@ -4603,7 +4671,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4960:10:6", + "src": "4988:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4629,18 +4697,18 @@ "typeString": "address" } ], - "id": 2791, + "id": 2958, "name": "_Deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2532, - "src": "4878:8:6", + "referencedDeclaration": 2695, + "src": "4906:8:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,address)" } }, - "id": 2798, + "id": 2965, "isConstant": false, "isLValue": false, "isPure": false, @@ -4648,20 +4716,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4878:98:6", + "src": "4906:98:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2799, + "id": 2966, "nodeType": "EmitStatement", - "src": "4873:103:6" + "src": "4901:103:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to increase their unstaked deposit.\n@param _listingHash A listingHash msg.sender is the owner of\n@param _amount The number of ERC20 tokens to increase a user's unstaked deposit", - "id": 2801, + "id": 2968, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -4669,16 +4737,16 @@ "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 2759, + "id": 2922, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2756, + "id": 2919, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4623:20:6", + "scope": 2968, + "src": "4623:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4686,10 +4754,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2755, + "id": 2918, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4623:7:6", + "src": "4623:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4700,11 +4768,11 @@ }, { "constant": false, - "id": 2758, + "id": 2921, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4645:12:6", + "scope": 2968, + "src": "4645:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4712,10 +4780,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2757, + "id": 2920, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4645:4:6", + "src": "4645:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4725,54 +4793,54 @@ "visibility": "internal" } ], - "src": "4622:36:6" + "src": "4622:36:8" }, "payable": false, "returnParameters": { - "id": 2760, + "id": 2923, "nodeType": "ParameterList", "parameters": [], - "src": "4668:0:6" + "src": "4668:0:8" }, - "scope": 3593, - "src": "4606:375:6", + "scope": 3797, + "src": "4606:403:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2865, + "id": 3037, "nodeType": "Block", - "src": "5303:438:6", + "src": "5331:469:8", "statements": [ { "assignments": [ - 2809 + 2976 ], "declarations": [ { "constant": false, - "id": 2809, + "id": 2976, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5309:23:6", + "scope": 3038, + "src": "5337:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2808, + "id": 2975, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "5309:7:6", + "referencedDeclaration": 2767, + "src": "5337:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -4780,31 +4848,31 @@ "visibility": "internal" } ], - "id": 2813, + "id": 2980, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2810, + "id": 2977, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "5335:8:6", + "referencedDeclaration": 2790, + "src": "5363:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2812, + "id": 2979, "indexExpression": { "argumentTypes": null, - "id": 2811, + "id": 2978, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, - "src": "5344:12:6", + "referencedDeclaration": 2970, + "src": "5372:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4815,14 +4883,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5335:22:6", + "src": "5363:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "5309:48:6" + "src": "5337:48:8" }, { "expression": { @@ -4834,7 +4902,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2819, + "id": 2986, "isConstant": false, "isLValue": false, "isPure": false, @@ -4843,26 +4911,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2815, + "id": 2982, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5372:7:6", + "referencedDeclaration": 2976, + "src": "5400:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2816, + "id": 2983, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "5372:13:6", + "referencedDeclaration": 2762, + "src": "5400:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4874,18 +4942,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2817, + "id": 2984, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5389:3:6", + "referencedDeclaration": 4153, + "src": "5417:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2818, + "id": 2985, "isConstant": false, "isLValue": false, "isPure": false, @@ -4893,13 +4961,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5389:10:6", + "src": "5417:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5372:27:6", + "src": "5400:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4913,21 +4981,21 @@ "typeString": "bool" } ], - "id": 2814, + "id": 2981, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5364:7:6", + "referencedDeclaration": 4156, + "src": "5392:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2820, + "id": 2987, "isConstant": false, "isLValue": false, "isPure": false, @@ -4935,15 +5003,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5364:36:6", + "src": "5392:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2821, + "id": 2988, "nodeType": "ExpressionStatement", - "src": "5364:36:6" + "src": "5392:36:8" }, { "expression": { @@ -4955,19 +5023,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2826, + "id": 2993, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2823, + "id": 2990, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5414:7:6", + "referencedDeclaration": 2972, + "src": "5442:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4979,32 +5047,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2824, + "id": 2991, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5425:7:6", + "referencedDeclaration": 2976, + "src": "5453:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2825, + "id": 2992, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5425:23:6", + "referencedDeclaration": 2764, + "src": "5453:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5414:34:6", + "src": "5442:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5018,21 +5086,21 @@ "typeString": "bool" } ], - "id": 2822, + "id": 2989, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5406:7:6", + "referencedDeclaration": 4156, + "src": "5434:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2827, + "id": 2994, "isConstant": false, "isLValue": false, "isPure": false, @@ -5040,15 +5108,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5406:43:6", + "src": "5434:43:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2828, + "id": 2995, "nodeType": "ExpressionStatement", - "src": "5406:43:6" + "src": "5434:43:8" }, { "expression": { @@ -5060,67 +5128,87 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2838, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2833, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "id": 2830, - "name": "listing", + "id": 3000, + "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5463:7:6", + "referencedDeclaration": 2972, + "src": "5519:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", - "typeString": "struct Registry.Listing storage pointer" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2997, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2976, + "src": "5491:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 2998, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "5491:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2831, + "id": 2999, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "unstakedDeposit", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5463:23:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 2832, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5489:7:6", + "referencedDeclaration": 3866, + "src": "5491:27:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "5463:33:6", + "id": 3001, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5491:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5134,14 +5222,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2836, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5518:12:6", + "src": "5549:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -5159,32 +5247,32 @@ ], "expression": { "argumentTypes": null, - "id": 2834, + "id": 3002, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "5500:13:6", + "referencedDeclaration": 2796, + "src": "5531:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2835, + "id": 3003, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "5500:17:6", + "referencedDeclaration": 2512, + "src": "5531:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2837, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": false, @@ -5192,13 +5280,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5500:31:6", + "src": "5531:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5463:68:6", + "src": "5491:71:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5212,21 +5300,21 @@ "typeString": "bool" } ], - "id": 2829, + "id": 2996, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5455:7:6", + "referencedDeclaration": 4156, + "src": "5483:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2839, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": false, @@ -5234,20 +5322,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5455:77:6", + "src": "5483:80:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2840, + "id": 3008, "nodeType": "ExpressionStatement", - "src": "5455:77:6" + "src": "5483:80:8" }, { "expression": { "argumentTypes": null, - "id": 2845, + "id": 3017, "isConstant": false, "isLValue": false, "isPure": false, @@ -5256,55 +5344,123 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2841, + "id": 3009, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5539:7:6", + "referencedDeclaration": 2976, + "src": "5570:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2843, + "id": 3011, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5539:23:6", + "referencedDeclaration": 2764, + "src": "5570:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2844, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5566:7:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3015, + "name": "_amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2972, + "src": "5624:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 3012, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2976, + "src": "5596:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 3013, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "5596:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3014, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "5596:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3016, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5596:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5539:34:6", + "src": "5570:62:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2846, + "id": 3018, "nodeType": "ExpressionStatement", - "src": "5539:34:6" + "src": "5570:62:8" }, { "expression": { @@ -5317,18 +5473,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2850, + "id": 3022, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5602:3:6", + "referencedDeclaration": 4153, + "src": "5661:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2851, + "id": 3023, "isConstant": false, "isLValue": false, "isPure": false, @@ -5336,7 +5492,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5602:10:6", + "src": "5661:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5344,12 +5500,12 @@ }, { "argumentTypes": null, - "id": 2852, + "id": 3024, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5614:7:6", + "referencedDeclaration": 2972, + "src": "5673:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5369,32 +5525,32 @@ ], "expression": { "argumentTypes": null, - "id": 2848, + "id": 3020, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "5587:5:6", + "referencedDeclaration": 2792, + "src": "5646:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2849, + "id": 3021, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "5587:14:6", + "referencedDeclaration": 551, + "src": "5646:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2853, + "id": 3025, "isConstant": false, "isLValue": false, "isPure": false, @@ -5402,7 +5558,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5587:35:6", + "src": "5646:35:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5416,21 +5572,21 @@ "typeString": "bool" } ], - "id": 2847, + "id": 3019, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5579:7:6", + "referencedDeclaration": 4156, + "src": "5638:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2854, + "id": 3026, "isConstant": false, "isLValue": false, "isPure": false, @@ -5438,15 +5594,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5579:44:6", + "src": "5638:44:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2855, + "id": 3027, "nodeType": "ExpressionStatement", - "src": "5579:44:6" + "src": "5638:44:8" }, { "eventCall": { @@ -5454,12 +5610,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 3029, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, - "src": "5654:12:6", + "referencedDeclaration": 2970, + "src": "5713:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5467,12 +5623,12 @@ }, { "argumentTypes": null, - "id": 2858, + "id": 3030, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5674:7:6", + "referencedDeclaration": 2972, + "src": "5733:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5482,26 +5638,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2859, + "id": 3031, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5689:7:6", + "referencedDeclaration": 2976, + "src": "5748:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2860, + "id": 3032, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5689:23:6", + "referencedDeclaration": 2764, + "src": "5748:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5511,18 +5667,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2861, + "id": 3033, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5720:3:6", + "referencedDeclaration": 4153, + "src": "5779:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2862, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -5530,7 +5686,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5720:10:6", + "src": "5779:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5556,18 +5712,18 @@ "typeString": "address" } ], - "id": 2856, + "id": 3028, "name": "_Withdrawal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2542, - "src": "5635:11:6", + "referencedDeclaration": 2705, + "src": "5694:11:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,address)" } }, - "id": 2863, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -5575,20 +5731,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5635:101:6", + "src": "5694:101:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2864, + "id": 3036, "nodeType": "EmitStatement", - "src": "5630:106:6" + "src": "5689:106:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to decrease their unstaked deposit.\n@param _listingHash A listingHash msg.sender is the owner of.\n@param _amount The number of ERC20 tokens to withdraw from the unstaked deposit.", - "id": 2866, + "id": 3038, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5596,16 +5752,16 @@ "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 2806, + "id": 2973, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2803, + "id": 2970, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5258:20:6", + "scope": 3038, + "src": "5286:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5613,10 +5769,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2802, + "id": 2969, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5258:7:6", + "src": "5286:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5627,11 +5783,11 @@ }, { "constant": false, - "id": 2805, + "id": 2972, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5280:12:6", + "scope": 3038, + "src": "5308:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5639,10 +5795,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2804, + "id": 2971, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5280:4:6", + "src": "5308:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5652,54 +5808,54 @@ "visibility": "internal" } ], - "src": "5257:36:6" + "src": "5285:36:8" }, "payable": false, "returnParameters": { - "id": 2807, + "id": 2974, "nodeType": "ParameterList", "parameters": [], - "src": "5303:0:6" + "src": "5331:0:8" }, - "scope": 3593, - "src": "5240:501:6", + "scope": 3797, + "src": "5268:532:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2912, + "id": 3084, "nodeType": "Block", - "src": "6039:389:6", + "src": "6098:389:8", "statements": [ { "assignments": [ - 2872 + 3044 ], "declarations": [ { "constant": false, - "id": 2872, + "id": 3044, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2913, - "src": "6045:23:6", + "scope": 3085, + "src": "6104:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2871, + "id": 3043, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "6045:7:6", + "referencedDeclaration": 2767, + "src": "6104:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -5707,31 +5863,31 @@ "visibility": "internal" } ], - "id": 2876, + "id": 3048, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2873, + "id": 3045, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "6071:8:6", + "referencedDeclaration": 2790, + "src": "6130:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2875, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2874, + "id": 3046, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6080:12:6", + "referencedDeclaration": 3040, + "src": "6139:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5742,14 +5898,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6071:22:6", + "src": "6130:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "6045:48:6" + "src": "6104:48:8" }, { "expression": { @@ -5761,7 +5917,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2882, + "id": 3054, "isConstant": false, "isLValue": false, "isPure": false, @@ -5770,18 +5926,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2878, + "id": 3050, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6108:3:6", + "referencedDeclaration": 4153, + "src": "6167:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2879, + "id": 3051, "isConstant": false, "isLValue": false, "isPure": false, @@ -5789,7 +5945,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6108:10:6", + "src": "6167:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5801,32 +5957,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2880, + "id": 3052, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6122:7:6", + "referencedDeclaration": 3044, + "src": "6181:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2881, + "id": 3053, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "6122:13:6", + "referencedDeclaration": 2762, + "src": "6181:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6108:27:6", + "src": "6167:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5840,21 +5996,21 @@ "typeString": "bool" } ], - "id": 2877, + "id": 3049, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6100:7:6", + "referencedDeclaration": 4156, + "src": "6159:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2883, + "id": 3055, "isConstant": false, "isLValue": false, "isPure": false, @@ -5862,15 +6018,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6100:36:6", + "src": "6159:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2884, + "id": 3056, "nodeType": "ExpressionStatement", - "src": "6100:36:6" + "src": "6159:36:8" }, { "expression": { @@ -5881,12 +6037,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 3059, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6164:12:6", + "referencedDeclaration": 3040, + "src": "6223:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5900,18 +6056,18 @@ "typeString": "bytes32" } ], - "id": 2886, + "id": 3058, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "6150:13:6", + "referencedDeclaration": 3476, + "src": "6209:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2888, + "id": 3060, "isConstant": false, "isLValue": false, "isPure": false, @@ -5919,7 +6075,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6150:27:6", + "src": "6209:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5933,21 +6089,21 @@ "typeString": "bool" } ], - "id": 2885, + "id": 3057, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6142:7:6", + "referencedDeclaration": 4156, + "src": "6201:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2889, + "id": 3061, "isConstant": false, "isLValue": false, "isPure": false, @@ -5955,15 +6111,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6142:36:6", + "src": "6201:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2890, + "id": 3062, "nodeType": "ExpressionStatement", - "src": "6142:36:6" + "src": "6201:36:8" }, { "expression": { @@ -5975,7 +6131,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2901, + "id": 3073, "isConstant": false, "isLValue": false, "isPure": false, @@ -5986,7 +6142,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2895, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -5995,26 +6151,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2892, + "id": 3064, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6237:7:6", + "referencedDeclaration": 3044, + "src": "6296:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2893, + "id": 3065, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "6237:19:6", + "referencedDeclaration": 2766, + "src": "6296:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6025,14 +6181,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2894, + "id": 3066, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6260:1:6", + "src": "6319:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6040,7 +6196,7 @@ }, "value": "0" }, - "src": "6237:24:6", + "src": "6296:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6054,42 +6210,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2896, + "id": 3068, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "6265:10:6", + "referencedDeclaration": 2786, + "src": "6324:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2899, + "id": 3071, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2897, + "id": 3069, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6276:7:6", + "referencedDeclaration": 3044, + "src": "6335:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2898, + "id": 3070, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "6276:19:6", + "referencedDeclaration": 2766, + "src": "6335:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6100,27 +6256,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6265:31:6", + "src": "6324:31:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 2900, + "id": 3072, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "6265:40:6", + "referencedDeclaration": 2773, + "src": "6324:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6237:68:6", + "src": "6296:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6134,21 +6290,21 @@ "typeString": "bool" } ], - "id": 2891, + "id": 3063, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6229:7:6", + "referencedDeclaration": 4156, + "src": "6288:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2902, + "id": 3074, "isConstant": false, "isLValue": false, "isPure": false, @@ -6156,15 +6312,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6229:77:6", + "src": "6288:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2903, + "id": 3075, "nodeType": "ExpressionStatement", - "src": "6229:77:6" + "src": "6288:77:8" }, { "expression": { @@ -6172,12 +6328,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2905, + "id": 3077, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6368:12:6", + "referencedDeclaration": 3040, + "src": "6427:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6191,18 +6347,18 @@ "typeString": "bytes32" } ], - "id": 2904, + "id": 3076, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "6355:12:6", + "referencedDeclaration": 3796, + "src": "6414:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2906, + "id": 3078, "isConstant": false, "isLValue": false, "isPure": false, @@ -6210,15 +6366,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6355:26:6", + "src": "6414:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2907, + "id": 3079, "nodeType": "ExpressionStatement", - "src": "6355:26:6" + "src": "6414:26:8" }, { "eventCall": { @@ -6226,12 +6382,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2909, + "id": 3081, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6410:12:6", + "referencedDeclaration": 3040, + "src": "6469:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6245,18 +6401,18 @@ "typeString": "bytes32" } ], - "id": 2908, + "id": 3080, "name": "_ListingWithdrawn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2558, - "src": "6392:17:6", + "referencedDeclaration": 2721, + "src": "6451:17:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2910, + "id": 3082, "isConstant": false, "isLValue": false, "isPure": false, @@ -6264,20 +6420,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6392:31:6", + "src": "6451:31:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2911, + "id": 3083, "nodeType": "EmitStatement", - "src": "6387:36:6" + "src": "6446:36:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to remove the listingHash from the whitelist\nReturns all tokens to the owner of the listingHash\n@param _listingHash A listingHash msg.sender is the owner of.", - "id": 2913, + "id": 3085, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -6285,16 +6441,16 @@ "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 2869, + "id": 3041, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2868, + "id": 3040, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2913, - "src": "6008:20:6", + "scope": 3085, + "src": "6067:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6302,10 +6458,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2867, + "id": 3039, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6008:7:6", + "src": "6067:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6315,54 +6471,54 @@ "visibility": "internal" } ], - "src": "6007:22:6" + "src": "6066:22:8" }, "payable": false, "returnParameters": { - "id": 2870, + "id": 3042, "nodeType": "ParameterList", "parameters": [], - "src": "6039:0:6" + "src": "6098:0:8" }, - "scope": 3593, - "src": "5994:434:6", + "scope": 3797, + "src": "6053:434:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 3064, + "id": 3243, "nodeType": "Block", - "src": "7030:1536:6", + "src": "7089:1575:8", "statements": [ { "assignments": [ - 2923 + 3095 ], "declarations": [ { "constant": false, - "id": 2923, + "id": 3095, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7036:23:6", + "scope": 3244, + "src": "7095:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2922, + "id": 3094, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "7036:7:6", + "referencedDeclaration": 2767, + "src": "7095:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -6370,31 +6526,31 @@ "visibility": "internal" } ], - "id": 2927, + "id": 3099, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2924, + "id": 3096, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "7062:8:6", + "referencedDeclaration": 2790, + "src": "7121:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2926, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 2925, + "id": 3097, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7071:12:6", + "referencedDeclaration": 3087, + "src": "7130:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6405,27 +6561,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7062:22:6", + "src": "7121:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "7036:48:6" + "src": "7095:48:8" }, { "assignments": [ - 2929 + 3101 ], "declarations": [ { "constant": false, - "id": 2929, + "id": 3101, "name": "minDeposit", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7090:15:6", + "scope": 3244, + "src": "7149:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6433,10 +6589,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2928, + "id": 3100, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7090:4:6", + "src": "7149:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6446,21 +6602,21 @@ "visibility": "internal" } ], - "id": 2934, + "id": 3106, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2932, + "id": 3104, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7126:12:6", + "src": "7185:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -6478,32 +6634,32 @@ ], "expression": { "argumentTypes": null, - "id": 2930, + "id": 3102, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7108:13:6", + "referencedDeclaration": 2796, + "src": "7167:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2931, + "id": 3103, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7108:17:6", + "referencedDeclaration": 2512, + "src": "7167:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2933, + "id": 3105, "isConstant": false, "isLValue": false, "isPure": false, @@ -6511,14 +6667,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7108:31:6", + "src": "7167:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7090:49:6" + "src": "7149:49:8" }, { "expression": { @@ -6530,7 +6686,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2941, + "id": 3113, "isConstant": false, "isLValue": false, "isPure": false, @@ -6540,12 +6696,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2937, + "id": 3109, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7231:12:6", + "referencedDeclaration": 3087, + "src": "7290:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6559,18 +6715,18 @@ "typeString": "bytes32" } ], - "id": 2936, + "id": 3108, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "7220:10:6", + "referencedDeclaration": 3491, + "src": "7279:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2938, + "id": 3110, "isConstant": false, "isLValue": false, "isPure": false, @@ -6578,7 +6734,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7220:24:6", + "src": "7279:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6590,32 +6746,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2939, + "id": 3111, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7248:7:6", + "referencedDeclaration": 3095, + "src": "7307:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2940, + "id": 3112, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "7248:19:6", + "referencedDeclaration": 2760, + "src": "7307:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "7220:47:6", + "src": "7279:47:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6629,21 +6785,21 @@ "typeString": "bool" } ], - "id": 2935, + "id": 3107, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7212:7:6", + "referencedDeclaration": 4156, + "src": "7271:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2942, + "id": 3114, "isConstant": false, "isLValue": false, "isPure": false, @@ -6651,15 +6807,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7212:56:6", + "src": "7271:56:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2943, + "id": 3115, "nodeType": "ExpressionStatement", - "src": "7212:56:6" + "src": "7271:56:8" }, { "expression": { @@ -6671,7 +6827,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2954, + "id": 3126, "isConstant": false, "isLValue": false, "isPure": false, @@ -6682,7 +6838,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2948, + "id": 3120, "isConstant": false, "isLValue": false, "isPure": false, @@ -6691,26 +6847,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2945, + "id": 3117, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7317:7:6", + "referencedDeclaration": 3095, + "src": "7376:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2946, + "id": 3118, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "7317:19:6", + "referencedDeclaration": 2766, + "src": "7376:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6721,14 +6877,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2947, + "id": 3119, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7340:1:6", + "src": "7399:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6736,7 +6892,7 @@ }, "value": "0" }, - "src": "7317:24:6", + "src": "7376:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6750,42 +6906,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2949, + "id": 3121, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "7345:10:6", + "referencedDeclaration": 2786, + "src": "7404:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2952, + "id": 3124, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2950, + "id": 3122, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7356:7:6", + "referencedDeclaration": 3095, + "src": "7415:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2951, + "id": 3123, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "7356:19:6", + "referencedDeclaration": 2766, + "src": "7415:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6796,27 +6952,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7345:31:6", + "src": "7404:31:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 2953, + "id": 3125, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "7345:40:6", + "referencedDeclaration": 2773, + "src": "7404:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "7317:68:6", + "src": "7376:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6830,21 +6986,21 @@ "typeString": "bool" } ], - "id": 2944, + "id": 3116, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7309:7:6", + "referencedDeclaration": 4156, + "src": "7368:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2955, + "id": 3127, "isConstant": false, "isLValue": false, "isPure": false, @@ -6852,15 +7008,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7309:77:6", + "src": "7368:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2956, + "id": 3128, "nodeType": "ExpressionStatement", - "src": "7309:77:6" + "src": "7368:77:8" }, { "condition": { @@ -6869,7 +7025,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2960, + "id": 3132, "isConstant": false, "isLValue": false, "isPure": false, @@ -6878,26 +7034,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2957, + "id": 3129, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7397:7:6", + "referencedDeclaration": 3095, + "src": "7456:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2958, + "id": 3130, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "7397:23:6", + "referencedDeclaration": 2764, + "src": "7456:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6907,31 +7063,31 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 2959, + "id": 3131, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7423:10:6", + "referencedDeclaration": 3101, + "src": "7482:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7397:36:6", + "src": "7456:36:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2972, + "id": 3144, "nodeType": "IfStatement", - "src": "7393:196:6", + "src": "7452:196:8", "trueBody": { - "id": 2971, + "id": 3143, "nodeType": "Block", - "src": "7435:154:6", + "src": "7494:154:8", "statements": [ { "expression": { @@ -6939,12 +7095,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2962, + "id": 3134, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7510:12:6", + "referencedDeclaration": 3087, + "src": "7569:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6958,18 +7114,18 @@ "typeString": "bytes32" } ], - "id": 2961, + "id": 3133, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "7497:12:6", + "referencedDeclaration": 3796, + "src": "7556:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2963, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -6977,15 +7133,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7497:26:6", + "src": "7556:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2964, + "id": 3136, "nodeType": "ExpressionStatement", - "src": "7497:26:6" + "src": "7556:26:8" }, { "eventCall": { @@ -6993,12 +7149,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2966, + "id": 3138, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7553:12:6", + "referencedDeclaration": 3087, + "src": "7612:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7012,18 +7168,18 @@ "typeString": "bytes32" } ], - "id": 2965, + "id": 3137, "name": "_TouchAndRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2562, - "src": "7536:16:6", + "referencedDeclaration": 2725, + "src": "7595:16:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2967, + "id": 3139, "isConstant": false, "isLValue": false, "isPure": false, @@ -7031,28 +7187,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7536:30:6", + "src": "7595:30:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2968, + "id": 3140, "nodeType": "EmitStatement", - "src": "7531:35:6" + "src": "7590:35:8" }, { "expression": { "argumentTypes": null, "hexValue": "30", - "id": 2969, + "id": 3141, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7581:1:6", + "src": "7640:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -7060,26 +7216,26 @@ }, "value": "0" }, - "functionReturnParameters": 2921, - "id": 2970, + "functionReturnParameters": 3093, + "id": 3142, "nodeType": "Return", - "src": "7574:8:6" + "src": "7633:8:8" } ] } }, { "assignments": [ - 2974 + 3146 ], "declarations": [ { "constant": false, - "id": 2974, + "id": 3146, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7614:11:6", + "scope": 3244, + "src": "7673:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7087,10 +7243,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2973, + "id": 3145, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7614:4:6", + "src": "7673:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7100,7 +7256,7 @@ "visibility": "internal" } ], - "id": 2990, + "id": 3162, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7110,14 +7266,14 @@ { "argumentTypes": null, "hexValue": "766f746551756f72756d", - "id": 2979, + "id": 3151, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7670:12:6", + "src": "7729:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9b01c2212638b995654bf3d584befbb3576184e03cd1a9ae5693a18a1f559878", @@ -7135,32 +7291,32 @@ ], "expression": { "argumentTypes": null, - "id": 2977, + "id": 3149, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7652:13:6", + "referencedDeclaration": 2796, + "src": "7711:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2978, + "id": 3150, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7652:17:6", + "referencedDeclaration": 2512, + "src": "7711:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2980, + "id": 3152, "isConstant": false, "isLValue": false, "isPure": false, @@ -7168,7 +7324,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7652:31:6", + "src": "7711:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7180,14 +7336,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697453746167654c656e", - "id": 2983, + "id": 3155, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7709:16:6", + "src": "7768:16:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22aa10f6207ed6245b2e23bddfcdfa1a542b375f7cf45082a1a75b9304a6150d", @@ -7205,32 +7361,32 @@ ], "expression": { "argumentTypes": null, - "id": 2981, + "id": 3153, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7691:13:6", + "referencedDeclaration": 2796, + "src": "7750:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2982, + "id": 3154, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7691:17:6", + "referencedDeclaration": 2512, + "src": "7750:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2984, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": false, @@ -7238,7 +7394,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7691:35:6", + "src": "7750:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7250,14 +7406,14 @@ { "argumentTypes": null, "hexValue": "72657665616c53746167654c656e", - "id": 2987, + "id": 3159, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7752:16:6", + "src": "7811:16:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8858300ed02b4242350c6412c69b3951ae8f1d10eb49beafb9ecebaba7a0af1", @@ -7275,32 +7431,32 @@ ], "expression": { "argumentTypes": null, - "id": 2985, + "id": 3157, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7734:13:6", + "referencedDeclaration": 2796, + "src": "7793:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2986, + "id": 3158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7734:17:6", + "referencedDeclaration": 2512, + "src": "7793:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2988, + "id": 3160, "isConstant": false, "isLValue": false, "isPure": false, @@ -7308,7 +7464,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7734:35:6", + "src": "7793:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7332,32 +7488,32 @@ ], "expression": { "argumentTypes": null, - "id": 2975, + "id": 3147, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "7628:6:6", + "referencedDeclaration": 2794, + "src": "7687:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2976, + "id": 3148, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "startPoll", "nodeType": "MemberAccess", - "referencedDeclaration": 1101, - "src": "7628:16:6", + "referencedDeclaration": 1246, + "src": "7687:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 2989, + "id": 3161, "isConstant": false, "isLValue": false, "isPure": false, @@ -7365,19 +7521,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7628:147:6", + "src": "7687:147:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7614:161:6" + "src": "7673:161:8" }, { "expression": { "argumentTypes": null, - "id": 3013, + "id": 3188, "isConstant": false, "isLValue": false, "isPure": false, @@ -7386,26 +7542,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2991, + "id": 3163, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "7782:10:6", + "referencedDeclaration": 2786, + "src": "7841:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2993, + "id": 3165, "indexExpression": { "argumentTypes": null, - "id": 2992, + "id": 3164, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "7793:6:6", + "referencedDeclaration": 3146, + "src": "7852:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7416,9 +7572,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7782:18:6", + "src": "7841:18:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, @@ -7431,18 +7587,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2995, + "id": 3167, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7833:3:6", + "referencedDeclaration": 4153, + "src": "7892:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2996, + "id": 3168, "isConstant": false, "isLValue": false, "isPure": false, @@ -7450,7 +7606,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7833:10:6", + "src": "7892:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7458,209 +7614,273 @@ }, { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3008, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 3182, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7994:3:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3005, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 3179, + "name": "minDeposit", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3101, + "src": "7978:10:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "components": [ + "arguments": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3002, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 2997, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7865:3:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "arguments": [ + "arguments": [ + { + "argumentTypes": null, + "hexValue": "64697370656e736174696f6e506374", + "id": 3175, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7954:17:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", + "typeString": "literal_string \"dispensationPct\"" + }, + "value": "dispensationPct" + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "hexValue": "64697370656e736174696f6e506374", - "id": 3000, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7889:17:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", - "typeString": "literal_string \"dispensationPct\"" - }, - "value": "dispensationPct" + "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", + "typeString": "literal_string \"dispensationPct\"" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", - "typeString": "literal_string \"dispensationPct\"" - } - ], - "expression": { - "argumentTypes": null, - "id": 2998, - "name": "parameterizer", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7871:13:6", - "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", - "typeString": "contract Parameterizer" - } - }, - "id": 2999, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "get", - "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7871:17:6", + "argumentTypes": null, + "id": 3173, + "name": "parameterizer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2796, + "src": "7936:13:8", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", - "typeString": "function (string memory) view external returns (uint256)" + "typeIdentifier": "t_contract$_Parameterizer_$2653", + "typeString": "contract Parameterizer" } }, - "id": 3001, + "id": 3174, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "7871:36:6", + "memberName": "get", + "nodeType": "MemberAccess", + "referencedDeclaration": 2512, + "src": "7936:17:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", + "typeString": "function (string memory) view external returns (uint256)" } }, - "src": "7865:42:6", + "id": 3176, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7936:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 3003, + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 3170, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7927:3:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "id": 3169, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "7922:4:8", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" + }, + "id": 3171, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:9:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3172, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "7922:13:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3177, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "7864:44:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "id": 3004, - "name": "minDeposit", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7911:10:6", + "names": [], + "nodeType": "FunctionCall", + "src": "7922:51:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7864:57:6", + "id": 3178, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "7922:55:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 3180, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:67:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 3006, + }, + "id": 3181, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "7863:59:6", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "7922:71:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 3007, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7925:3:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "src": "7863:65:6", + "id": 3183, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:76:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7668,12 +7888,12 @@ }, { "argumentTypes": null, - "id": 3009, + "id": 3184, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7943:10:6", + "referencedDeclaration": 3101, + "src": "8013:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7682,14 +7902,14 @@ { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3010, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "7971:5:6", + "src": "8041:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -7700,14 +7920,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3011, + "id": 3186, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7997:1:6", + "src": "8067:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -7718,18 +7938,18 @@ ], "expression": { "argumentTypes": null, - "id": 2994, + "id": 3166, "name": "Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2619, - "src": "7803:9:6", + "referencedDeclaration": 2782, + "src": "7862:9:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Challenge_$2619_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Challenge_$2782_storage_ptr_$", "typeString": "type(struct Registry.Challenge storage pointer)" } }, - "id": 3012, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -7743,26 +7963,26 @@ "totalTokens" ], "nodeType": "FunctionCall", - "src": "7803:202:6", + "src": "7862:213:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_memory", + "typeIdentifier": "t_struct$_Challenge_$2782_memory", "typeString": "struct Registry.Challenge memory" } }, - "src": "7782:223:6", + "src": "7841:234:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3014, + "id": 3189, "nodeType": "ExpressionStatement", - "src": "7782:223:6" + "src": "7841:234:8" }, { "expression": { "argumentTypes": null, - "id": 3019, + "id": 3194, "isConstant": false, "isLValue": false, "isPure": false, @@ -7771,26 +7991,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3015, + "id": 3190, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "8070:7:6", + "referencedDeclaration": 3095, + "src": "8140:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3017, + "id": 3192, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "8070:19:6", + "referencedDeclaration": 2766, + "src": "8140:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7800,31 +8020,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3018, + "id": 3193, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8092:6:6", + "referencedDeclaration": 3146, + "src": "8162:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8070:28:6", + "src": "8140:28:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3020, + "id": 3195, "nodeType": "ExpressionStatement", - "src": "8070:28:6" + "src": "8140:28:8" }, { "expression": { "argumentTypes": null, - "id": 3025, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -7833,79 +8053,147 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3021, + "id": 3196, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "8158:7:6", + "referencedDeclaration": 3095, + "src": "8228:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3023, + "id": 3198, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "8158:23:6", + "referencedDeclaration": 2764, + "src": "8228:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3024, - "name": "minDeposit", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "8185:10:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "8158:37:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 3026, - "nodeType": "ExpressionStatement", - "src": "8158:37:6" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ + "arguments": [ + { + "argumentTypes": null, + "id": 3202, + "name": "minDeposit", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3101, + "src": "8282:10:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 3199, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3095, + "src": "8254:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 3200, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "8254:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3201, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "8254:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3203, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "8254:39:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "8228:65:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3205, + "nodeType": "ExpressionStatement", + "src": "8228:65:8" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3030, + "id": 3209, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8265:3:6", + "referencedDeclaration": 4153, + "src": "8363:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3031, + "id": 3210, "isConstant": false, "isLValue": false, "isPure": false, @@ -7913,7 +8201,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8265:10:6", + "src": "8363:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7921,25 +8209,25 @@ }, { "argumentTypes": null, - "id": 3032, + "id": 3211, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "8277:4:6", + "referencedDeclaration": 4186, + "src": "8375:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 3033, + "id": 3212, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "8283:10:6", + "referencedDeclaration": 3101, + "src": "8381:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7953,7 +8241,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -7963,32 +8251,32 @@ ], "expression": { "argumentTypes": null, - "id": 3028, + "id": 3207, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "8246:5:6", + "referencedDeclaration": 2792, + "src": "8344:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3029, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "8246:18:6", + "referencedDeclaration": 510, + "src": "8344:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 3034, + "id": 3213, "isConstant": false, "isLValue": false, "isPure": false, @@ -7996,7 +8284,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8246:48:6", + "src": "8344:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8010,21 +8298,21 @@ "typeString": "bool" } ], - "id": 3027, + "id": 3206, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8238:7:6", + "referencedDeclaration": 4156, + "src": "8336:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3035, + "id": 3214, "isConstant": false, "isLValue": false, "isPure": false, @@ -8032,26 +8320,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8238:57:6", + "src": "8336:57:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3036, + "id": 3215, "nodeType": "ExpressionStatement", - "src": "8238:57:6" + "src": "8336:57:8" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 3038, + "id": 3217, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "8302:18:6", + "scope": 3244, + "src": "8400:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8059,10 +8347,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3037, + "id": 3216, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8302:4:6", + "src": "8400:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8072,21 +8360,21 @@ "visibility": "internal" } ], - "id": 3039, + "id": 3218, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "8302:18:6" + "src": "8400:18:8" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 3041, + "id": 3220, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "8326:18:6", + "scope": 3244, + "src": "8424:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8094,10 +8382,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3040, + "id": 3219, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8326:4:6", + "src": "8424:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8107,15 +8395,15 @@ "visibility": "internal" } ], - "id": 3042, + "id": 3221, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "8326:18:6" + "src": "8424:18:8" }, { "expression": { "argumentTypes": null, - "id": 3050, + "id": 3229, "isConstant": false, "isLValue": false, "isPure": false, @@ -8125,12 +8413,12 @@ "components": [ { "argumentTypes": null, - "id": 3043, + "id": 3222, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3038, - "src": "8351:13:6", + "referencedDeclaration": 3217, + "src": "8449:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8138,12 +8426,12 @@ }, { "argumentTypes": null, - "id": 3044, + "id": 3223, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3041, - "src": "8366:13:6", + "referencedDeclaration": 3220, + "src": "8464:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8151,14 +8439,14 @@ }, null ], - "id": 3045, + "id": 3224, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "8350:31:6", + "src": "8448:31:8", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$__$", "typeString": "tuple(uint256,uint256,)" @@ -8171,12 +8459,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3048, + "id": 3227, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8399:6:6", + "referencedDeclaration": 3146, + "src": "8497:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8192,32 +8480,32 @@ ], "expression": { "argumentTypes": null, - "id": 3046, + "id": 3225, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "8384:6:6", + "referencedDeclaration": 2794, + "src": "8482:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3047, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollMap", "nodeType": "MemberAccess", - "referencedDeclaration": 535, - "src": "8384:14:6", + "referencedDeclaration": 655, + "src": "8482:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 3049, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, @@ -8225,21 +8513,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8384:22:6", + "src": "8482:22:8", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "tuple(uint256,uint256,uint256,uint256,uint256)" } }, - "src": "8350:56:6", + "src": "8448:56:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3051, + "id": 3230, "nodeType": "ExpressionStatement", - "src": "8350:56:6" + "src": "8448:56:8" }, { "eventCall": { @@ -8247,12 +8535,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3053, + "id": 3232, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "8436:12:6", + "referencedDeclaration": 3087, + "src": "8534:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8260,12 +8548,12 @@ }, { "argumentTypes": null, - "id": 3054, + "id": 3233, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8456:6:6", + "referencedDeclaration": 3146, + "src": "8554:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8273,12 +8561,12 @@ }, { "argumentTypes": null, - "id": 3055, + "id": 3234, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2917, - "src": "8470:5:6", + "referencedDeclaration": 3089, + "src": "8568:5:8", "typeDescriptions": { "typeIdentifier": "t_string_calldata_ptr", "typeString": "string calldata" @@ -8286,12 +8574,12 @@ }, { "argumentTypes": null, - "id": 3056, + "id": 3235, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3038, - "src": "8483:13:6", + "referencedDeclaration": 3217, + "src": "8581:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8299,12 +8587,12 @@ }, { "argumentTypes": null, - "id": 3057, + "id": 3236, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3041, - "src": "8504:13:6", + "referencedDeclaration": 3220, + "src": "8602:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8314,18 +8602,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3058, + "id": 3237, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8525:3:6", + "referencedDeclaration": 4153, + "src": "8623:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3059, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": false, @@ -8333,7 +8621,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8525:10:6", + "src": "8623:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8367,18 +8655,18 @@ "typeString": "address" } ], - "id": 3052, + "id": 3231, "name": "_Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2522, - "src": "8418:10:6", + "referencedDeclaration": 2685, + "src": "8516:10:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_string_memory_ptr_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,string memory,uint256,uint256,address)" } }, - "id": 3060, + "id": 3239, "isConstant": false, "isLValue": false, "isPure": false, @@ -8386,39 +8674,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8418:123:6", + "src": "8516:123:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3061, + "id": 3240, "nodeType": "EmitStatement", - "src": "8413:128:6" + "src": "8511:128:8" }, { "expression": { "argumentTypes": null, - "id": 3062, + "id": 3241, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8555:6:6", + "referencedDeclaration": 3146, + "src": "8653:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2921, - "id": 3063, + "functionReturnParameters": 3093, + "id": 3242, "nodeType": "Return", - "src": "8548:13:6" + "src": "8646:13:8" } ] }, "documentation": "@dev Starts a poll for a listingHash which is either in the apply stage or\nalready in the whitelist. Tokens are taken from the challenger and the\napplicant's deposits are locked.\n@param _listingHash The listingHash being challenged, whether listed or in application\n@param _data Extra data relevant to the challenge. Think IPFS hashes.", - "id": 3065, + "id": 3244, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -8426,16 +8714,16 @@ "name": "challenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 2918, + "id": 3090, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2915, + "id": 3087, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "6958:20:6", + "scope": 3244, + "src": "7017:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8443,10 +8731,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2914, + "id": 3086, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6958:7:6", + "src": "7017:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8457,11 +8745,11 @@ }, { "constant": false, - "id": 2917, + "id": 3089, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "6980:12:6", + "scope": 3244, + "src": "7039:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8469,10 +8757,10 @@ "typeString": "string" }, "typeName": { - "id": 2916, + "id": 3088, "name": "string", "nodeType": "ElementaryTypeName", - "src": "6980:6:6", + "src": "7039:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -8482,20 +8770,20 @@ "visibility": "internal" } ], - "src": "6957:36:6" + "src": "7016:36:8" }, "payable": false, "returnParameters": { - "id": 2921, + "id": 3093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2920, + "id": 3092, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7012:16:6", + "scope": 3244, + "src": "7071:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8503,10 +8791,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2919, + "id": 3091, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7012:4:6", + "src": "7071:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8516,19 +8804,19 @@ "visibility": "internal" } ], - "src": "7011:18:6" + "src": "7070:18:8" }, - "scope": 3593, - "src": "6939:1627:6", + "scope": 3797, + "src": "6998:1666:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 3092, + "id": 3271, "nodeType": "Block", - "src": "8846:217:6", + "src": "8944:217:8", "statements": [ { "condition": { @@ -8536,12 +8824,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3071, + "id": 3250, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8873:12:6", + "referencedDeclaration": 3246, + "src": "8971:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8555,18 +8843,18 @@ "typeString": "bytes32" } ], - "id": 3070, + "id": 3249, "name": "canBeWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, - "src": "8856:16:6", + "referencedDeclaration": 3463, + "src": "8954:16:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3072, + "id": 3251, "isConstant": false, "isLValue": false, "isPure": false, @@ -8574,7 +8862,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8856:30:6", + "src": "8954:30:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8586,12 +8874,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3079, + "id": 3258, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8970:12:6", + "referencedDeclaration": 3246, + "src": "9068:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8605,18 +8893,18 @@ "typeString": "bytes32" } ], - "id": 3078, + "id": 3257, "name": "challengeCanBeResolved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3354, - "src": "8947:22:6", + "referencedDeclaration": 3546, + "src": "9045:22:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3080, + "id": 3259, "isConstant": false, "isLValue": false, "isPure": false, @@ -8624,16 +8912,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8947:36:6", + "src": "9045:36:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3089, + "id": 3268, "nodeType": "Block", - "src": "9036:23:6", + "src": "9134:23:8", "statements": [ { "expression": { @@ -8641,21 +8929,21 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3086, + "id": 3265, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 3707, - 3708 + 4158, + 4159 ], - "referencedDeclaration": 3707, - "src": "9044:6:6", + "referencedDeclaration": 4158, + "src": "9142:6:8", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 3087, + "id": 3266, "isConstant": false, "isLValue": false, "isPure": false, @@ -8663,25 +8951,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9044:8:6", + "src": "9142:8:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3088, + "id": 3267, "nodeType": "ExpressionStatement", - "src": "9044:8:6" + "src": "9142:8:8" } ] }, - "id": 3090, + "id": 3269, "nodeType": "IfStatement", - "src": "8943:116:6", + "src": "9041:116:8", "trueBody": { - "id": 3085, + "id": 3264, "nodeType": "Block", - "src": "8985:45:6", + "src": "9083:45:8", "statements": [ { "expression": { @@ -8689,12 +8977,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3082, + "id": 3261, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "9010:12:6", + "referencedDeclaration": 3246, + "src": "9108:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8708,18 +8996,18 @@ "typeString": "bytes32" } ], - "id": 3081, + "id": 3260, "name": "resolveChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3515, - "src": "8993:16:6", + "referencedDeclaration": 3719, + "src": "9091:16:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3083, + "id": 3262, "isConstant": false, "isLValue": false, "isPure": false, @@ -8727,26 +9015,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8993:30:6", + "src": "9091:30:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3084, + "id": 3263, "nodeType": "ExpressionStatement", - "src": "8993:30:6" + "src": "9091:30:8" } ] } }, - "id": 3091, + "id": 3270, "nodeType": "IfStatement", - "src": "8852:207:6", + "src": "8950:207:8", "trueBody": { - "id": 3077, + "id": 3256, "nodeType": "Block", - "src": "8888:49:6", + "src": "8986:49:8", "statements": [ { "expression": { @@ -8754,12 +9042,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3074, + "id": 3253, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8917:12:6", + "referencedDeclaration": 3246, + "src": "9015:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8773,18 +9061,18 @@ "typeString": "bytes32" } ], - "id": 3073, + "id": 3252, "name": "whitelistApplication", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3539, - "src": "8896:20:6", + "referencedDeclaration": 3743, + "src": "8994:20:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3075, + "id": 3254, "isConstant": false, "isLValue": false, "isPure": false, @@ -8792,15 +9080,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8896:34:6", + "src": "8994:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3076, + "id": 3255, "nodeType": "ExpressionStatement", - "src": "8896:34:6" + "src": "8994:34:8" } ] } @@ -8808,7 +9096,7 @@ ] }, "documentation": "@dev Updates a listingHash's status from 'application' to 'listing' or resolves\na challenge if one exists.\n@param _listingHash The listingHash whose status is being updated", - "id": 3093, + "id": 3272, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -8816,16 +9104,16 @@ "name": "updateStatus", "nodeType": "FunctionDefinition", "parameters": { - "id": 3068, + "id": 3247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3067, + "id": 3246, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3093, - "src": "8817:20:6", + "scope": 3272, + "src": "8915:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8833,10 +9121,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3066, + "id": 3245, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8817:7:6", + "src": "8915:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8846,26 +9134,26 @@ "visibility": "internal" } ], - "src": "8816:22:6" + "src": "8914:22:8" }, "payable": false, "returnParameters": { - "id": 3069, + "id": 3248, "nodeType": "ParameterList", "parameters": [], - "src": "8846:0:6" + "src": "8944:0:8" }, - "scope": 3593, - "src": "8795:268:6", + "scope": 3797, + "src": "8893:268:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3180, + "id": 3371, "nodeType": "Block", - "src": "9532:853:6", + "src": "9630:934:8", "statements": [ { "expression": { @@ -8877,7 +9165,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3109, + "id": 3288, "isConstant": false, "isLValue": false, "isPure": false, @@ -8890,26 +9178,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3101, + "id": 3280, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "9644:10:6", + "referencedDeclaration": 2786, + "src": "9742:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3103, + "id": 3282, "indexExpression": { "argumentTypes": null, - "id": 3102, + "id": 3281, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9655:12:6", + "referencedDeclaration": 3274, + "src": "9753:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8920,43 +9208,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9644:24:6", + "src": "9742:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3104, + "id": 3283, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "9644:36:6", + "referencedDeclaration": 2781, + "src": "9742:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3107, + "id": 3286, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3105, + "id": 3284, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9681:3:6", + "referencedDeclaration": 4153, + "src": "9779:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3106, + "id": 3285, "isConstant": false, "isLValue": false, "isPure": false, @@ -8964,7 +9252,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9681:10:6", + "src": "9779:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8975,7 +9263,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9644:48:6", + "src": "9742:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8986,14 +9274,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3108, + "id": 3287, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9696:5:6", + "src": "9794:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9001,7 +9289,7 @@ }, "value": "false" }, - "src": "9644:57:6", + "src": "9742:57:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9015,21 +9303,21 @@ "typeString": "bool" } ], - "id": 3100, + "id": 3279, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9636:7:6", + "referencedDeclaration": 4156, + "src": "9734:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3110, + "id": 3289, "isConstant": false, "isLValue": false, "isPure": false, @@ -9037,15 +9325,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9636:66:6", + "src": "9734:66:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3111, + "id": 3290, "nodeType": "ExpressionStatement", - "src": "9636:66:6" + "src": "9734:66:8" }, { "expression": { @@ -9057,7 +9345,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3118, + "id": 3297, "isConstant": false, "isLValue": false, "isPure": false, @@ -9068,26 +9356,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3113, + "id": 3292, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "9716:10:6", + "referencedDeclaration": 2786, + "src": "9814:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3115, + "id": 3294, "indexExpression": { "argumentTypes": null, - "id": 3114, + "id": 3293, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9727:12:6", + "referencedDeclaration": 3274, + "src": "9825:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9098,21 +9386,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9716:24:6", + "src": "9814:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3116, + "id": 3295, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "9716:33:6", + "referencedDeclaration": 2773, + "src": "9814:33:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9123,14 +9411,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3117, + "id": 3296, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9753:4:6", + "src": "9851:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9138,7 +9426,7 @@ }, "value": "true" }, - "src": "9716:41:6", + "src": "9814:41:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9152,21 +9440,21 @@ "typeString": "bool" } ], - "id": 3112, + "id": 3291, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9708:7:6", + "referencedDeclaration": 4156, + "src": "9806:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3119, + "id": 3298, "isConstant": false, "isLValue": false, "isPure": false, @@ -9174,28 +9462,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9708:50:6", + "src": "9806:50:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3120, + "id": 3299, "nodeType": "ExpressionStatement", - "src": "9708:50:6" + "src": "9806:50:8" }, { "assignments": [ - 3122 + 3301 ], "declarations": [ { "constant": false, - "id": 3122, + "id": 3301, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9765:16:6", + "scope": 3372, + "src": "9863:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9203,10 +9491,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3121, + "id": 3300, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9765:4:6", + "src": "9863:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9216,7 +9504,7 @@ "visibility": "internal" } ], - "id": 3130, + "id": 3309, "initialValue": { "argumentTypes": null, "arguments": [ @@ -9224,18 +9512,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3125, + "id": 3304, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9811:3:6", + "referencedDeclaration": 4153, + "src": "9909:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3126, + "id": 3305, "isConstant": false, "isLValue": false, "isPure": false, @@ -9243,7 +9531,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9811:10:6", + "src": "9909:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9251,12 +9539,12 @@ }, { "argumentTypes": null, - "id": 3127, + "id": 3306, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9823:12:6", + "referencedDeclaration": 3274, + "src": "9921:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9264,12 +9552,12 @@ }, { "argumentTypes": null, - "id": 3128, + "id": 3307, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3097, - "src": "9837:5:6", + "referencedDeclaration": 3276, + "src": "9935:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9293,32 +9581,32 @@ ], "expression": { "argumentTypes": null, - "id": 3123, + "id": 3302, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "9784:6:6", + "referencedDeclaration": 2794, + "src": "9882:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3124, + "id": 3303, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "9784:26:6", + "referencedDeclaration": 1189, + "src": "9882:26:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 3129, + "id": 3308, "isConstant": false, "isLValue": false, "isPure": false, @@ -9326,27 +9614,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9784:59:6", + "src": "9882:59:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9765:78:6" + "src": "9863:78:8" }, { "assignments": [ - 3132 + 3311 ], "declarations": [ { "constant": false, - "id": 3132, + "id": 3311, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9849:11:6", + "scope": 3372, + "src": "9947:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9354,10 +9642,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3131, + "id": 3310, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9849:4:6", + "src": "9947:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9367,7 +9655,7 @@ "visibility": "internal" } ], - "id": 3139, + "id": 3318, "initialValue": { "argumentTypes": null, "arguments": [ @@ -9375,18 +9663,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3134, + "id": 3313, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9875:3:6", + "referencedDeclaration": 4153, + "src": "9973:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3135, + "id": 3314, "isConstant": false, "isLValue": false, "isPure": false, @@ -9394,7 +9682,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9875:10:6", + "src": "9973:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9402,12 +9690,12 @@ }, { "argumentTypes": null, - "id": 3136, + "id": 3315, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9887:12:6", + "referencedDeclaration": 3274, + "src": "9985:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9415,12 +9703,12 @@ }, { "argumentTypes": null, - "id": 3137, + "id": 3316, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3097, - "src": "9901:5:6", + "referencedDeclaration": 3276, + "src": "9999:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9442,18 +9730,18 @@ "typeString": "uint256" } ], - "id": 3133, + "id": 3312, "name": "voterReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3223, - "src": "9863:11:6", + "referencedDeclaration": 3415, + "src": "9961:11:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view returns (uint256)" } }, - "id": 3138, + "id": 3317, "isConstant": false, "isLValue": false, "isPure": false, @@ -9461,19 +9749,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9863:44:6", + "src": "9961:44:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9849:58:6" + "src": "9947:58:8" }, { "expression": { "argumentTypes": null, - "id": 3145, + "id": 3330, "isConstant": false, "isLValue": false, "isPure": false, @@ -9484,26 +9772,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3140, + "id": 3319, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10057:10:6", + "referencedDeclaration": 2786, + "src": "10155:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3142, + "id": 3321, "indexExpression": { "argumentTypes": null, - "id": 3141, + "id": 3320, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10068:12:6", + "referencedDeclaration": 3274, + "src": "10166:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9514,55 +9802,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10057:24:6", + "src": "10155:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3143, + "id": 3322, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "10057:36:6", + "referencedDeclaration": 2777, + "src": "10155:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3144, - "name": "voterTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3122, - "src": "10097:11:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3328, + "name": "voterTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3301, + "src": "10235:11:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3323, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "10194:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3325, + "indexExpression": { + "argumentTypes": null, + "id": 3324, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3274, + "src": "10205:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "10194:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3326, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "totalTokens", + "nodeType": "MemberAccess", + "referencedDeclaration": 2777, + "src": "10194:36:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3327, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "10194:40:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3329, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10194:53:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10057:51:6", + "src": "10155:92:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3146, + "id": 3331, "nodeType": "ExpressionStatement", - "src": "10057:51:6" + "src": "10155:92:8" }, { "expression": { "argumentTypes": null, - "id": 3152, + "id": 3343, "isConstant": false, "isLValue": false, "isPure": false, @@ -9573,26 +9956,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3147, + "id": 3332, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10114:10:6", + "referencedDeclaration": 2786, + "src": "10253:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3149, + "id": 3334, "indexExpression": { "argumentTypes": null, - "id": 3148, + "id": 3333, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10125:12:6", + "referencedDeclaration": 3274, + "src": "10264:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9603,55 +9986,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10114:24:6", + "src": "10253:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3150, + "id": 3335, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "10114:35:6", + "referencedDeclaration": 2769, + "src": "10253:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3151, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10153:6:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3341, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3311, + "src": "10331:6:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3336, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "10291:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3338, + "indexExpression": { + "argumentTypes": null, + "id": 3337, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3274, + "src": "10302:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "10291:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3339, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 2769, + "src": "10291:35:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3340, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "10291:39:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3342, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10291:47:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10114:45:6", + "src": "10253:85:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3153, + "id": 3344, "nodeType": "ExpressionStatement", - "src": "10114:45:6" + "src": "10253:85:8" }, { "expression": { "argumentTypes": null, - "id": 3162, + "id": 3353, "isConstant": false, "isLValue": false, "isPure": false, @@ -9664,26 +10142,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3154, + "id": 3345, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10215:10:6", + "referencedDeclaration": 2786, + "src": "10394:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3156, + "id": 3347, "indexExpression": { "argumentTypes": null, - "id": 3155, + "id": 3346, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10226:12:6", + "referencedDeclaration": 3274, + "src": "10405:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9694,43 +10172,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10215:24:6", + "src": "10394:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3157, + "id": 3348, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "10215:36:6", + "referencedDeclaration": 2781, + "src": "10394:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3160, + "id": 3351, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3158, + "id": 3349, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10252:3:6", + "referencedDeclaration": 4153, + "src": "10431:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3159, + "id": 3350, "isConstant": false, "isLValue": false, "isPure": false, @@ -9738,7 +10216,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10252:10:6", + "src": "10431:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9749,7 +10227,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "10215:48:6", + "src": "10394:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9760,14 +10238,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3161, + "id": 3352, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "10266:4:6", + "src": "10445:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9775,15 +10253,15 @@ }, "value": "true" }, - "src": "10215:55:6", + "src": "10394:55:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3163, + "id": 3354, "nodeType": "ExpressionStatement", - "src": "10215:55:6" + "src": "10394:55:8" }, { "expression": { @@ -9796,18 +10274,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3167, + "id": 3358, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10300:3:6", + "referencedDeclaration": 4153, + "src": "10479:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3168, + "id": 3359, "isConstant": false, "isLValue": false, "isPure": false, @@ -9815,7 +10293,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10300:10:6", + "src": "10479:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9823,12 +10301,12 @@ }, { "argumentTypes": null, - "id": 3169, + "id": 3360, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10312:6:6", + "referencedDeclaration": 3311, + "src": "10491:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9848,32 +10326,32 @@ ], "expression": { "argumentTypes": null, - "id": 3165, + "id": 3356, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "10285:5:6", + "referencedDeclaration": 2792, + "src": "10464:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3166, + "id": 3357, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "10285:14:6", + "referencedDeclaration": 551, + "src": "10464:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3170, + "id": 3361, "isConstant": false, "isLValue": false, "isPure": false, @@ -9881,7 +10359,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10285:34:6", + "src": "10464:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9895,21 +10373,21 @@ "typeString": "bool" } ], - "id": 3164, + "id": 3355, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10277:7:6", + "referencedDeclaration": 4156, + "src": "10456:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3171, + "id": 3362, "isConstant": false, "isLValue": false, "isPure": false, @@ -9917,15 +10395,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10277:43:6", + "src": "10456:43:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3172, + "id": 3363, "nodeType": "ExpressionStatement", - "src": "10277:43:6" + "src": "10456:43:8" }, { "eventCall": { @@ -9933,12 +10411,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3174, + "id": 3365, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10347:12:6", + "referencedDeclaration": 3274, + "src": "10526:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9946,12 +10424,12 @@ }, { "argumentTypes": null, - "id": 3175, + "id": 3366, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10361:6:6", + "referencedDeclaration": 3311, + "src": "10540:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9961,18 +10439,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3176, + "id": 3367, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10369:3:6", + "referencedDeclaration": 4153, + "src": "10548:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3177, + "id": 3368, "isConstant": false, "isLValue": false, "isPure": false, @@ -9980,7 +10458,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10369:10:6", + "src": "10548:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10002,18 +10480,18 @@ "typeString": "address" } ], - "id": 3173, + "id": 3364, "name": "_RewardClaimed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2590, - "src": "10332:14:6", + "referencedDeclaration": 2753, + "src": "10511:14:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 3178, + "id": 3369, "isConstant": false, "isLValue": false, "isPure": false, @@ -10021,20 +10499,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10332:48:6", + "src": "10511:48:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3179, + "id": 3370, "nodeType": "EmitStatement", - "src": "10327:53:6" + "src": "10506:53:8" } ] }, "documentation": "@dev Called by a voter to claim their reward for each completed vote. Someone\nmust call updateStatus() before this can be called.\n@param _challengeID The PLCR pollID of the challenge a reward is being claimed for\n@param _salt The salt of a voter's commit hash in the given poll", - "id": 3181, + "id": 3372, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -10042,16 +10520,16 @@ "name": "claimReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3098, + "id": 3277, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3095, + "id": 3274, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9494:17:6", + "scope": 3372, + "src": "9592:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10059,10 +10537,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3094, + "id": 3273, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9494:4:6", + "src": "9592:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10073,11 +10551,11 @@ }, { "constant": false, - "id": 3097, + "id": 3276, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9513:10:6", + "scope": 3372, + "src": "9611:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10085,10 +10563,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3096, + "id": 3275, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9513:4:6", + "src": "9611:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10098,39 +10576,39 @@ "visibility": "internal" } ], - "src": "9493:31:6" + "src": "9591:31:8" }, "payable": false, "returnParameters": { - "id": 3099, + "id": 3278, "nodeType": "ParameterList", "parameters": [], - "src": "9532:0:6" + "src": "9630:0:8" }, - "scope": 3593, - "src": "9473:912:6", + "scope": 3797, + "src": "9571:993:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3222, + "id": 3414, "nodeType": "Block", - "src": "10940:258:6", + "src": "11119:262:8", "statements": [ { "assignments": [ - 3193 + 3384 ], "declarations": [ { "constant": false, - "id": 3193, + "id": 3384, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10946:16:6", + "scope": 3415, + "src": "11125:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10138,10 +10616,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3192, + "id": 3383, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10946:4:6", + "src": "11125:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10151,33 +10629,33 @@ "visibility": "internal" } ], - "id": 3198, + "id": 3389, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3194, + "id": 3385, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10965:10:6", + "referencedDeclaration": 2786, + "src": "11144:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3196, + "id": 3387, "indexExpression": { "argumentTypes": null, - "id": 3195, + "id": 3386, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "10976:12:6", + "referencedDeclaration": 3376, + "src": "11155:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10188,41 +10666,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10965:24:6", + "src": "11144:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3197, + "id": 3388, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "10965:36:6", + "referencedDeclaration": 2777, + "src": "11144:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10946:55:6" + "src": "11125:55:8" }, { "assignments": [ - 3200 + 3391 ], "declarations": [ { "constant": false, - "id": 3200, + "id": 3391, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "11007:15:6", + "scope": 3415, + "src": "11186:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10230,10 +10708,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3199, + "id": 3390, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11007:4:6", + "src": "11186:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10243,33 +10721,33 @@ "visibility": "internal" } ], - "id": 3205, + "id": 3396, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3201, + "id": 3392, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "11025:10:6", + "referencedDeclaration": 2786, + "src": "11204:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3203, + "id": 3394, "indexExpression": { "argumentTypes": null, - "id": 3202, + "id": 3393, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "11036:12:6", + "referencedDeclaration": 3376, + "src": "11215:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10280,41 +10758,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11025:24:6", + "src": "11204:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3204, + "id": 3395, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "11025:35:6", + "referencedDeclaration": 2769, + "src": "11204:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11007:53:6" + "src": "11186:53:8" }, { "assignments": [ - 3207 + 3398 ], "declarations": [ { "constant": false, - "id": 3207, + "id": 3398, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "11066:16:6", + "scope": 3415, + "src": "11245:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10322,10 +10800,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3206, + "id": 3397, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11066:4:6", + "src": "11245:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10335,18 +10813,18 @@ "visibility": "internal" } ], - "id": 3214, + "id": 3405, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3210, + "id": 3401, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3183, - "src": "11112:6:6", + "referencedDeclaration": 3374, + "src": "11291:6:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10354,12 +10832,12 @@ }, { "argumentTypes": null, - "id": 3211, + "id": 3402, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "11120:12:6", + "referencedDeclaration": 3376, + "src": "11299:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10367,12 +10845,12 @@ }, { "argumentTypes": null, - "id": 3212, + "id": 3403, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3187, - "src": "11134:5:6", + "referencedDeclaration": 3378, + "src": "11313:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10396,32 +10874,32 @@ ], "expression": { "argumentTypes": null, - "id": 3208, + "id": 3399, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "11085:6:6", + "referencedDeclaration": 2794, + "src": "11264:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3209, + "id": 3400, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "11085:26:6", + "referencedDeclaration": 1189, + "src": "11264:26:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 3213, + "id": 3404, "isConstant": false, "isLValue": false, "isPure": false, @@ -10429,119 +10907,142 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11085:55:6", + "src": "11264:55:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11066:74:6" + "src": "11245:74:8" }, { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3220, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "id": 3411, + "name": "totalTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3384, + "src": "11364:11:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3217, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 3215, - "name": "voterTokens", + "id": 3408, + "name": "rewardPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3207, - "src": "11154:11:6", + "referencedDeclaration": 3391, + "src": "11348:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "id": 3216, - "name": "rewardPool", + "id": 3406, + "name": "voterTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3200, - "src": "11168:10:6", + "referencedDeclaration": 3398, + "src": "11332:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11154:24:6", + "id": 3407, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "11332:15:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 3409, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11332:27:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 3218, + }, + "id": 3410, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "11153:26:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "id": 3219, - "name": "totalTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3193, - "src": "11182:11:6", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "11332:31:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "11153:40:6", + "id": 3412, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11332:44:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3191, - "id": 3221, + "functionReturnParameters": 3382, + "id": 3413, "nodeType": "Return", - "src": "11146:47:6" + "src": "11325:51:8" } ] }, "documentation": "@dev Calculates the provided voter's token reward for the given poll.\n@param _voter The address of the voter whose reward balance is to be returned\n@param _challengeID The pollID of the challenge a reward balance is being queried for\n@param _salt The salt of the voter's commit hash in the given poll\n@return The uint indicating the voter's reward", - "id": 3223, + "id": 3415, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -10549,16 +11050,16 @@ "name": "voterReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3188, + "id": 3379, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3183, + "id": 3374, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10862:14:6", + "scope": 3415, + "src": "11041:14:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10566,10 +11067,10 @@ "typeString": "address" }, "typeName": { - "id": 3182, + "id": 3373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10862:7:6", + "src": "11041:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10580,11 +11081,11 @@ }, { "constant": false, - "id": 3185, + "id": 3376, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10878:17:6", + "scope": 3415, + "src": "11057:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10592,10 +11093,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3184, + "id": 3375, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10878:4:6", + "src": "11057:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10606,11 +11107,11 @@ }, { "constant": false, - "id": 3187, + "id": 3378, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10897:10:6", + "scope": 3415, + "src": "11076:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10618,10 +11119,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3186, + "id": 3377, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10897:4:6", + "src": "11076:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10631,20 +11132,20 @@ "visibility": "internal" } ], - "src": "10861:47:6" + "src": "11040:47:8" }, "payable": false, "returnParameters": { - "id": 3191, + "id": 3382, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3190, + "id": 3381, "name": "", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10932:4:6", + "scope": 3415, + "src": "11111:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10652,10 +11153,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3189, + "id": 3380, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10932:4:6", + "src": "11111:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10665,32 +11166,32 @@ "visibility": "internal" } ], - "src": "10931:6:6" + "src": "11110:6:8" }, - "scope": 3593, - "src": "10841:357:6", + "scope": 3797, + "src": "11020:361:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3270, + "id": 3462, "nodeType": "Block", - "src": "11436:629:6", + "src": "11619:629:8", "statements": [ { "assignments": [ - 3231 + 3423 ], "declarations": [ { "constant": false, - "id": 3231, + "id": 3423, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11442:16:6", + "scope": 3463, + "src": "11625:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10698,10 +11199,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3230, + "id": 3422, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11442:4:6", + "src": "11625:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10711,33 +11212,33 @@ "visibility": "internal" } ], - "id": 3236, + "id": 3428, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3232, + "id": 3424, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "11461:8:6", + "referencedDeclaration": 2790, + "src": "11644:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3234, + "id": 3426, "indexExpression": { "argumentTypes": null, - "id": 3233, + "id": 3425, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11470:12:6", + "referencedDeclaration": 3417, + "src": "11653:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10748,28 +11249,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11461:22:6", + "src": "11644:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3235, + "id": 3427, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "11461:34:6", + "referencedDeclaration": 2766, + "src": "11644:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11442:53:6" + "src": "11625:53:8" }, { "condition": { @@ -10778,7 +11279,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3263, + "id": 3455, "isConstant": false, "isLValue": false, "isPure": false, @@ -10789,7 +11290,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3251, + "id": 3443, "isConstant": false, "isLValue": false, "isPure": false, @@ -10800,7 +11301,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3246, + "id": 3438, "isConstant": false, "isLValue": false, "isPure": false, @@ -10810,12 +11311,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3238, + "id": 3430, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11768:12:6", + "referencedDeclaration": 3417, + "src": "11951:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10829,18 +11330,18 @@ "typeString": "bytes32" } ], - "id": 3237, + "id": 3429, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "11757:10:6", + "referencedDeclaration": 3491, + "src": "11940:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3239, + "id": 3431, "isConstant": false, "isLValue": false, "isPure": false, @@ -10848,7 +11349,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11757:24:6", + "src": "11940:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10862,7 +11363,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3245, + "id": 3437, "isConstant": false, "isLValue": false, "isPure": false, @@ -10873,26 +11374,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3240, + "id": 3432, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "11828:8:6", + "referencedDeclaration": 2790, + "src": "12011:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3242, + "id": 3434, "indexExpression": { "argumentTypes": null, - "id": 3241, + "id": 3433, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11837:12:6", + "referencedDeclaration": 3417, + "src": "12020:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10903,21 +11404,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11828:22:6", + "src": "12011:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3243, + "id": 3435, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "11828:40:6", + "referencedDeclaration": 2758, + "src": "12011:40:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10927,24 +11428,24 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 3244, + "id": 3436, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11871:3:6", + "referencedDeclaration": 4155, + "src": "12054:3:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11828:46:6", + "src": "12011:46:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11757:117:6", + "src": "11940:117:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10954,7 +11455,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 3250, + "id": 3442, "isConstant": false, "isLValue": false, "isPure": false, @@ -10962,18 +11463,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11921:28:6", + "src": "12104:28:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3248, + "id": 3440, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11936:12:6", + "referencedDeclaration": 3417, + "src": "12119:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10987,18 +11488,18 @@ "typeString": "bytes32" } ], - "id": 3247, + "id": 3439, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "11922:13:6", + "referencedDeclaration": 3476, + "src": "12105:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3249, + "id": 3441, "isConstant": false, "isLValue": false, "isPure": false, @@ -11006,7 +11507,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11922:27:6", + "src": "12105:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11017,7 +11518,7 @@ "typeString": "bool" } }, - "src": "11757:192:6", + "src": "11940:192:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11034,7 +11535,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3261, + "id": 3453, "isConstant": false, "isLValue": false, "isPure": false, @@ -11045,19 +11546,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3254, + "id": 3446, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3252, + "id": 3444, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3231, - "src": "11960:11:6", + "referencedDeclaration": 3423, + "src": "12143:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11068,14 +11569,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3253, + "id": 3445, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11975:1:6", + "src": "12158:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11083,7 +11584,7 @@ }, "value": "0" }, - "src": "11960:16:6", + "src": "12143:16:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11097,7 +11598,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3260, + "id": 3452, "isConstant": false, "isLValue": false, "isPure": false, @@ -11108,26 +11609,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3255, + "id": 3447, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "11980:10:6", + "referencedDeclaration": 2786, + "src": "12163:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3257, + "id": 3449, "indexExpression": { "argumentTypes": null, - "id": 3256, + "id": 3448, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3231, - "src": "11991:11:6", + "referencedDeclaration": 3423, + "src": "12174:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11138,21 +11639,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11980:23:6", + "src": "12163:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3258, + "id": 3450, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "11980:32:6", + "referencedDeclaration": 2773, + "src": "12163:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11163,14 +11664,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3259, + "id": 3451, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12016:4:6", + "src": "12199:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -11178,59 +11679,59 @@ }, "value": "true" }, - "src": "11980:40:6", + "src": "12163:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11960:60:6", + "src": "12143:60:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 3262, + "id": 3454, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11959:62:6", + "src": "12142:62:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11757:264:6", + "src": "11940:264:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3267, + "id": 3459, "nodeType": "IfStatement", - "src": "11709:333:6", + "src": "11892:333:8", "trueBody": { - "id": 3266, + "id": 3458, "nodeType": "Block", - "src": "12028:14:6", + "src": "12211:14:8", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3264, + "id": 3456, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12036:4:6", + "src": "12219:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -11238,10 +11739,10 @@ }, "value": "true" }, - "functionReturnParameters": 3229, - "id": 3265, + "functionReturnParameters": 3421, + "id": 3457, "nodeType": "Return", - "src": "12029:11:6" + "src": "12212:11:8" } ] } @@ -11250,14 +11751,14 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3268, + "id": 3460, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12055:5:6", + "src": "12238:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -11265,15 +11766,15 @@ }, "value": "false" }, - "functionReturnParameters": 3229, - "id": 3269, + "functionReturnParameters": 3421, + "id": 3461, "nodeType": "Return", - "src": "12048:12:6" + "src": "12231:12:8" } ] }, "documentation": "@dev Determines whether the given listingHash be whitelisted.\n@param _listingHash The listingHash whose status is to be examined", - "id": 3271, + "id": 3463, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11281,16 +11782,16 @@ "name": "canBeWhitelisted", "nodeType": "FunctionDefinition", "parameters": { - "id": 3226, + "id": 3418, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3225, + "id": 3417, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11387:20:6", + "scope": 3463, + "src": "11570:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11298,10 +11799,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3224, + "id": 3416, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11387:7:6", + "src": "11570:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11311,20 +11812,20 @@ "visibility": "internal" } ], - "src": "11386:22:6" + "src": "11569:22:8" }, "payable": false, "returnParameters": { - "id": 3229, + "id": 3421, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3228, + "id": 3420, "name": "", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11430:4:6", + "scope": 3463, + "src": "11613:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11332,10 +11833,10 @@ "typeString": "bool" }, "typeName": { - "id": 3227, + "id": 3419, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11430:4:6", + "src": "11613:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11345,19 +11846,19 @@ "visibility": "internal" } ], - "src": "11429:6:6" + "src": "11612:6:8" }, - "scope": 3593, - "src": "11361:704:6", + "scope": 3797, + "src": "11544:704:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3283, + "id": 3475, "nodeType": "Block", - "src": "12311:52:6", + "src": "12494:52:8", "statements": [ { "expression": { @@ -11366,26 +11867,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3278, + "id": 3470, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12324:8:6", + "referencedDeclaration": 2790, + "src": "12507:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3280, + "id": 3472, "indexExpression": { "argumentTypes": null, - "id": 3279, + "id": 3471, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, - "src": "12333:12:6", + "referencedDeclaration": 3465, + "src": "12516:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11396,35 +11897,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12324:22:6", + "src": "12507:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3281, + "id": 3473, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "12324:34:6", + "referencedDeclaration": 2760, + "src": "12507:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3277, - "id": 3282, + "functionReturnParameters": 3469, + "id": 3474, "nodeType": "Return", - "src": "12317:41:6" + "src": "12500:41:8" } ] }, "documentation": "@dev Returns true if the provided listingHash is whitelisted\n@param _listingHash The listingHash whose status is to be examined", - "id": 3284, + "id": 3476, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11432,16 +11933,16 @@ "name": "isWhitelisted", "nodeType": "FunctionDefinition", "parameters": { - "id": 3274, + "id": 3466, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3273, + "id": 3465, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3284, - "src": "12250:20:6", + "scope": 3476, + "src": "12433:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11449,10 +11950,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3272, + "id": 3464, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12250:7:6", + "src": "12433:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11462,20 +11963,20 @@ "visibility": "internal" } ], - "src": "12249:22:6" + "src": "12432:22:8" }, "payable": false, "returnParameters": { - "id": 3277, + "id": 3469, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3276, + "id": 3468, "name": "whitelisted", "nodeType": "VariableDeclaration", - "scope": 3284, - "src": "12293:16:6", + "scope": 3476, + "src": "12476:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11483,10 +11984,10 @@ "typeString": "bool" }, "typeName": { - "id": 3275, + "id": 3467, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12293:4:6", + "src": "12476:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11496,19 +11997,19 @@ "visibility": "internal" } ], - "src": "12292:18:6" + "src": "12475:18:8" }, - "scope": 3593, - "src": "12227:136:6", + "scope": 3797, + "src": "12410:136:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3298, + "id": 3490, "nodeType": "Block", - "src": "12599:62:6", + "src": "12782:62:8", "statements": [ { "expression": { @@ -11517,7 +12018,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3296, + "id": 3488, "isConstant": false, "isLValue": false, "isPure": false, @@ -11528,26 +12029,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3291, + "id": 3483, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12612:8:6", + "referencedDeclaration": 2790, + "src": "12795:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3293, + "id": 3485, "indexExpression": { "argumentTypes": null, - "id": 3292, + "id": 3484, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3286, - "src": "12621:12:6", + "referencedDeclaration": 3478, + "src": "12804:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11558,21 +12059,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12612:22:6", + "src": "12795:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3294, + "id": 3486, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "12612:40:6", + "referencedDeclaration": 2758, + "src": "12795:40:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11583,14 +12084,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3295, + "id": 3487, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12655:1:6", + "src": "12838:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11598,21 +12099,21 @@ }, "value": "0" }, - "src": "12612:44:6", + "src": "12795:44:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3290, - "id": 3297, + "functionReturnParameters": 3482, + "id": 3489, "nodeType": "Return", - "src": "12605:51:6" + "src": "12788:51:8" } ] }, "documentation": "@dev Returns true if apply was called for this listingHash\n@param _listingHash The listingHash whose status is to be examined", - "id": 3299, + "id": 3491, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11620,16 +12121,16 @@ "name": "appWasMade", "nodeType": "FunctionDefinition", "parameters": { - "id": 3287, + "id": 3479, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3286, + "id": 3478, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3299, - "src": "12543:20:6", + "scope": 3491, + "src": "12726:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11637,10 +12138,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3285, + "id": 3477, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12543:7:6", + "src": "12726:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11650,20 +12151,20 @@ "visibility": "internal" } ], - "src": "12542:22:6" + "src": "12725:22:8" }, "payable": false, "returnParameters": { - "id": 3290, + "id": 3482, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3289, + "id": 3481, "name": "exists", "nodeType": "VariableDeclaration", - "scope": 3299, - "src": "12586:11:6", + "scope": 3491, + "src": "12769:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11671,10 +12172,10 @@ "typeString": "bool" }, "typeName": { - "id": 3288, + "id": 3480, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12586:4:6", + "src": "12769:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11684,32 +12185,32 @@ "visibility": "internal" } ], - "src": "12585:13:6" + "src": "12768:13:8" }, - "scope": 3593, - "src": "12523:138:6", + "scope": 3797, + "src": "12706:138:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3327, + "id": 3519, "nodeType": "Block", - "src": "12913:155:6", + "src": "13096:155:8", "statements": [ { "assignments": [ - 3307 + 3499 ], "declarations": [ { "constant": false, - "id": 3307, + "id": 3499, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12919:16:6", + "scope": 3520, + "src": "13102:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11717,10 +12218,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3306, + "id": 3498, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12919:4:6", + "src": "13102:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11730,33 +12231,33 @@ "visibility": "internal" } ], - "id": 3312, + "id": 3504, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3308, + "id": 3500, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12938:8:6", + "referencedDeclaration": 2790, + "src": "13121:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3310, + "id": 3502, "indexExpression": { "argumentTypes": null, - "id": 3309, + "id": 3501, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3301, - "src": "12947:12:6", + "referencedDeclaration": 3493, + "src": "13130:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11767,28 +12268,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12938:22:6", + "src": "13121:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3311, + "id": 3503, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "12938:34:6", + "referencedDeclaration": 2766, + "src": "13121:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12919:53:6" + "src": "13102:53:8" }, { "expression": { @@ -11800,7 +12301,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3324, + "id": 3516, "isConstant": false, "isLValue": false, "isPure": false, @@ -11811,7 +12312,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3318, + "id": 3510, "isConstant": false, "isLValue": false, "isPure": false, @@ -11822,26 +12323,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3313, + "id": 3505, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12987:8:6", + "referencedDeclaration": 2790, + "src": "13170:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3315, + "id": 3507, "indexExpression": { "argumentTypes": null, - "id": 3314, + "id": 3506, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3301, - "src": "12996:12:6", + "referencedDeclaration": 3493, + "src": "13179:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11852,21 +12353,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12987:22:6", + "src": "13170:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3316, + "id": 3508, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "12987:34:6", + "referencedDeclaration": 2766, + "src": "13170:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11877,14 +12378,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3317, + "id": 3509, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "13024:1:6", + "src": "13207:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11892,7 +12393,7 @@ }, "value": "0" }, - "src": "12987:38:6", + "src": "13170:38:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11902,7 +12403,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 3323, + "id": 3515, "isConstant": false, "isLValue": false, "isPure": false, @@ -11910,33 +12411,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "13029:33:6", + "src": "13212:33:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3319, + "id": 3511, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "13030:10:6", + "referencedDeclaration": 2786, + "src": "13213:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3321, + "id": 3513, "indexExpression": { "argumentTypes": null, - "id": 3320, + "id": 3512, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, - "src": "13041:11:6", + "referencedDeclaration": 3499, + "src": "13224:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11947,21 +12448,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13030:23:6", + "src": "13213:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3322, + "id": 3514, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "13030:32:6", + "referencedDeclaration": 2773, + "src": "13213:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11972,35 +12473,35 @@ "typeString": "bool" } }, - "src": "12987:75:6", + "src": "13170:75:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 3325, + "id": 3517, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "12986:77:6", + "src": "13169:77:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3305, - "id": 3326, + "functionReturnParameters": 3497, + "id": 3518, "nodeType": "Return", - "src": "12979:84:6" + "src": "13162:84:8" } ] }, "documentation": "@dev Returns true if the application/listingHash has an unresolved challenge\n@param _listingHash The listingHash whose status is to be examined", - "id": 3328, + "id": 3520, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12008,16 +12509,16 @@ "name": "challengeExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 3302, + "id": 3494, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3301, + "id": 3493, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12864:20:6", + "scope": 3520, + "src": "13047:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12025,10 +12526,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3300, + "id": 3492, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12864:7:6", + "src": "13047:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12038,20 +12539,20 @@ "visibility": "internal" } ], - "src": "12863:22:6" + "src": "13046:22:8" }, "payable": false, "returnParameters": { - "id": 3305, + "id": 3497, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3304, + "id": 3496, "name": "", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12907:4:6", + "scope": 3520, + "src": "13090:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12059,10 +12560,10 @@ "typeString": "bool" }, "typeName": { - "id": 3303, + "id": 3495, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12907:4:6", + "src": "13090:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12072,32 +12573,32 @@ "visibility": "internal" } ], - "src": "12906:6:6" + "src": "13089:6:8" }, - "scope": 3593, - "src": "12839:229:6", + "scope": 3797, + "src": "13022:229:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3353, + "id": 3545, "nodeType": "Block", - "src": "13384:152:6", + "src": "13567:152:8", "statements": [ { "assignments": [ - 3336 + 3528 ], "declarations": [ { "constant": false, - "id": 3336, + "id": 3528, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13390:16:6", + "scope": 3546, + "src": "13573:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12105,10 +12606,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3335, + "id": 3527, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13390:4:6", + "src": "13573:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12118,33 +12619,33 @@ "visibility": "internal" } ], - "id": 3341, + "id": 3533, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3337, + "id": 3529, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "13409:8:6", + "referencedDeclaration": 2790, + "src": "13592:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3339, + "id": 3531, "indexExpression": { "argumentTypes": null, - "id": 3338, + "id": 3530, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3330, - "src": "13418:12:6", + "referencedDeclaration": 3522, + "src": "13601:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12155,28 +12656,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13409:22:6", + "src": "13592:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3340, + "id": 3532, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "13409:34:6", + "referencedDeclaration": 2766, + "src": "13592:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "13390:53:6" + "src": "13573:53:8" }, { "expression": { @@ -12187,12 +12688,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3344, + "id": 3536, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3330, - "src": "13474:12:6", + "referencedDeclaration": 3522, + "src": "13657:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12206,18 +12707,18 @@ "typeString": "bytes32" } ], - "id": 3343, + "id": 3535, "name": "challengeExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3328, - "src": "13458:15:6", + "referencedDeclaration": 3520, + "src": "13641:15:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3345, + "id": 3537, "isConstant": false, "isLValue": false, "isPure": false, @@ -12225,7 +12726,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13458:29:6", + "src": "13641:29:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12239,21 +12740,21 @@ "typeString": "bool" } ], - "id": 3342, + "id": 3534, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "13450:7:6", + "referencedDeclaration": 4156, + "src": "13633:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3346, + "id": 3538, "isConstant": false, "isLValue": false, "isPure": false, @@ -12261,15 +12762,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13450:38:6", + "src": "13633:38:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3347, + "id": 3539, "nodeType": "ExpressionStatement", - "src": "13450:38:6" + "src": "13633:38:8" }, { "expression": { @@ -12277,12 +12778,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3350, + "id": 3542, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3336, - "src": "13519:11:6", + "referencedDeclaration": 3528, + "src": "13702:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12298,32 +12799,32 @@ ], "expression": { "argumentTypes": null, - "id": 3348, + "id": 3540, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13502:6:6", + "referencedDeclaration": 2794, + "src": "13685:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3349, + "id": 3541, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "13502:16:6", + "referencedDeclaration": 1334, + "src": "13685:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3351, + "id": 3543, "isConstant": false, "isLValue": false, "isPure": false, @@ -12331,21 +12832,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13502:29:6", + "src": "13685:29:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3334, - "id": 3352, + "functionReturnParameters": 3526, + "id": 3544, "nodeType": "Return", - "src": "13495:36:6" + "src": "13678:36:8" } ] }, "documentation": "@dev Determines whether voting has concluded in a challenge for a given\nlistingHash. Throws if no challenge exists.\n@param _listingHash A listingHash with an unresolved challenge", - "id": 3354, + "id": 3546, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -12353,16 +12854,16 @@ "name": "challengeCanBeResolved", "nodeType": "FunctionDefinition", "parameters": { - "id": 3331, + "id": 3523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3330, + "id": 3522, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13335:20:6", + "scope": 3546, + "src": "13518:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12370,10 +12871,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3329, + "id": 3521, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13335:7:6", + "src": "13518:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12383,20 +12884,20 @@ "visibility": "internal" } ], - "src": "13334:22:6" + "src": "13517:22:8" }, "payable": false, "returnParameters": { - "id": 3334, + "id": 3526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3333, + "id": 3525, "name": "", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13378:4:6", + "scope": 3546, + "src": "13561:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12404,10 +12905,10 @@ "typeString": "bool" }, "typeName": { - "id": 3332, + "id": 3524, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13378:4:6", + "src": "13561:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12417,19 +12918,19 @@ "visibility": "internal" } ], - "src": "13377:6:6" + "src": "13560:6:8" }, - "scope": 3593, - "src": "13303:233:6", + "scope": 3797, + "src": "13486:233:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3402, + "id": 3600, "nodeType": "Block", - "src": "13785:375:6", + "src": "13968:394:8", "statements": [ { "expression": { @@ -12441,14 +12942,14 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3371, + "id": 3563, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3366, + "id": 3558, "isConstant": false, "isLValue": false, "isPure": false, @@ -12456,33 +12957,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "13799:34:6", + "src": "13982:34:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3362, + "id": 3554, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "13800:10:6", + "referencedDeclaration": 2786, + "src": "13983:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3364, + "id": 3556, "indexExpression": { "argumentTypes": null, - "id": 3363, + "id": 3555, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13811:12:6", + "referencedDeclaration": 3548, + "src": "13994:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12493,21 +12994,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13800:24:6", + "src": "13983:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3365, + "id": 3557, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "13800:33:6", + "referencedDeclaration": 2773, + "src": "13983:33:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12525,12 +13026,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3369, + "id": 3561, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13854:12:6", + "referencedDeclaration": 3548, + "src": "14037:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12546,32 +13047,32 @@ ], "expression": { "argumentTypes": null, - "id": 3367, + "id": 3559, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13837:6:6", + "referencedDeclaration": 2794, + "src": "14020:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3368, + "id": 3560, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "13837:16:6", + "referencedDeclaration": 1334, + "src": "14020:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3370, + "id": 3562, "isConstant": false, "isLValue": false, "isPure": false, @@ -12579,13 +13080,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13837:30:6", + "src": "14020:30:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "13799:68:6", + "src": "13982:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12599,21 +13100,21 @@ "typeString": "bool" } ], - "id": 3361, + "id": 3553, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "13791:7:6", + "referencedDeclaration": 4156, + "src": "13974:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3372, + "id": 3564, "isConstant": false, "isLValue": false, "isPure": false, @@ -12621,15 +13122,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13791:77:6", + "src": "13974:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3373, + "id": 3565, "nodeType": "ExpressionStatement", - "src": "13791:77:6" + "src": "13974:77:8" }, { "condition": { @@ -12638,7 +13139,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3379, + "id": 3571, "isConstant": false, "isLValue": false, "isPure": false, @@ -12648,12 +13149,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3376, + "id": 3568, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13992:12:6", + "referencedDeclaration": 3548, + "src": "14175:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12669,32 +13170,32 @@ ], "expression": { "argumentTypes": null, - "id": 3374, + "id": 3566, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13946:6:6", + "referencedDeclaration": 2794, + "src": "14129:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3375, + "id": 3567, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "13946:45:6", + "referencedDeclaration": 1313, + "src": "14129:45:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 3377, + "id": 3569, "isConstant": false, "isLValue": false, "isPure": false, @@ -12702,7 +13203,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13946:59:6", + "src": "14129:59:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12713,14 +13214,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3378, + "id": 3570, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14009:1:6", + "src": "14192:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12728,195 +13229,278 @@ }, "value": "0" }, - "src": "13946:64:6", + "src": "14129:64:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3388, + "id": 3583, "nodeType": "IfStatement", - "src": "13942:126:6", + "src": "14125:135:8", "trueBody": { - "id": 3387, + "id": 3582, "nodeType": "Block", - "src": "14012:56:6", + "src": "14195:65:8", "statements": [ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3385, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "32", - "id": 3380, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "14027:1:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 3381, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14031:10:6", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", - "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" - } - }, - "id": 3383, - "indexExpression": { + "expression": { "argumentTypes": null, - "id": 3382, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14042:12:6", + "baseExpression": { + "argumentTypes": null, + "id": 3576, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "14222:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3578, + "indexExpression": { + "argumentTypes": null, + "id": 3577, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3548, + "src": "14233:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "14222:24:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" } }, + "id": 3579, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "14031:24:6", + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 2775, + "src": "14222:30:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", - "typeString": "struct Registry.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "id": 3384, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "stake", - "nodeType": "MemberAccess", - "referencedDeclaration": 2612, - "src": "14031:30:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "32", + "id": 3573, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "14215:1:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + } + ], + "id": 3572, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "14210:4:8", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" + }, + "id": 3574, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14210:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3575, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "14210:11:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "14027:34:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "functionReturnParameters": 3360, - "id": 3386, - "nodeType": "Return", - "src": "14020:41:6" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3400, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3394, + "id": 3580, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "leftExpression": { + "names": [], + "nodeType": "FunctionCall", + "src": "14210:43:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "functionReturnParameters": 3552, + "id": 3581, + "nodeType": "Return", + "src": "14203:50:8" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { "argumentTypes": null, - "hexValue": "32", - "id": 3389, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "14082:1:6", - "subdenomination": null, + "id": 3594, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "14321:10:8", "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + "id": 3596, + "indexExpression": { + "argumentTypes": null, + "id": 3595, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3548, + "src": "14332:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "14321:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3597, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 2769, + "src": "14321:35:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3390, + "id": 3588, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14086:10:6", + "referencedDeclaration": 2786, + "src": "14285:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3392, + "id": 3590, "indexExpression": { "argumentTypes": null, - "id": 3391, + "id": 3589, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14097:12:6", + "referencedDeclaration": 3548, + "src": "14296:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12927,119 +13511,155 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14086:24:6", + "src": "14285:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3393, + "id": 3591, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "stake", "nodeType": "MemberAccess", - "referencedDeclaration": 2612, - "src": "14086:30:6", + "referencedDeclaration": 2775, + "src": "14285:30:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "src": "14082:34:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "id": 3395, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "14081:36:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 3396, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14120:10:6", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", - "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } - }, - "id": 3398, - "indexExpression": { - "argumentTypes": null, - "id": 3397, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14131:12:6", + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "32", + "id": 3585, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "14278:1:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + } + ], + "id": 3584, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "14273:4:8", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" + }, + "id": 3586, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14273:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3587, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "14273:11:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, + "id": 3592, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "14120:24:6", + "names": [], + "nodeType": "FunctionCall", + "src": "14273:43:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", - "typeString": "struct Registry.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 3399, + "id": 3593, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "rewardPool", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "14120:35:6", + "referencedDeclaration": 3866, + "src": "14273:47:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "14081:74:6", + "id": 3598, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14273:84:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3360, - "id": 3401, + "functionReturnParameters": 3552, + "id": 3599, "nodeType": "Return", - "src": "14074:81:6" + "src": "14266:91:8" } ] }, "documentation": "@dev Determines the number of tokens awarded to the winning party in a challenge.\n@param _challengeID The challengeID to determine a reward for", - "id": 3403, + "id": 3601, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -13047,16 +13667,16 @@ "name": "determineReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3357, + "id": 3549, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3356, + "id": 3548, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3403, - "src": "13739:17:6", + "scope": 3601, + "src": "13922:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13064,10 +13684,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3355, + "id": 3547, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13739:4:6", + "src": "13922:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13077,20 +13697,20 @@ "visibility": "internal" } ], - "src": "13738:19:6" + "src": "13921:19:8" }, "payable": false, "returnParameters": { - "id": 3360, + "id": 3552, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3359, + "id": 3551, "name": "", "nodeType": "VariableDeclaration", - "scope": 3403, - "src": "13779:4:6", + "scope": 3601, + "src": "13962:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13098,10 +13718,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3358, + "id": 3550, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13779:4:6", + "src": "13962:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13111,19 +13731,19 @@ "visibility": "internal" } ], - "src": "13778:6:6" + "src": "13961:6:8" }, - "scope": 3593, - "src": "13714:446:6", + "scope": 3797, + "src": "13897:465:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3419, + "id": 3617, "nodeType": "Block", - "src": "14458:62:6", + "src": "14660:62:8", "statements": [ { "expression": { @@ -13134,26 +13754,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3412, + "id": 3610, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14471:10:6", + "referencedDeclaration": 2786, + "src": "14673:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3414, + "id": 3612, "indexExpression": { "argumentTypes": null, - "id": 3413, + "id": 3611, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3405, - "src": "14482:12:6", + "referencedDeclaration": 3603, + "src": "14684:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13164,35 +13784,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14471:24:6", + "src": "14673:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3415, + "id": 3613, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "14471:36:6", + "referencedDeclaration": 2781, + "src": "14673:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3417, + "id": 3615, "indexExpression": { "argumentTypes": null, - "id": 3416, + "id": 3614, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3407, - "src": "14508:6:6", + "referencedDeclaration": 3605, + "src": "14710:6:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13203,21 +13823,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14471:44:6", + "src": "14673:44:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3411, - "id": 3418, + "functionReturnParameters": 3609, + "id": 3616, "nodeType": "Return", - "src": "14464:51:6" + "src": "14666:51:8" } ] }, "documentation": "@dev Getter for Challenge tokenClaims mappings\n@param _challengeID The challengeID to query\n@param _voter The voter whose claim status to query for the provided challengeID", - "id": 3420, + "id": 3618, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -13225,16 +13845,16 @@ "name": "tokenClaims", "nodeType": "FunctionDefinition", "parameters": { - "id": 3408, + "id": 3606, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3405, + "id": 3603, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14396:17:6", + "scope": 3618, + "src": "14598:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13242,10 +13862,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3404, + "id": 3602, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14396:4:6", + "src": "14598:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13256,11 +13876,11 @@ }, { "constant": false, - "id": 3407, + "id": 3605, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14415:14:6", + "scope": 3618, + "src": "14617:14:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13268,10 +13888,10 @@ "typeString": "address" }, "typeName": { - "id": 3406, + "id": 3604, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14415:7:6", + "src": "14617:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13281,20 +13901,20 @@ "visibility": "internal" } ], - "src": "14395:35:6" + "src": "14597:35:8" }, "payable": false, "returnParameters": { - "id": 3411, + "id": 3609, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3410, + "id": 3608, "name": "", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14452:4:6", + "scope": 3618, + "src": "14654:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13302,10 +13922,10 @@ "typeString": "bool" }, "typeName": { - "id": 3409, + "id": 3607, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "14452:4:6", + "src": "14654:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13315,32 +13935,32 @@ "visibility": "internal" } ], - "src": "14451:6:6" + "src": "14653:6:8" }, - "scope": 3593, - "src": "14375:145:6", + "scope": 3797, + "src": "14577:145:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3514, + "id": 3718, "nodeType": "Block", - "src": "14900:1308:6", + "src": "15102:1351:8", "statements": [ { "assignments": [ - 3426 + 3624 ], "declarations": [ { "constant": false, - "id": 3426, + "id": 3624, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "14906:16:6", + "scope": 3719, + "src": "15108:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13348,10 +13968,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3425, + "id": 3623, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14906:4:6", + "src": "15108:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13361,33 +13981,33 @@ "visibility": "internal" } ], - "id": 3431, + "id": 3629, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3427, + "id": 3625, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "14925:8:6", + "referencedDeclaration": 2790, + "src": "15127:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3429, + "id": 3627, "indexExpression": { "argumentTypes": null, - "id": 3428, + "id": 3626, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "14934:12:6", + "referencedDeclaration": 3620, + "src": "15136:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13398,41 +14018,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14925:22:6", + "src": "15127:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3430, + "id": 3628, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "14925:34:6", + "referencedDeclaration": 2766, + "src": "15127:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "14906:53:6" + "src": "15108:53:8" }, { "assignments": [ - 3433 + 3631 ], "declarations": [ { "constant": false, - "id": 3433, + "id": 3631, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "15080:11:6", + "scope": 3719, + "src": "15282:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13440,10 +14060,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3432, + "id": 3630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15080:4:6", + "src": "15282:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13453,18 +14073,18 @@ "visibility": "internal" } ], - "id": 3437, + "id": 3635, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3435, + "id": 3633, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15110:11:6", + "referencedDeclaration": 3624, + "src": "15312:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13478,18 +14098,18 @@ "typeString": "uint256" } ], - "id": 3434, + "id": 3632, "name": "determineReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3403, - "src": "15094:15:6", + "referencedDeclaration": 3601, + "src": "15296:15:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view returns (uint256)" } }, - "id": 3436, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, @@ -13497,19 +14117,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15094:28:6", + "src": "15296:28:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15080:42:6" + "src": "15282:42:8" }, { "expression": { "argumentTypes": null, - "id": 3443, + "id": 3641, "isConstant": false, "isLValue": false, "isPure": false, @@ -13520,26 +14140,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3438, + "id": 3636, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15175:10:6", + "referencedDeclaration": 2786, + "src": "15377:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3440, + "id": 3638, "indexExpression": { "argumentTypes": null, - "id": 3439, + "id": 3637, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15186:11:6", + "referencedDeclaration": 3624, + "src": "15388:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13550,21 +14170,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15175:23:6", + "src": "15377:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3441, + "id": 3639, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "15175:32:6", + "referencedDeclaration": 2773, + "src": "15377:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13575,14 +14195,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3442, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15210:4:6", + "src": "15412:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -13590,20 +14210,20 @@ }, "value": "true" }, - "src": "15175:39:6", + "src": "15377:39:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3444, + "id": 3642, "nodeType": "ExpressionStatement", - "src": "15175:39:6" + "src": "15377:39:8" }, { "expression": { "argumentTypes": null, - "id": 3453, + "id": 3651, "isConstant": false, "isLValue": false, "isPure": false, @@ -13614,26 +14234,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3445, + "id": 3643, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15308:10:6", + "referencedDeclaration": 2786, + "src": "15510:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3447, + "id": 3645, "indexExpression": { "argumentTypes": null, - "id": 3446, + "id": 3644, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15319:11:6", + "referencedDeclaration": 3624, + "src": "15521:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13644,21 +14264,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15308:23:6", + "src": "15510:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3448, + "id": 3646, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "15308:35:6", + "referencedDeclaration": 2777, + "src": "15510:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13671,12 +14291,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3451, + "id": 3649, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15392:11:6", + "referencedDeclaration": 3624, + "src": "15594:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13692,32 +14312,32 @@ ], "expression": { "argumentTypes": null, - "id": 3449, + "id": 3647, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "15346:6:6", + "referencedDeclaration": 2794, + "src": "15548:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3450, + "id": 3648, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "15346:45:6", + "referencedDeclaration": 1313, + "src": "15548:45:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 3452, + "id": 3650, "isConstant": false, "isLValue": false, "isPure": false, @@ -13725,21 +14345,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15346:58:6", + "src": "15548:58:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15308:96:6", + "src": "15510:96:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3454, + "id": 3652, "nodeType": "ExpressionStatement", - "src": "15308:96:6" + "src": "15510:96:8" }, { "condition": { @@ -13747,12 +14367,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3457, + "id": 3655, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15461:11:6", + "referencedDeclaration": 3624, + "src": "15663:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13768,32 +14388,32 @@ ], "expression": { "argumentTypes": null, - "id": 3455, + "id": 3653, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "15445:6:6", + "referencedDeclaration": 2794, + "src": "15647:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3456, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "isPassed", "nodeType": "MemberAccess", - "referencedDeclaration": 1138, - "src": "15445:15:6", + "referencedDeclaration": 1285, + "src": "15647:15:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3458, + "id": 3656, "isConstant": false, "isLValue": false, "isPure": false, @@ -13801,16 +14421,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15445:28:6", + "src": "15647:28:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3512, + "id": 3716, "nodeType": "Block", - "src": "15823:381:6", + "src": "16068:381:8", "statements": [ { "expression": { @@ -13818,12 +14438,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3485, + "id": 3689, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15889:12:6", + "referencedDeclaration": 3620, + "src": "16134:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13837,18 +14457,18 @@ "typeString": "bytes32" } ], - "id": 3484, + "id": 3688, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "15876:12:6", + "referencedDeclaration": 3796, + "src": "16121:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3486, + "id": 3690, "isConstant": false, "isLValue": false, "isPure": false, @@ -13856,15 +14476,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15876:26:6", + "src": "16121:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3487, + "id": 3691, "nodeType": "ExpressionStatement", - "src": "15876:26:6" + "src": "16121:26:8" }, { "expression": { @@ -13879,26 +14499,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3491, + "id": 3695, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15980:10:6", + "referencedDeclaration": 2786, + "src": "16225:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3493, + "id": 3697, "indexExpression": { "argumentTypes": null, - "id": 3492, + "id": 3696, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15991:11:6", + "referencedDeclaration": 3624, + "src": "16236:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13909,21 +14529,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15980:23:6", + "src": "16225:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3494, + "id": 3698, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challenger", "nodeType": "MemberAccess", - "referencedDeclaration": 2608, - "src": "15980:34:6", + "referencedDeclaration": 2771, + "src": "16225:34:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13931,12 +14551,12 @@ }, { "argumentTypes": null, - "id": 3495, + "id": 3699, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3433, - "src": "16016:6:6", + "referencedDeclaration": 3631, + "src": "16261:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13956,32 +14576,32 @@ ], "expression": { "argumentTypes": null, - "id": 3489, + "id": 3693, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "15965:5:6", + "referencedDeclaration": 2792, + "src": "16210:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3490, + "id": 3694, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "15965:14:6", + "referencedDeclaration": 551, + "src": "16210:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3496, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -13989,7 +14609,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15965:58:6", + "src": "16210:58:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14003,21 +14623,21 @@ "typeString": "bool" } ], - "id": 3488, + "id": 3692, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "15957:7:6", + "referencedDeclaration": 4156, + "src": "16202:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3497, + "id": 3701, "isConstant": false, "isLValue": false, "isPure": false, @@ -14025,15 +14645,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15957:67:6", + "src": "16202:67:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3498, + "id": 3702, "nodeType": "ExpressionStatement", - "src": "15957:67:6" + "src": "16202:67:8" }, { "eventCall": { @@ -14041,12 +14661,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3500, + "id": 3704, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "16067:12:6", + "referencedDeclaration": 3620, + "src": "16312:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14054,12 +14674,12 @@ }, { "argumentTypes": null, - "id": 3501, + "id": 3705, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16089:11:6", + "referencedDeclaration": 3624, + "src": "16334:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14071,26 +14691,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3502, + "id": 3706, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "16110:10:6", + "referencedDeclaration": 2786, + "src": "16355:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3504, + "id": 3708, "indexExpression": { "argumentTypes": null, - "id": 3503, + "id": 3707, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16121:11:6", + "referencedDeclaration": 3624, + "src": "16366:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14101,21 +14721,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16110:23:6", + "src": "16355:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3505, + "id": 3709, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "16110:34:6", + "referencedDeclaration": 2769, + "src": "16355:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14127,26 +14747,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3506, + "id": 3710, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "16154:10:6", + "referencedDeclaration": 2786, + "src": "16399:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3508, + "id": 3712, "indexExpression": { "argumentTypes": null, - "id": 3507, + "id": 3711, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16165:11:6", + "referencedDeclaration": 3624, + "src": "16410:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14157,21 +14777,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16154:23:6", + "src": "16399:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3509, + "id": 3713, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "16154:35:6", + "referencedDeclaration": 2777, + "src": "16399:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14197,18 +14817,18 @@ "typeString": "uint256" } ], - "id": 3499, + "id": 3703, "name": "_ChallengeSucceeded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2582, - "src": "16038:19:6", + "referencedDeclaration": 2745, + "src": "16283:19:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 3510, + "id": 3714, "isConstant": false, "isLValue": false, "isPure": false, @@ -14216,25 +14836,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16038:159:6", + "src": "16283:159:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3511, + "id": 3715, "nodeType": "EmitStatement", - "src": "16033:164:6" + "src": "16278:164:8" } ] }, - "id": 3513, + "id": 3717, "nodeType": "IfStatement", - "src": "15441:763:6", + "src": "15643:806:8", "trueBody": { - "id": 3483, + "id": 3687, "nodeType": "Block", - "src": "15475:342:6", + "src": "15677:385:8", "statements": [ { "expression": { @@ -14242,12 +14862,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3460, + "id": 3658, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15504:12:6", + "referencedDeclaration": 3620, + "src": "15706:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14261,18 +14881,18 @@ "typeString": "bytes32" } ], - "id": 3459, + "id": 3657, "name": "whitelistApplication", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3539, - "src": "15483:20:6", + "referencedDeclaration": 3743, + "src": "15685:20:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3461, + "id": 3659, "isConstant": false, "isLValue": false, "isPure": false, @@ -14280,20 +14900,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15483:34:6", + "src": "15685:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3462, + "id": 3660, "nodeType": "ExpressionStatement", - "src": "15483:34:6" + "src": "15685:34:8" }, { "expression": { "argumentTypes": null, - "id": 3468, + "id": 3672, "isConstant": false, "isLValue": false, "isPure": false, @@ -14304,26 +14924,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3463, + "id": 3661, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "15592:8:6", + "referencedDeclaration": 2790, + "src": "15794:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3465, + "id": 3663, "indexExpression": { "argumentTypes": null, - "id": 3464, + "id": 3662, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15601:12:6", + "referencedDeclaration": 3620, + "src": "15803:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14334,50 +14954,145 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15592:22:6", + "src": "15794:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3466, + "id": 3664, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "15592:38:6", + "referencedDeclaration": 2764, + "src": "15794:38:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3467, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3433, - "src": "15634:6:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "15592:48:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3670, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3631, + "src": "15878:6:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3665, + "name": "listings", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2790, + "src": "15835:8:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", + "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" + } + }, + "id": 3667, + "indexExpression": { + "argumentTypes": null, + "id": 3666, + "name": "_listingHash", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3620, + "src": "15844:12:8", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "15835:22:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage", + "typeString": "struct Registry.Listing storage ref" + } + }, + "id": 3668, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "15835:38:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3669, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "15835:42:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3671, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "15835:50:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "15794:91:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3469, + "id": 3673, "nodeType": "ExpressionStatement", - "src": "15592:48:6" + "src": "15794:91:8" }, { "eventCall": { @@ -14385,12 +15100,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3471, + "id": 3675, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15680:12:6", + "referencedDeclaration": 3620, + "src": "15925:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14398,12 +15113,12 @@ }, { "argumentTypes": null, - "id": 3472, + "id": 3676, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15702:11:6", + "referencedDeclaration": 3624, + "src": "15947:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14415,26 +15130,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3473, + "id": 3677, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15723:10:6", + "referencedDeclaration": 2786, + "src": "15968:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3475, + "id": 3679, "indexExpression": { "argumentTypes": null, - "id": 3474, + "id": 3678, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15734:11:6", + "referencedDeclaration": 3624, + "src": "15979:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14445,21 +15160,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15723:23:6", + "src": "15968:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3476, + "id": 3680, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "15723:34:6", + "referencedDeclaration": 2769, + "src": "15968:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14471,26 +15186,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3477, + "id": 3681, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15767:10:6", + "referencedDeclaration": 2786, + "src": "16012:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3479, + "id": 3683, "indexExpression": { "argumentTypes": null, - "id": 3478, + "id": 3682, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15778:11:6", + "referencedDeclaration": 3624, + "src": "16023:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14501,21 +15216,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15767:23:6", + "src": "16012:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3480, + "id": 3684, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "15767:35:6", + "referencedDeclaration": 2777, + "src": "16012:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14541,18 +15256,18 @@ "typeString": "uint256" } ], - "id": 3470, + "id": 3674, "name": "_ChallengeFailed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2572, - "src": "15654:16:6", + "referencedDeclaration": 2735, + "src": "15899:16:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 3481, + "id": 3685, "isConstant": false, "isLValue": false, "isPure": false, @@ -14560,15 +15275,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15654:156:6", + "src": "15899:156:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3482, + "id": 3686, "nodeType": "EmitStatement", - "src": "15649:161:6" + "src": "15894:161:8" } ] } @@ -14576,7 +15291,7 @@ ] }, "documentation": "@dev Determines the winner in a challenge. Rewards the winner tokens and\neither whitelists or de-whitelists the listingHash.\n@param _listingHash A listingHash with a challenge that is to be resolved", - "id": 3515, + "id": 3719, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -14584,16 +15299,16 @@ "name": "resolveChallenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 3423, + "id": 3621, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3422, + "id": 3620, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "14870:20:6", + "scope": 3719, + "src": "15072:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14601,10 +15316,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3421, + "id": 3619, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14870:7:6", + "src": "15072:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14614,31 +15329,31 @@ "visibility": "internal" } ], - "src": "14869:22:6" + "src": "15071:22:8" }, "payable": false, "returnParameters": { - "id": 3424, + "id": 3622, "nodeType": "ParameterList", "parameters": [], - "src": "14900:0:6" + "src": "15102:0:8" }, - "scope": 3593, - "src": "14844:1364:6", + "scope": 3797, + "src": "15046:1407:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 3538, + "id": 3742, "nodeType": "Block", - "src": "16602:143:6", + "src": "16847:143:8", "statements": [ { "condition": { "argumentTypes": null, - "id": 3524, + "id": 3728, "isConstant": false, "isLValue": false, "isPure": false, @@ -14646,33 +15361,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "16612:35:6", + "src": "16857:35:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3520, + "id": 3724, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16613:8:6", + "referencedDeclaration": 2790, + "src": "16858:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3522, + "id": 3726, "indexExpression": { "argumentTypes": null, - "id": 3521, + "id": 3725, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16622:12:6", + "referencedDeclaration": 3721, + "src": "16867:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14683,21 +15398,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16613:22:6", + "src": "16858:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3523, + "id": 3727, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "16613:34:6", + "referencedDeclaration": 2760, + "src": "16858:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14709,13 +15424,13 @@ } }, "falseBody": null, - "id": 3530, + "id": 3734, "nodeType": "IfStatement", - "src": "16608:86:6", + "src": "16853:86:8", "trueBody": { - "id": 3529, + "id": 3733, "nodeType": "Block", - "src": "16649:45:6", + "src": "16894:45:8", "statements": [ { "eventCall": { @@ -14723,12 +15438,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3526, + "id": 3730, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16679:12:6", + "referencedDeclaration": 3721, + "src": "16924:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14742,18 +15457,18 @@ "typeString": "bytes32" } ], - "id": 3525, + "id": 3729, "name": "_ApplicationWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "16655:23:6", + "referencedDeclaration": 2709, + "src": "16900:23:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3527, + "id": 3731, "isConstant": false, "isLValue": false, "isPure": false, @@ -14761,15 +15476,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16655:37:6", + "src": "16900:37:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3528, + "id": 3732, "nodeType": "EmitStatement", - "src": "16650:42:6" + "src": "16895:42:8" } ] } @@ -14777,7 +15492,7 @@ { "expression": { "argumentTypes": null, - "id": 3536, + "id": 3740, "isConstant": false, "isLValue": false, "isPure": false, @@ -14788,26 +15503,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3531, + "id": 3735, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16699:8:6", + "referencedDeclaration": 2790, + "src": "16944:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3533, + "id": 3737, "indexExpression": { "argumentTypes": null, - "id": 3532, + "id": 3736, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16708:12:6", + "referencedDeclaration": 3721, + "src": "16953:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14818,21 +15533,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16699:22:6", + "src": "16944:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3534, + "id": 3738, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "16699:34:6", + "referencedDeclaration": 2760, + "src": "16944:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14843,14 +15558,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3535, + "id": 3739, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16736:4:6", + "src": "16981:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -14858,20 +15573,20 @@ }, "value": "true" }, - "src": "16699:41:6", + "src": "16944:41:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3537, + "id": 3741, "nodeType": "ExpressionStatement", - "src": "16699:41:6" + "src": "16944:41:8" } ] }, "documentation": "@dev Called by updateStatus() if the applicationExpiry date passed without a\nchallenge being made. Called by resolveChallenge() if an\napplication/listing beat a challenge.\n@param _listingHash The listingHash of an application/listingHash to be whitelisted", - "id": 3539, + "id": 3743, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -14879,16 +15594,16 @@ "name": "whitelistApplication", "nodeType": "FunctionDefinition", "parameters": { - "id": 3518, + "id": 3722, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3517, + "id": 3721, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3539, - "src": "16572:20:6", + "scope": 3743, + "src": "16817:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14896,10 +15611,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3516, + "id": 3720, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16572:7:6", + "src": "16817:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14909,54 +15624,54 @@ "visibility": "internal" } ], - "src": "16571:22:6" + "src": "16816:22:8" }, "payable": false, "returnParameters": { - "id": 3519, + "id": 3723, "nodeType": "ParameterList", "parameters": [], - "src": "16602:0:6" + "src": "16847:0:8" }, - "scope": 3593, - "src": "16542:203:6", + "scope": 3797, + "src": "16787:203:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 3591, + "id": 3795, "nodeType": "Block", - "src": "16959:589:6", + "src": "17204:589:8", "statements": [ { "assignments": [ - 3545 + 3749 ], "declarations": [ { "constant": false, - "id": 3545, + "id": 3749, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "16965:23:6", + "scope": 3796, + "src": "17210:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 3544, + "id": 3748, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "16965:7:6", + "referencedDeclaration": 2767, + "src": "17210:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -14964,31 +15679,31 @@ "visibility": "internal" } ], - "id": 3549, + "id": 3753, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3546, + "id": 3750, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16991:8:6", + "referencedDeclaration": 2790, + "src": "17236:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3548, + "id": 3752, "indexExpression": { "argumentTypes": null, - "id": 3547, + "id": 3751, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17000:12:6", + "referencedDeclaration": 3745, + "src": "17245:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14999,49 +15714,49 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16991:22:6", + "src": "17236:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "16965:48:6" + "src": "17210:48:8" }, { "condition": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3550, + "id": 3754, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17099:7:6", + "referencedDeclaration": 3749, + "src": "17344:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3551, + "id": 3755, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "17099:19:6", + "referencedDeclaration": 2760, + "src": "17344:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3561, + "id": 3765, "nodeType": "Block", - "src": "17175:53:6", + "src": "17420:53:8", "statements": [ { "eventCall": { @@ -15049,12 +15764,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3762, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17208:12:6", + "referencedDeclaration": 3745, + "src": "17453:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15068,18 +15783,18 @@ "typeString": "bytes32" } ], - "id": 3557, + "id": 3761, "name": "_ApplicationRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2550, - "src": "17188:19:6", + "referencedDeclaration": 2713, + "src": "17433:19:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3559, + "id": 3763, "isConstant": false, "isLValue": false, "isPure": false, @@ -15087,25 +15802,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17188:33:6", + "src": "17433:33:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3560, + "id": 3764, "nodeType": "EmitStatement", - "src": "17183:38:6" + "src": "17428:38:8" } ] }, - "id": 3562, + "id": 3766, "nodeType": "IfStatement", - "src": "17095:133:6", + "src": "17340:133:8", "trueBody": { - "id": 3556, + "id": 3760, "nodeType": "Block", - "src": "17120:49:6", + "src": "17365:49:8", "statements": [ { "eventCall": { @@ -15113,12 +15828,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3553, + "id": 3757, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17149:12:6", + "referencedDeclaration": 3745, + "src": "17394:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15132,18 +15847,18 @@ "typeString": "bytes32" } ], - "id": 3552, + "id": 3756, "name": "_ListingRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2554, - "src": "17133:15:6", + "referencedDeclaration": 2717, + "src": "17378:15:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3554, + "id": 3758, "isConstant": false, "isLValue": false, "isPure": false, @@ -15151,31 +15866,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17133:29:6", + "src": "17378:29:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3555, + "id": 3759, "nodeType": "EmitStatement", - "src": "17128:34:6" + "src": "17373:34:8" } ] } }, { "assignments": [ - 3564 + 3768 ], "declarations": [ { "constant": false, - "id": 3564, + "id": 3768, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "17277:13:6", + "scope": 3796, + "src": "17522:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15183,10 +15898,10 @@ "typeString": "address" }, "typeName": { - "id": 3563, + "id": 3767, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17277:7:6", + "src": "17522:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15196,51 +15911,51 @@ "visibility": "internal" } ], - "id": 3567, + "id": 3771, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3565, + "id": 3769, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17293:7:6", + "referencedDeclaration": 3749, + "src": "17538:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3566, + "id": 3770, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "17293:13:6", + "referencedDeclaration": 2762, + "src": "17538:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "17277:29:6" + "src": "17522:29:8" }, { "assignments": [ - 3569 + 3773 ], "declarations": [ { "constant": false, - "id": 3569, + "id": 3773, "name": "unstakedDeposit", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "17312:20:6", + "scope": 3796, + "src": "17557:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15248,10 +15963,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3568, + "id": 3772, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17312:4:6", + "src": "17557:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15261,43 +15976,43 @@ "visibility": "internal" } ], - "id": 3572, + "id": 3776, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3570, + "id": 3774, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17335:7:6", + "referencedDeclaration": 3749, + "src": "17580:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3571, + "id": 3775, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "17335:23:6", + "referencedDeclaration": 2764, + "src": "17580:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "17312:46:6" + "src": "17557:46:8" }, { "expression": { "argumentTypes": null, - "id": 3576, + "id": 3780, "isConstant": false, "isLValue": false, "isPure": false, @@ -15305,31 +16020,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "17364:29:6", + "src": "17609:29:8", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3573, + "id": 3777, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "17371:8:6", + "referencedDeclaration": 2790, + "src": "17616:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3575, + "id": 3779, "indexExpression": { "argumentTypes": null, - "id": 3574, + "id": 3778, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17380:12:6", + "referencedDeclaration": 3745, + "src": "17625:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15340,9 +16055,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "17371:22:6", + "src": "17616:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, @@ -15351,9 +16066,9 @@ "typeString": "tuple()" } }, - "id": 3577, + "id": 3781, "nodeType": "ExpressionStatement", - "src": "17364:29:6" + "src": "17609:29:8" }, { "condition": { @@ -15362,19 +16077,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3580, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3578, + "id": 3782, "name": "unstakedDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3569, - "src": "17461:15:6", + "referencedDeclaration": 3773, + "src": "17706:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15385,14 +16100,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3579, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17479:1:6", + "src": "17724:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15400,20 +16115,20 @@ }, "value": "0" }, - "src": "17461:19:6", + "src": "17706:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3590, + "id": 3794, "nodeType": "IfStatement", - "src": "17457:87:6", + "src": "17702:87:8", "trueBody": { - "id": 3589, + "id": 3793, "nodeType": "Block", - "src": "17482:62:6", + "src": "17727:62:8", "statements": [ { "expression": { @@ -15424,12 +16139,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3584, + "id": 3788, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3564, - "src": "17513:5:6", + "referencedDeclaration": 3768, + "src": "17758:5:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15437,12 +16152,12 @@ }, { "argumentTypes": null, - "id": 3585, + "id": 3789, "name": "unstakedDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3569, - "src": "17520:15:6", + "referencedDeclaration": 3773, + "src": "17765:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15462,32 +16177,32 @@ ], "expression": { "argumentTypes": null, - "id": 3582, + "id": 3786, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "17498:5:6", + "referencedDeclaration": 2792, + "src": "17743:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3583, + "id": 3787, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "17498:14:6", + "referencedDeclaration": 551, + "src": "17743:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3586, + "id": 3790, "isConstant": false, "isLValue": false, "isPure": false, @@ -15495,7 +16210,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17498:38:6", + "src": "17743:38:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15509,21 +16224,21 @@ "typeString": "bool" } ], - "id": 3581, + "id": 3785, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "17490:7:6", + "referencedDeclaration": 4156, + "src": "17735:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3587, + "id": 3791, "isConstant": false, "isLValue": false, "isPure": false, @@ -15531,15 +16246,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17490:47:6", + "src": "17735:47:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3588, + "id": 3792, "nodeType": "ExpressionStatement", - "src": "17490:47:6" + "src": "17735:47:8" } ] } @@ -15547,7 +16262,7 @@ ] }, "documentation": "@dev Deletes a listingHash from the whitelist and transfers tokens back to owner\n@param _listingHash The listing hash to delete", - "id": 3592, + "id": 3796, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -15555,16 +16270,16 @@ "name": "resetListing", "nodeType": "FunctionDefinition", "parameters": { - "id": 3542, + "id": 3746, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3541, + "id": 3745, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "16929:20:6", + "scope": 3796, + "src": "17174:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15572,10 +16287,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3540, + "id": 3744, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16929:7:6", + "src": "17174:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15585,89 +16300,89 @@ "visibility": "internal" } ], - "src": "16928:22:6" + "src": "17173:22:8" }, "payable": false, "returnParameters": { - "id": 3543, + "id": 3747, "nodeType": "ParameterList", "parameters": [], - "src": "16959:0:6" + "src": "17204:0:8" }, - "scope": 3593, - "src": "16907:641:6", + "scope": 3797, + "src": "17152:641:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 3594, - "src": "131:17419:6" + "scope": 3798, + "src": "131:17664:8" } ], - "src": "0:17551:6" + "src": "0:17796:8" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/Registry.sol", + "absolutePath": "/home/bharath/computable/contracts/Registry.sol", "exportedSymbols": { "Registry": [ - 3593 + 3797 ] }, - "id": 3594, + "id": 3798, "nodeType": "SourceUnit", "nodes": [ { - "id": 2492, + "id": 2655, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:6" + "src": "0:23:8" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 2493, + "id": 2656, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 409, - "src": "25:21:6", + "scope": 3798, + "sourceUnit": 529, + "src": "25:21:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/Parameterizer.sol", + "absolutePath": "/home/bharath/computable/contracts/Parameterizer.sol", "file": "./Parameterizer.sol", - "id": 2494, + "id": 2657, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 2491, - "src": "47:29:6", + "scope": 3798, + "sourceUnit": 2654, + "src": "47:29:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/PLCRVoting.sol", + "absolutePath": "/home/bharath/computable/contracts/PLCRVoting.sol", "file": "./PLCRVoting.sol", - "id": 2495, + "id": 2658, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 1472, - "src": "77:26:6", + "scope": 3798, + "sourceUnit": 1619, + "src": "77:26:8", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "id": 2496, + "id": 2659, "nodeType": "ImportDirective", - "scope": 3594, - "sourceUnit": 3688, - "src": "104:24:6", + "scope": 3798, + "sourceUnit": 3892, + "src": "104:24:8", "symbolAliases": [], "unitAlias": "" }, @@ -15677,9 +16392,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3593, + "id": 3797, "linearizedBaseContracts": [ - 3593 + 3797 ], "name": "Registry", "nodeType": "ContractDefinition", @@ -15687,21 +16402,21 @@ { "anonymous": false, "documentation": null, - "id": 2508, + "id": 2671, "name": "_Application", "nodeType": "EventDefinition", "parameters": { - "id": 2507, + "id": 2670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2498, + "id": 2661, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "210:27:6", + "scope": 2671, + "src": "210:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15709,10 +16424,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2497, + "id": 2660, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "210:7:6", + "src": "210:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15723,12 +16438,12 @@ }, { "constant": false, - "id": 2500, + "id": 2663, "indexed": false, "name": "deposit", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "239:12:6", + "scope": 2671, + "src": "239:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15736,10 +16451,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2499, + "id": 2662, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "239:4:6", + "src": "239:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15750,12 +16465,12 @@ }, { "constant": false, - "id": 2502, + "id": 2665, "indexed": false, "name": "appEndDate", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "253:15:6", + "scope": 2671, + "src": "253:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15763,10 +16478,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2501, + "id": 2664, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "253:4:6", + "src": "253:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15777,12 +16492,12 @@ }, { "constant": false, - "id": 2504, + "id": 2667, "indexed": false, "name": "data", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "270:11:6", + "scope": 2671, + "src": "270:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15790,10 +16505,10 @@ "typeString": "string" }, "typeName": { - "id": 2503, + "id": 2666, "name": "string", "nodeType": "ElementaryTypeName", - "src": "270:6:6", + "src": "270:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -15804,12 +16519,12 @@ }, { "constant": false, - "id": 2506, + "id": 2669, "indexed": true, "name": "applicant", "nodeType": "VariableDeclaration", - "scope": 2508, - "src": "283:25:6", + "scope": 2671, + "src": "283:25:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15817,10 +16532,10 @@ "typeString": "address" }, "typeName": { - "id": 2505, + "id": 2668, "name": "address", "nodeType": "ElementaryTypeName", - "src": "283:7:6", + "src": "283:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15830,28 +16545,28 @@ "visibility": "internal" } ], - "src": "209:100:6" + "src": "209:100:8" }, - "src": "191:119:6" + "src": "191:119:8" }, { "anonymous": false, "documentation": null, - "id": 2522, + "id": 2685, "name": "_Challenge", "nodeType": "EventDefinition", "parameters": { - "id": 2521, + "id": 2684, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2510, + "id": 2673, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "330:27:6", + "scope": 2685, + "src": "330:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15859,10 +16574,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2509, + "id": 2672, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "330:7:6", + "src": "330:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15873,12 +16588,12 @@ }, { "constant": false, - "id": 2512, + "id": 2675, "indexed": false, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "359:16:6", + "scope": 2685, + "src": "359:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15886,10 +16601,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2511, + "id": 2674, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "359:4:6", + "src": "359:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15900,12 +16615,12 @@ }, { "constant": false, - "id": 2514, + "id": 2677, "indexed": false, "name": "data", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "377:11:6", + "scope": 2685, + "src": "377:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15913,10 +16628,10 @@ "typeString": "string" }, "typeName": { - "id": 2513, + "id": 2676, "name": "string", "nodeType": "ElementaryTypeName", - "src": "377:6:6", + "src": "377:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -15927,12 +16642,12 @@ }, { "constant": false, - "id": 2516, + "id": 2679, "indexed": false, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "390:18:6", + "scope": 2685, + "src": "390:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15940,10 +16655,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2515, + "id": 2678, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "390:4:6", + "src": "390:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15954,12 +16669,12 @@ }, { "constant": false, - "id": 2518, + "id": 2681, "indexed": false, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "410:18:6", + "scope": 2685, + "src": "410:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15967,10 +16682,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2517, + "id": 2680, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "410:4:6", + "src": "410:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15981,12 +16696,12 @@ }, { "constant": false, - "id": 2520, + "id": 2683, "indexed": true, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 2522, - "src": "430:26:6", + "scope": 2685, + "src": "430:26:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15994,10 +16709,10 @@ "typeString": "address" }, "typeName": { - "id": 2519, + "id": 2682, "name": "address", "nodeType": "ElementaryTypeName", - "src": "430:7:6", + "src": "430:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16007,28 +16722,28 @@ "visibility": "internal" } ], - "src": "329:128:6" + "src": "329:128:8" }, - "src": "313:145:6" + "src": "313:145:8" }, { "anonymous": false, "documentation": null, - "id": 2532, + "id": 2695, "name": "_Deposit", "nodeType": "EventDefinition", "parameters": { - "id": 2531, + "id": 2694, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2524, + "id": 2687, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "476:27:6", + "scope": 2695, + "src": "476:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16036,10 +16751,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2523, + "id": 2686, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "476:7:6", + "src": "476:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16050,12 +16765,12 @@ }, { "constant": false, - "id": 2526, + "id": 2689, "indexed": false, "name": "added", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "505:10:6", + "scope": 2695, + "src": "505:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16063,10 +16778,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2525, + "id": 2688, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "505:4:6", + "src": "505:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16077,12 +16792,12 @@ }, { "constant": false, - "id": 2528, + "id": 2691, "indexed": false, "name": "newTotal", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "517:13:6", + "scope": 2695, + "src": "517:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16090,10 +16805,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2527, + "id": 2690, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "517:4:6", + "src": "517:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16104,12 +16819,12 @@ }, { "constant": false, - "id": 2530, + "id": 2693, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2532, - "src": "532:21:6", + "scope": 2695, + "src": "532:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16117,10 +16832,10 @@ "typeString": "address" }, "typeName": { - "id": 2529, + "id": 2692, "name": "address", "nodeType": "ElementaryTypeName", - "src": "532:7:6", + "src": "532:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16130,28 +16845,28 @@ "visibility": "internal" } ], - "src": "475:79:6" + "src": "475:79:8" }, - "src": "461:94:6" + "src": "461:94:8" }, { "anonymous": false, "documentation": null, - "id": 2542, + "id": 2705, "name": "_Withdrawal", "nodeType": "EventDefinition", "parameters": { - "id": 2541, + "id": 2704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2534, + "id": 2697, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "576:27:6", + "scope": 2705, + "src": "576:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16159,10 +16874,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2533, + "id": 2696, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "576:7:6", + "src": "576:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16173,12 +16888,12 @@ }, { "constant": false, - "id": 2536, + "id": 2699, "indexed": false, "name": "withdrew", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "605:13:6", + "scope": 2705, + "src": "605:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16186,10 +16901,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2535, + "id": 2698, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "605:4:6", + "src": "605:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16200,12 +16915,12 @@ }, { "constant": false, - "id": 2538, + "id": 2701, "indexed": false, "name": "newTotal", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "620:13:6", + "scope": 2705, + "src": "620:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16213,10 +16928,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2537, + "id": 2700, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "620:4:6", + "src": "620:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16227,12 +16942,12 @@ }, { "constant": false, - "id": 2540, + "id": 2703, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2542, - "src": "635:21:6", + "scope": 2705, + "src": "635:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16240,10 +16955,10 @@ "typeString": "address" }, "typeName": { - "id": 2539, + "id": 2702, "name": "address", "nodeType": "ElementaryTypeName", - "src": "635:7:6", + "src": "635:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16253,28 +16968,28 @@ "visibility": "internal" } ], - "src": "575:82:6" + "src": "575:82:8" }, - "src": "558:100:6" + "src": "558:100:8" }, { "anonymous": false, "documentation": null, - "id": 2546, + "id": 2709, "name": "_ApplicationWhitelisted", "nodeType": "EventDefinition", "parameters": { - "id": 2545, + "id": 2708, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2544, + "id": 2707, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2546, - "src": "691:27:6", + "scope": 2709, + "src": "691:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16282,10 +16997,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2543, + "id": 2706, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "691:7:6", + "src": "691:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16295,28 +17010,28 @@ "visibility": "internal" } ], - "src": "690:29:6" + "src": "690:29:8" }, - "src": "661:59:6" + "src": "661:59:8" }, { "anonymous": false, "documentation": null, - "id": 2550, + "id": 2713, "name": "_ApplicationRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2549, + "id": 2712, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2548, + "id": 2711, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2550, - "src": "749:27:6", + "scope": 2713, + "src": "749:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16324,10 +17039,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2547, + "id": 2710, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "749:7:6", + "src": "749:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16337,28 +17052,28 @@ "visibility": "internal" } ], - "src": "748:29:6" + "src": "748:29:8" }, - "src": "723:55:6" + "src": "723:55:8" }, { "anonymous": false, "documentation": null, - "id": 2554, + "id": 2717, "name": "_ListingRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2553, + "id": 2716, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2552, + "id": 2715, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2554, - "src": "803:27:6", + "scope": 2717, + "src": "803:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16366,10 +17081,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2551, + "id": 2714, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "803:7:6", + "src": "803:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16379,28 +17094,28 @@ "visibility": "internal" } ], - "src": "802:29:6" + "src": "802:29:8" }, - "src": "781:51:6" + "src": "781:51:8" }, { "anonymous": false, "documentation": null, - "id": 2558, + "id": 2721, "name": "_ListingWithdrawn", "nodeType": "EventDefinition", "parameters": { - "id": 2557, + "id": 2720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2556, + "id": 2719, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2558, - "src": "859:27:6", + "scope": 2721, + "src": "859:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16408,10 +17123,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2555, + "id": 2718, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "859:7:6", + "src": "859:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16421,28 +17136,28 @@ "visibility": "internal" } ], - "src": "858:29:6" + "src": "858:29:8" }, - "src": "835:53:6" + "src": "835:53:8" }, { "anonymous": false, "documentation": null, - "id": 2562, + "id": 2725, "name": "_TouchAndRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 2561, + "id": 2724, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2560, + "id": 2723, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2562, - "src": "914:27:6", + "scope": 2725, + "src": "914:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16450,10 +17165,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2559, + "id": 2722, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "914:7:6", + "src": "914:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16463,28 +17178,28 @@ "visibility": "internal" } ], - "src": "913:29:6" + "src": "913:29:8" }, - "src": "891:52:6" + "src": "891:52:8" }, { "anonymous": false, "documentation": null, - "id": 2572, + "id": 2735, "name": "_ChallengeFailed", "nodeType": "EventDefinition", "parameters": { - "id": 2571, + "id": 2734, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2564, + "id": 2727, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "969:27:6", + "scope": 2735, + "src": "969:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16492,10 +17207,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2563, + "id": 2726, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "969:7:6", + "src": "969:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16506,12 +17221,12 @@ }, { "constant": false, - "id": 2566, + "id": 2729, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "998:24:6", + "scope": 2735, + "src": "998:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16519,10 +17234,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2565, + "id": 2728, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "998:4:6", + "src": "998:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16533,12 +17248,12 @@ }, { "constant": false, - "id": 2568, + "id": 2731, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "1024:15:6", + "scope": 2735, + "src": "1024:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16546,10 +17261,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2567, + "id": 2730, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1024:4:6", + "src": "1024:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16560,12 +17275,12 @@ }, { "constant": false, - "id": 2570, + "id": 2733, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2572, - "src": "1041:16:6", + "scope": 2735, + "src": "1041:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16573,10 +17288,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2569, + "id": 2732, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1041:4:6", + "src": "1041:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16586,28 +17301,28 @@ "visibility": "internal" } ], - "src": "968:90:6" + "src": "968:90:8" }, - "src": "946:113:6" + "src": "946:113:8" }, { "anonymous": false, "documentation": null, - "id": 2582, + "id": 2745, "name": "_ChallengeSucceeded", "nodeType": "EventDefinition", "parameters": { - "id": 2581, + "id": 2744, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2574, + "id": 2737, "indexed": true, "name": "listingHash", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1088:27:6", + "scope": 2745, + "src": "1088:27:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16615,10 +17330,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2573, + "id": 2736, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1088:7:6", + "src": "1088:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16629,12 +17344,12 @@ }, { "constant": false, - "id": 2576, + "id": 2739, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1117:24:6", + "scope": 2745, + "src": "1117:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16642,10 +17357,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2575, + "id": 2738, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1117:4:6", + "src": "1117:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16656,12 +17371,12 @@ }, { "constant": false, - "id": 2578, + "id": 2741, "indexed": false, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1143:15:6", + "scope": 2745, + "src": "1143:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16669,10 +17384,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2577, + "id": 2740, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1143:4:6", + "src": "1143:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16683,12 +17398,12 @@ }, { "constant": false, - "id": 2580, + "id": 2743, "indexed": false, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2582, - "src": "1160:16:6", + "scope": 2745, + "src": "1160:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16696,10 +17411,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2579, + "id": 2742, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1160:4:6", + "src": "1160:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16709,28 +17424,28 @@ "visibility": "internal" } ], - "src": "1087:90:6" + "src": "1087:90:8" }, - "src": "1062:116:6" + "src": "1062:116:8" }, { "anonymous": false, "documentation": null, - "id": 2590, + "id": 2753, "name": "_RewardClaimed", "nodeType": "EventDefinition", "parameters": { - "id": 2589, + "id": 2752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2584, + "id": 2747, "indexed": true, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1202:24:6", + "scope": 2753, + "src": "1202:24:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16738,10 +17453,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2583, + "id": 2746, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1202:4:6", + "src": "1202:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16752,12 +17467,12 @@ }, { "constant": false, - "id": 2586, + "id": 2749, "indexed": false, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1228:11:6", + "scope": 2753, + "src": "1228:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16765,10 +17480,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2585, + "id": 2748, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1228:4:6", + "src": "1228:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16779,12 +17494,12 @@ }, { "constant": false, - "id": 2588, + "id": 2751, "indexed": true, "name": "voter", "nodeType": "VariableDeclaration", - "scope": 2590, - "src": "1241:21:6", + "scope": 2753, + "src": "1241:21:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16792,10 +17507,10 @@ "typeString": "address" }, "typeName": { - "id": 2587, + "id": 2750, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1241:7:6", + "src": "1241:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16805,31 +17520,31 @@ "visibility": "internal" } ], - "src": "1201:62:6" + "src": "1201:62:8" }, - "src": "1181:83:6" + "src": "1181:83:8" }, { - "id": 2593, + "id": 2756, "libraryName": { "contractScope": null, - "id": 2591, + "id": 2754, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3687, - "src": "1274:8:6", + "referencedDeclaration": 3891, + "src": "1274:8:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$3687", + "typeIdentifier": "t_contract$_SafeMath_$3891", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "1268:24:6", + "src": "1268:24:8", "typeName": { - "id": 2592, + "id": 2755, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1287:4:6", + "src": "1287:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16838,15 +17553,15 @@ }, { "canonicalName": "Registry.Listing", - "id": 2604, + "id": 2767, "members": [ { "constant": false, - "id": 2595, + "id": 2758, "name": "applicationExpiry", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1317:22:6", + "scope": 2767, + "src": "1317:22:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16854,10 +17569,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2594, + "id": 2757, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1317:4:6", + "src": "1317:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16868,11 +17583,11 @@ }, { "constant": false, - "id": 2597, + "id": 2760, "name": "whitelisted", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1379:16:6", + "scope": 2767, + "src": "1379:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16880,10 +17595,10 @@ "typeString": "bool" }, "typeName": { - "id": 2596, + "id": 2759, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1379:4:6", + "src": "1379:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16894,11 +17609,11 @@ }, { "constant": false, - "id": 2599, + "id": 2762, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1436:13:6", + "scope": 2767, + "src": "1436:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16906,10 +17621,10 @@ "typeString": "address" }, "typeName": { - "id": 2598, + "id": 2761, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1436:7:6", + "src": "1436:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16920,11 +17635,11 @@ }, { "constant": false, - "id": 2601, + "id": 2764, "name": "unstakedDeposit", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1484:20:6", + "scope": 2767, + "src": "1484:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16932,10 +17647,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2600, + "id": 2763, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1484:4:6", + "src": "1484:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16946,11 +17661,11 @@ }, { "constant": false, - "id": 2603, + "id": 2766, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 2604, - "src": "1573:16:6", + "scope": 2767, + "src": "1573:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16958,10 +17673,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2602, + "id": 2765, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1573:4:6", + "src": "1573:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16973,21 +17688,21 @@ ], "name": "Listing", "nodeType": "StructDefinition", - "scope": 3593, - "src": "1296:345:6", + "scope": 3797, + "src": "1296:345:8", "visibility": "public" }, { "canonicalName": "Registry.Challenge", - "id": 2619, + "id": 2782, "members": [ { "constant": false, - "id": 2606, + "id": 2769, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1668:15:6", + "scope": 2782, + "src": "1668:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16995,10 +17710,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2605, + "id": 2768, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1668:4:6", + "src": "1668:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17009,11 +17724,11 @@ }, { "constant": false, - "id": 2608, + "id": 2771, "name": "challenger", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1762:18:6", + "scope": 2782, + "src": "1762:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17021,10 +17736,10 @@ "typeString": "address" }, "typeName": { - "id": 2607, + "id": 2770, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1762:7:6", + "src": "1762:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17035,11 +17750,11 @@ }, { "constant": false, - "id": 2610, + "id": 2773, "name": "resolved", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1812:13:6", + "scope": 2782, + "src": "1812:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17047,10 +17762,10 @@ "typeString": "bool" }, "typeName": { - "id": 2609, + "id": 2772, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1812:4:6", + "src": "1812:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17061,11 +17776,11 @@ }, { "constant": false, - "id": 2612, + "id": 2775, "name": "stake", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1882:10:6", + "scope": 2782, + "src": "1882:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17073,10 +17788,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2611, + "id": 2774, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1882:4:6", + "src": "1882:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17087,11 +17802,11 @@ }, { "constant": false, - "id": 2614, + "id": 2777, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "1973:16:6", + "scope": 2782, + "src": "1973:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17099,10 +17814,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2613, + "id": 2776, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1973:4:6", + "src": "1973:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17113,11 +17828,11 @@ }, { "constant": false, - "id": 2618, + "id": 2781, "name": "tokenClaims", "nodeType": "VariableDeclaration", - "scope": 2619, - "src": "2068:36:6", + "scope": 2782, + "src": "2068:36:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17125,28 +17840,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 2617, + "id": 2780, "keyType": { - "id": 2615, + "id": 2778, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2076:7:6", + "src": "2076:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "2068:24:6", + "src": "2068:24:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 2616, + "id": 2779, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "2087:4:6", + "src": "2087:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17159,50 +17874,50 @@ ], "name": "Challenge", "nodeType": "StructDefinition", - "scope": 3593, - "src": "1645:518:6", + "scope": 3797, + "src": "1645:518:8", "visibility": "public" }, { "constant": false, - "id": 2623, + "id": 2786, "name": "challenges", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2219:44:6", + "scope": 3797, + "src": "2219:44:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge)" }, "typeName": { - "id": 2622, + "id": 2785, "keyType": { - "id": 2620, + "id": 2783, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "2227:4:6", + "src": "2227:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Mapping", - "src": "2219:26:6", + "src": "2219:26:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge)" }, "valueType": { "contractScope": null, - "id": 2621, + "id": 2784, "name": "Challenge", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2619, - "src": "2235:9:6", + "referencedDeclaration": 2782, + "src": "2235:9:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage_ptr", + "typeIdentifier": "t_struct$_Challenge_$2782_storage_ptr", "typeString": "struct Registry.Challenge" } } @@ -17212,44 +17927,44 @@ }, { "constant": false, - "id": 2627, + "id": 2790, "name": "listings", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2323:43:6", + "scope": 3797, + "src": "2323:43:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing)" }, "typeName": { - "id": 2626, + "id": 2789, "keyType": { - "id": 2624, + "id": 2787, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2331:7:6", + "src": "2331:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "2323:27:6", + "src": "2323:27:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing)" }, "valueType": { "contractScope": null, - "id": 2625, + "id": 2788, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "2342:7:6", + "referencedDeclaration": 2767, + "src": "2342:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } } @@ -17259,26 +17974,26 @@ }, { "constant": false, - "id": 2629, + "id": 2792, "name": "token", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2393:18:6", + "scope": 3797, + "src": "2393:18:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" }, "typeName": { "contractScope": null, - "id": 2628, + "id": 2791, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 408, - "src": "2393:5:6", + "referencedDeclaration": 528, + "src": "2393:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -17287,26 +18002,26 @@ }, { "constant": false, - "id": 2631, + "id": 2794, "name": "voting", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2415:24:6", + "scope": 3797, + "src": "2415:24:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" }, "typeName": { "contractScope": null, - "id": 2630, + "id": 2793, "name": "PLCRVoting", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1471, - "src": "2415:10:6", + "referencedDeclaration": 1618, + "src": "2415:10:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -17315,26 +18030,26 @@ }, { "constant": false, - "id": 2633, + "id": 2796, "name": "parameterizer", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2443:34:6", + "scope": 3797, + "src": "2443:34:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" }, "typeName": { "contractScope": null, - "id": 2632, + "id": 2795, "name": "Parameterizer", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2490, - "src": "2443:13:6", + "referencedDeclaration": 2653, + "src": "2443:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, @@ -17343,11 +18058,11 @@ }, { "constant": false, - "id": 2635, + "id": 2798, "name": "name", "nodeType": "VariableDeclaration", - "scope": 3593, - "src": "2481:18:6", + "scope": 3797, + "src": "2481:18:8", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -17355,10 +18070,10 @@ "typeString": "string" }, "typeName": { - "id": 2634, + "id": 2797, "name": "string", "nodeType": "ElementaryTypeName", - "src": "2481:6:6", + "src": "2481:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -17369,28 +18084,28 @@ }, { "body": { - "id": 2668, + "id": 2831, "nodeType": "Block", - "src": "2981:138:6", + "src": "2981:138:8", "statements": [ { "expression": { "argumentTypes": null, - "id": 2650, + "id": 2813, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2646, + "id": 2809, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "2987:5:6", + "referencedDeclaration": 2792, + "src": "2987:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, @@ -17401,12 +18116,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2648, + "id": 2811, "name": "_tokenAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2637, - "src": "3001:10:6", + "referencedDeclaration": 2800, + "src": "3001:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17420,18 +18135,18 @@ "typeString": "address" } ], - "id": 2647, + "id": 2810, "name": "ERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 408, - "src": "2995:5:6", + "referencedDeclaration": 528, + "src": "2995:5:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ERC20_$408_$", + "typeIdentifier": "t_type$_t_contract$_ERC20_$528_$", "typeString": "type(contract ERC20)" } }, - "id": 2649, + "id": 2812, "isConstant": false, "isLValue": false, "isPure": false, @@ -17439,40 +18154,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2995:17:6", + "src": "2995:17:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "src": "2987:25:6", + "src": "2987:25:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2651, + "id": 2814, "nodeType": "ExpressionStatement", - "src": "2987:25:6" + "src": "2987:25:8" }, { "expression": { "argumentTypes": null, - "id": 2656, + "id": 2819, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2652, + "id": 2815, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "3018:6:6", + "referencedDeclaration": 2794, + "src": "3018:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, @@ -17483,12 +18198,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2654, + "id": 2817, "name": "_plcrAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2639, - "src": "3038:9:6", + "referencedDeclaration": 2802, + "src": "3038:9:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17502,18 +18217,18 @@ "typeString": "address" } ], - "id": 2653, + "id": 2816, "name": "PLCRVoting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1471, - "src": "3027:10:6", + "referencedDeclaration": 1618, + "src": "3027:10:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1471_$", + "typeIdentifier": "t_type$_t_contract$_PLCRVoting_$1618_$", "typeString": "type(contract PLCRVoting)" } }, - "id": 2655, + "id": 2818, "isConstant": false, "isLValue": false, "isPure": false, @@ -17521,40 +18236,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3027:21:6", + "src": "3027:21:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "src": "3018:30:6", + "src": "3018:30:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2657, + "id": 2820, "nodeType": "ExpressionStatement", - "src": "3018:30:6" + "src": "3018:30:8" }, { "expression": { "argumentTypes": null, - "id": 2662, + "id": 2825, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2658, + "id": 2821, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "3054:13:6", + "referencedDeclaration": 2796, + "src": "3054:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, @@ -17565,12 +18280,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2660, + "id": 2823, "name": "_paramsAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2641, - "src": "3084:11:6", + "referencedDeclaration": 2804, + "src": "3084:11:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17584,18 +18299,18 @@ "typeString": "address" } ], - "id": 2659, + "id": 2822, "name": "Parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2490, - "src": "3070:13:6", + "referencedDeclaration": 2653, + "src": "3070:13:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_Parameterizer_$2490_$", + "typeIdentifier": "t_type$_t_contract$_Parameterizer_$2653_$", "typeString": "type(contract Parameterizer)" } }, - "id": 2661, + "id": 2824, "isConstant": false, "isLValue": false, "isPure": false, @@ -17603,38 +18318,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3070:26:6", + "src": "3070:26:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "src": "3054:42:6", + "src": "3054:42:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2663, + "id": 2826, "nodeType": "ExpressionStatement", - "src": "3054:42:6" + "src": "3054:42:8" }, { "expression": { "argumentTypes": null, - "id": 2666, + "id": 2829, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2664, + "id": 2827, "name": "name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2635, - "src": "3102:4:6", + "referencedDeclaration": 2798, + "src": "3102:4:8", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" @@ -17644,31 +18359,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2665, + "id": 2828, "name": "_name", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2643, - "src": "3109:5:6", + "referencedDeclaration": 2806, + "src": "3109:5:8", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", "typeString": "string memory" } }, - "src": "3102:12:6", + "src": "3102:12:8", "typeDescriptions": { "typeIdentifier": "t_string_storage", "typeString": "string storage ref" } }, - "id": 2667, + "id": 2830, "nodeType": "ExpressionStatement", - "src": "3102:12:6" + "src": "3102:12:8" } ] }, "documentation": "@dev Contructor Sets the addresses for token, voting, and parameterizer\n@param _tokenAddr Address of the TCR's intrinsic ERC20 token\n@param _plcrAddr Address of a PLCR voting contract for the provided token\n@param _paramsAddr Address of a Parameterizer contract", - "id": 2669, + "id": 2832, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -17676,16 +18391,16 @@ "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2644, + "id": 2807, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2637, + "id": 2800, "name": "_tokenAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2883:18:6", + "scope": 2832, + "src": "2883:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17693,10 +18408,10 @@ "typeString": "address" }, "typeName": { - "id": 2636, + "id": 2799, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2883:7:6", + "src": "2883:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17707,11 +18422,11 @@ }, { "constant": false, - "id": 2639, + "id": 2802, "name": "_plcrAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2907:17:6", + "scope": 2832, + "src": "2907:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17719,10 +18434,10 @@ "typeString": "address" }, "typeName": { - "id": 2638, + "id": 2801, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2907:7:6", + "src": "2907:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17733,11 +18448,11 @@ }, { "constant": false, - "id": 2641, + "id": 2804, "name": "_paramsAddr", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2930:19:6", + "scope": 2832, + "src": "2930:19:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17745,10 +18460,10 @@ "typeString": "address" }, "typeName": { - "id": 2640, + "id": 2803, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2930:7:6", + "src": "2930:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17759,11 +18474,11 @@ }, { "constant": false, - "id": 2643, + "id": 2806, "name": "_name", "nodeType": "VariableDeclaration", - "scope": 2669, - "src": "2955:12:6", + "scope": 2832, + "src": "2955:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17771,10 +18486,10 @@ "typeString": "string" }, "typeName": { - "id": 2642, + "id": 2805, "name": "string", "nodeType": "ElementaryTypeName", - "src": "2955:6:6", + "src": "2955:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -17784,26 +18499,26 @@ "visibility": "internal" } ], - "src": "2877:94:6" + "src": "2877:94:8" }, "payable": false, "returnParameters": { - "id": 2645, + "id": 2808, "nodeType": "ParameterList", "parameters": [], - "src": "2981:0:6" + "src": "2981:0:8" }, - "scope": 3593, - "src": "2866:253:6", + "scope": 3797, + "src": "2866:253:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2753, + "id": 2916, "nodeType": "Block", - "src": "3689:660:6", + "src": "3689:660:8", "statements": [ { "expression": { @@ -17811,7 +18526,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2682, + "id": 2845, "isConstant": false, "isLValue": false, "isPure": false, @@ -17819,18 +18534,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3703:28:6", + "src": "3703:28:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2680, + "id": 2843, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3718:12:6", + "referencedDeclaration": 2834, + "src": "3718:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17844,18 +18559,18 @@ "typeString": "bytes32" } ], - "id": 2679, + "id": 2842, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "3704:13:6", + "referencedDeclaration": 3476, + "src": "3704:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2681, + "id": 2844, "isConstant": false, "isLValue": false, "isPure": false, @@ -17863,7 +18578,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3704:27:6", + "src": "3704:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17882,21 +18597,21 @@ "typeString": "bool" } ], - "id": 2678, + "id": 2841, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3695:7:6", + "referencedDeclaration": 4156, + "src": "3695:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2683, + "id": 2846, "isConstant": false, "isLValue": false, "isPure": false, @@ -17904,15 +18619,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3695:37:6", + "src": "3695:37:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2684, + "id": 2847, "nodeType": "ExpressionStatement", - "src": "3695:37:6" + "src": "3695:37:8" }, { "expression": { @@ -17920,7 +18635,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2689, + "id": 2852, "isConstant": false, "isLValue": false, "isPure": false, @@ -17928,18 +18643,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3746:25:6", + "src": "3746:25:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2687, + "id": 2850, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3758:12:6", + "referencedDeclaration": 2834, + "src": "3758:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17953,18 +18668,18 @@ "typeString": "bytes32" } ], - "id": 2686, + "id": 2849, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "3747:10:6", + "referencedDeclaration": 3491, + "src": "3747:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2688, + "id": 2851, "isConstant": false, "isLValue": false, "isPure": false, @@ -17972,7 +18687,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3747:24:6", + "src": "3747:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17991,21 +18706,21 @@ "typeString": "bool" } ], - "id": 2685, + "id": 2848, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3738:7:6", + "referencedDeclaration": 4156, + "src": "3738:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2690, + "id": 2853, "isConstant": false, "isLValue": false, "isPure": false, @@ -18013,15 +18728,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3738:34:6", + "src": "3738:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2691, + "id": 2854, "nodeType": "ExpressionStatement", - "src": "3738:34:6" + "src": "3738:34:8" }, { "expression": { @@ -18033,19 +18748,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2698, + "id": 2861, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2693, + "id": 2856, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "3786:7:6", + "referencedDeclaration": 2836, + "src": "3786:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18059,14 +18774,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2696, + "id": 2859, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3815:12:6", + "src": "3815:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -18084,32 +18799,32 @@ ], "expression": { "argumentTypes": null, - "id": 2694, + "id": 2857, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "3797:13:6", + "referencedDeclaration": 2796, + "src": "3797:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2695, + "id": 2858, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "3797:17:6", + "referencedDeclaration": 2512, + "src": "3797:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2697, + "id": 2860, "isConstant": false, "isLValue": false, "isPure": false, @@ -18117,13 +18832,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3797:31:6", + "src": "3797:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3786:42:6", + "src": "3786:42:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18137,21 +18852,21 @@ "typeString": "bool" } ], - "id": 2692, + "id": 2855, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "3778:7:6", + "referencedDeclaration": 4156, + "src": "3778:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2699, + "id": 2862, "isConstant": false, "isLValue": false, "isPure": false, @@ -18159,43 +18874,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3778:51:6", + "src": "3778:51:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2700, + "id": 2863, "nodeType": "ExpressionStatement", - "src": "3778:51:6" + "src": "3778:51:8" }, { "assignments": [ - 2702 + 2865 ], "declarations": [ { "constant": false, - "id": 2702, + "id": 2865, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3854:23:6", + "scope": 2917, + "src": "3854:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2701, + "id": 2864, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "3854:7:6", + "referencedDeclaration": 2767, + "src": "3854:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -18203,31 +18918,31 @@ "visibility": "internal" } ], - "id": 2706, + "id": 2869, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2703, + "id": 2866, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "3880:8:6", + "referencedDeclaration": 2790, + "src": "3880:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2705, + "id": 2868, "indexExpression": { "argumentTypes": null, - "id": 2704, + "id": 2867, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "3889:12:6", + "referencedDeclaration": 2834, + "src": "3889:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18238,19 +18953,19 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3880:22:6", + "src": "3880:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "3854:48:6" + "src": "3854:48:8" }, { "expression": { "argumentTypes": null, - "id": 2712, + "id": 2875, "isConstant": false, "isLValue": false, "isPure": false, @@ -18259,26 +18974,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2707, + "id": 2870, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "3908:7:6", + "referencedDeclaration": 2865, + "src": "3908:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2709, + "id": 2872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "3908:13:6", + "referencedDeclaration": 2762, + "src": "3908:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18290,18 +19005,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2710, + "id": 2873, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "3924:3:6", + "referencedDeclaration": 4153, + "src": "3924:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2711, + "id": 2874, "isConstant": false, "isLValue": false, "isPure": false, @@ -18309,26 +19024,26 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3924:10:6", + "src": "3924:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "3908:26:6", + "src": "3908:26:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2713, + "id": 2876, "nodeType": "ExpressionStatement", - "src": "3908:26:6" + "src": "3908:26:8" }, { "expression": { "argumentTypes": null, - "id": 2725, + "id": 2888, "isConstant": false, "isLValue": false, "isPure": false, @@ -18337,26 +19052,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2714, + "id": 2877, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "3974:7:6", + "referencedDeclaration": 2865, + "src": "3974:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2716, + "id": 2879, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "3974:25:6", + "referencedDeclaration": 2758, + "src": "3974:25:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18373,14 +19088,14 @@ { "argumentTypes": null, "hexValue": "6170706c7953746167654c656e", - "id": 2722, + "id": 2885, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4040:15:6", + "src": "4040:15:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8c03b11eba3b2d069479ae0d3837927171e72e193c0acb726bbd53bdd5902da", @@ -18398,32 +19113,32 @@ ], "expression": { "argumentTypes": null, - "id": 2720, + "id": 2883, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "4022:13:6", + "referencedDeclaration": 2796, + "src": "4022:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2721, + "id": 2884, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "4022:17:6", + "referencedDeclaration": 2512, + "src": "4022:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2723, + "id": 2886, "isConstant": false, "isLValue": false, "isPure": false, @@ -18431,7 +19146,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4022:34:6", + "src": "4022:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18449,18 +19164,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2717, + "id": 2880, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3692, - "src": "4002:5:6", + "referencedDeclaration": 4143, + "src": "4002:5:8", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 2718, + "id": 2881, "isConstant": false, "isLValue": false, "isPure": false, @@ -18468,27 +19183,27 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4002:15:6", + "src": "4002:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2719, + "id": 2882, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3686, - "src": "4002:19:6", + "referencedDeclaration": 3890, + "src": "4002:19:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2724, + "id": 2887, "isConstant": false, "isLValue": false, "isPure": false, @@ -18496,26 +19211,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4002:55:6", + "src": "4002:55:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3974:83:6", + "src": "3974:83:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2726, + "id": 2889, "nodeType": "ExpressionStatement", - "src": "3974:83:6" + "src": "3974:83:8" }, { "expression": { "argumentTypes": null, - "id": 2731, + "id": 2894, "isConstant": false, "isLValue": false, "isPure": false, @@ -18524,26 +19239,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2727, + "id": 2890, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4063:7:6", + "referencedDeclaration": 2865, + "src": "4063:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2729, + "id": 2892, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4063:23:6", + "referencedDeclaration": 2764, + "src": "4063:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18553,26 +19268,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2730, + "id": 2893, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4089:7:6", + "referencedDeclaration": 2836, + "src": "4089:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4063:33:6", + "src": "4063:33:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2732, + "id": 2895, "nodeType": "ExpressionStatement", - "src": "4063:33:6" + "src": "4063:33:8" }, { "expression": { @@ -18585,26 +19300,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2736, + "id": 2899, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4185:7:6", + "referencedDeclaration": 2865, + "src": "4185:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2737, + "id": 2900, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "4185:13:6", + "referencedDeclaration": 2762, + "src": "4185:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18612,25 +19327,25 @@ }, { "argumentTypes": null, - "id": 2738, + "id": 2901, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "4200:4:6", + "referencedDeclaration": 4186, + "src": "4200:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 2739, + "id": 2902, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4206:7:6", + "referencedDeclaration": 2836, + "src": "4206:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18644,7 +19359,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -18654,32 +19369,32 @@ ], "expression": { "argumentTypes": null, - "id": 2734, + "id": 2897, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "4166:5:6", + "referencedDeclaration": 2792, + "src": "4166:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2735, + "id": 2898, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "4166:18:6", + "referencedDeclaration": 510, + "src": "4166:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 2740, + "id": 2903, "isConstant": false, "isLValue": false, "isPure": false, @@ -18687,7 +19402,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4166:48:6", + "src": "4166:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18701,21 +19416,21 @@ "typeString": "bool" } ], - "id": 2733, + "id": 2896, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4158:7:6", + "referencedDeclaration": 4156, + "src": "4158:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2741, + "id": 2904, "isConstant": false, "isLValue": false, "isPure": false, @@ -18723,15 +19438,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4158:57:6", + "src": "4158:57:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2742, + "id": 2905, "nodeType": "ExpressionStatement", - "src": "4158:57:6" + "src": "4158:57:8" }, { "eventCall": { @@ -18739,12 +19454,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2744, + "id": 2907, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2671, - "src": "4247:12:6", + "referencedDeclaration": 2834, + "src": "4247:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18752,12 +19467,12 @@ }, { "argumentTypes": null, - "id": 2745, + "id": 2908, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2673, - "src": "4267:7:6", + "referencedDeclaration": 2836, + "src": "4267:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18767,26 +19482,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2746, + "id": 2909, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2702, - "src": "4282:7:6", + "referencedDeclaration": 2865, + "src": "4282:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2747, + "id": 2910, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "4282:25:6", + "referencedDeclaration": 2758, + "src": "4282:25:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18794,12 +19509,12 @@ }, { "argumentTypes": null, - "id": 2748, + "id": 2911, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2675, - "src": "4315:5:6", + "referencedDeclaration": 2838, + "src": "4315:5:8", "typeDescriptions": { "typeIdentifier": "t_string_calldata_ptr", "typeString": "string calldata" @@ -18809,18 +19524,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2749, + "id": 2912, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4328:3:6", + "referencedDeclaration": 4153, + "src": "4328:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2750, + "id": 2913, "isConstant": false, "isLValue": false, "isPure": false, @@ -18828,7 +19543,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4328:10:6", + "src": "4328:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18858,18 +19573,18 @@ "typeString": "address" } ], - "id": 2743, + "id": 2906, "name": "_Application", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2508, - "src": "4227:12:6", + "referencedDeclaration": 2671, + "src": "4227:12:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,string memory,address)" } }, - "id": 2751, + "id": 2914, "isConstant": false, "isLValue": false, "isPure": false, @@ -18877,20 +19592,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4227:117:6", + "src": "4227:117:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2752, + "id": 2915, "nodeType": "EmitStatement", - "src": "4222:122:6" + "src": "4222:122:8" } ] }, "documentation": "@dev Allows a user to start an application. Takes tokens from user and sets\napply stage end time.\n@param _listingHash The hash of a potential listing a user is applying to add to the registry\n@param _amount The number of ERC20 tokens a user is willing to potentially stake\n@param _data Extra data relevant to the application. Think IPFS hashes.", - "id": 2754, + "id": 2917, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -18898,16 +19613,16 @@ "name": "apply", "nodeType": "FunctionDefinition", "parameters": { - "id": 2676, + "id": 2839, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2671, + "id": 2834, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3630:20:6", + "scope": 2917, + "src": "3630:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18915,10 +19630,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2670, + "id": 2833, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3630:7:6", + "src": "3630:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18929,11 +19644,11 @@ }, { "constant": false, - "id": 2673, + "id": 2836, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3652:12:6", + "scope": 2917, + "src": "3652:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18941,10 +19656,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2672, + "id": 2835, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "3652:4:6", + "src": "3652:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18955,11 +19670,11 @@ }, { "constant": false, - "id": 2675, + "id": 2838, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 2754, - "src": "3666:12:6", + "scope": 2917, + "src": "3666:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18967,10 +19682,10 @@ "typeString": "string" }, "typeName": { - "id": 2674, + "id": 2837, "name": "string", "nodeType": "ElementaryTypeName", - "src": "3666:6:6", + "src": "3666:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -18980,54 +19695,54 @@ "visibility": "internal" } ], - "src": "3629:50:6" + "src": "3629:50:8" }, "payable": false, "returnParameters": { - "id": 2677, + "id": 2840, "nodeType": "ParameterList", "parameters": [], - "src": "3689:0:6" + "src": "3689:0:8" }, - "scope": 3593, - "src": "3615:734:6", + "scope": 3797, + "src": "3615:734:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2800, + "id": 2967, "nodeType": "Block", - "src": "4668:313:6", + "src": "4668:341:8", "statements": [ { "assignments": [ - 2762 + 2925 ], "declarations": [ { "constant": false, - "id": 2762, + "id": 2925, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4674:23:6", + "scope": 2968, + "src": "4674:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2761, + "id": 2924, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "4674:7:6", + "referencedDeclaration": 2767, + "src": "4674:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -19035,31 +19750,31 @@ "visibility": "internal" } ], - "id": 2766, + "id": 2929, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2763, + "id": 2926, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "4700:8:6", + "referencedDeclaration": 2790, + "src": "4700:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2765, + "id": 2928, "indexExpression": { "argumentTypes": null, - "id": 2764, + "id": 2927, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2756, - "src": "4709:12:6", + "referencedDeclaration": 2919, + "src": "4709:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19070,14 +19785,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4700:22:6", + "src": "4700:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "4674:48:6" + "src": "4674:48:8" }, { "expression": { @@ -19089,7 +19804,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2772, + "id": 2935, "isConstant": false, "isLValue": false, "isPure": false, @@ -19098,26 +19813,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2768, + "id": 2931, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4737:7:6", + "referencedDeclaration": 2925, + "src": "4737:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2769, + "id": 2932, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "4737:13:6", + "referencedDeclaration": 2762, + "src": "4737:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19129,18 +19844,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2770, + "id": 2933, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4754:3:6", + "referencedDeclaration": 4153, + "src": "4754:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2771, + "id": 2934, "isConstant": false, "isLValue": false, "isPure": false, @@ -19148,13 +19863,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4754:10:6", + "src": "4754:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4737:27:6", + "src": "4737:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19168,21 +19883,21 @@ "typeString": "bool" } ], - "id": 2767, + "id": 2930, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4729:7:6", + "referencedDeclaration": 4156, + "src": "4729:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2773, + "id": 2936, "isConstant": false, "isLValue": false, "isPure": false, @@ -19190,20 +19905,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4729:36:6", + "src": "4729:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2774, + "id": 2937, "nodeType": "ExpressionStatement", - "src": "4729:36:6" + "src": "4729:36:8" }, { "expression": { "argumentTypes": null, - "id": 2779, + "id": 2946, "isConstant": false, "isLValue": false, "isPure": false, @@ -19212,55 +19927,123 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2775, + "id": 2938, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4772:7:6", + "referencedDeclaration": 2925, + "src": "4772:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2777, + "id": 2940, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4772:23:6", + "referencedDeclaration": 2764, + "src": "4772:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2778, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4799:7:6", + "arguments": [ + { + "argumentTypes": null, + "id": 2944, + "name": "_amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2921, + "src": "4826:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2941, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2925, + "src": "4798:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 2942, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "4798:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2943, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "4798:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2945, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4798:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4772:34:6", + "src": "4772:62:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2780, + "id": 2947, "nodeType": "ExpressionStatement", - "src": "4772:34:6" + "src": "4772:62:8" }, { "expression": { @@ -19273,18 +20056,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2784, + "id": 2951, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4839:3:6", + "referencedDeclaration": 4153, + "src": "4867:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2785, + "id": 2952, "isConstant": false, "isLValue": false, "isPure": false, @@ -19292,7 +20075,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4839:10:6", + "src": "4867:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19300,25 +20083,25 @@ }, { "argumentTypes": null, - "id": 2786, + "id": 2953, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "4851:4:6", + "referencedDeclaration": 4186, + "src": "4879:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 2787, + "id": 2954, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4857:7:6", + "referencedDeclaration": 2921, + "src": "4885:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19332,7 +20115,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -19342,32 +20125,32 @@ ], "expression": { "argumentTypes": null, - "id": 2782, + "id": 2949, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "4820:5:6", + "referencedDeclaration": 2792, + "src": "4848:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2783, + "id": 2950, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "4820:18:6", + "referencedDeclaration": 510, + "src": "4848:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 2788, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": false, @@ -19375,7 +20158,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4820:45:6", + "src": "4848:45:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19389,21 +20172,21 @@ "typeString": "bool" } ], - "id": 2781, + "id": 2948, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "4812:7:6", + "referencedDeclaration": 4156, + "src": "4840:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2789, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": false, @@ -19411,15 +20194,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4812:54:6", + "src": "4840:54:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2790, + "id": 2957, "nodeType": "ExpressionStatement", - "src": "4812:54:6" + "src": "4840:54:8" }, { "eventCall": { @@ -19427,12 +20210,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2792, + "id": 2959, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2756, - "src": "4894:12:6", + "referencedDeclaration": 2919, + "src": "4922:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19440,12 +20223,12 @@ }, { "argumentTypes": null, - "id": 2793, + "id": 2960, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2758, - "src": "4914:7:6", + "referencedDeclaration": 2921, + "src": "4942:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19455,26 +20238,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2794, + "id": 2961, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2762, - "src": "4929:7:6", + "referencedDeclaration": 2925, + "src": "4957:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2795, + "id": 2962, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "4929:23:6", + "referencedDeclaration": 2764, + "src": "4957:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19484,18 +20267,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2796, + "id": 2963, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "4960:3:6", + "referencedDeclaration": 4153, + "src": "4988:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2797, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": false, @@ -19503,7 +20286,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4960:10:6", + "src": "4988:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19529,18 +20312,18 @@ "typeString": "address" } ], - "id": 2791, + "id": 2958, "name": "_Deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2532, - "src": "4878:8:6", + "referencedDeclaration": 2695, + "src": "4906:8:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,address)" } }, - "id": 2798, + "id": 2965, "isConstant": false, "isLValue": false, "isPure": false, @@ -19548,20 +20331,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4878:98:6", + "src": "4906:98:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2799, + "id": 2966, "nodeType": "EmitStatement", - "src": "4873:103:6" + "src": "4901:103:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to increase their unstaked deposit.\n@param _listingHash A listingHash msg.sender is the owner of\n@param _amount The number of ERC20 tokens to increase a user's unstaked deposit", - "id": 2801, + "id": 2968, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -19569,16 +20352,16 @@ "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 2759, + "id": 2922, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2756, + "id": 2919, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4623:20:6", + "scope": 2968, + "src": "4623:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19586,10 +20369,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2755, + "id": 2918, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4623:7:6", + "src": "4623:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19600,11 +20383,11 @@ }, { "constant": false, - "id": 2758, + "id": 2921, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2801, - "src": "4645:12:6", + "scope": 2968, + "src": "4645:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19612,10 +20395,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2757, + "id": 2920, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4645:4:6", + "src": "4645:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19625,54 +20408,54 @@ "visibility": "internal" } ], - "src": "4622:36:6" + "src": "4622:36:8" }, "payable": false, "returnParameters": { - "id": 2760, + "id": 2923, "nodeType": "ParameterList", "parameters": [], - "src": "4668:0:6" + "src": "4668:0:8" }, - "scope": 3593, - "src": "4606:375:6", + "scope": 3797, + "src": "4606:403:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2865, + "id": 3037, "nodeType": "Block", - "src": "5303:438:6", + "src": "5331:469:8", "statements": [ { "assignments": [ - 2809 + 2976 ], "declarations": [ { "constant": false, - "id": 2809, + "id": 2976, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5309:23:6", + "scope": 3038, + "src": "5337:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2808, + "id": 2975, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "5309:7:6", + "referencedDeclaration": 2767, + "src": "5337:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -19680,31 +20463,31 @@ "visibility": "internal" } ], - "id": 2813, + "id": 2980, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2810, + "id": 2977, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "5335:8:6", + "referencedDeclaration": 2790, + "src": "5363:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2812, + "id": 2979, "indexExpression": { "argumentTypes": null, - "id": 2811, + "id": 2978, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, - "src": "5344:12:6", + "referencedDeclaration": 2970, + "src": "5372:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19715,14 +20498,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5335:22:6", + "src": "5363:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "5309:48:6" + "src": "5337:48:8" }, { "expression": { @@ -19734,7 +20517,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2819, + "id": 2986, "isConstant": false, "isLValue": false, "isPure": false, @@ -19743,26 +20526,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2815, + "id": 2982, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5372:7:6", + "referencedDeclaration": 2976, + "src": "5400:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2816, + "id": 2983, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "5372:13:6", + "referencedDeclaration": 2762, + "src": "5400:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19774,18 +20557,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2817, + "id": 2984, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5389:3:6", + "referencedDeclaration": 4153, + "src": "5417:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2818, + "id": 2985, "isConstant": false, "isLValue": false, "isPure": false, @@ -19793,13 +20576,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5389:10:6", + "src": "5417:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5372:27:6", + "src": "5400:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19813,21 +20596,21 @@ "typeString": "bool" } ], - "id": 2814, + "id": 2981, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5364:7:6", + "referencedDeclaration": 4156, + "src": "5392:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2820, + "id": 2987, "isConstant": false, "isLValue": false, "isPure": false, @@ -19835,15 +20618,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5364:36:6", + "src": "5392:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2821, + "id": 2988, "nodeType": "ExpressionStatement", - "src": "5364:36:6" + "src": "5392:36:8" }, { "expression": { @@ -19855,19 +20638,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2826, + "id": 2993, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2823, + "id": 2990, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5414:7:6", + "referencedDeclaration": 2972, + "src": "5442:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19879,32 +20662,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2824, + "id": 2991, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5425:7:6", + "referencedDeclaration": 2976, + "src": "5453:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2825, + "id": 2992, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5425:23:6", + "referencedDeclaration": 2764, + "src": "5453:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5414:34:6", + "src": "5442:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19918,21 +20701,21 @@ "typeString": "bool" } ], - "id": 2822, + "id": 2989, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5406:7:6", + "referencedDeclaration": 4156, + "src": "5434:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2827, + "id": 2994, "isConstant": false, "isLValue": false, "isPure": false, @@ -19940,15 +20723,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5406:43:6", + "src": "5434:43:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2828, + "id": 2995, "nodeType": "ExpressionStatement", - "src": "5406:43:6" + "src": "5434:43:8" }, { "expression": { @@ -19960,67 +20743,87 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2838, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 2833, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "expression": { + "arguments": [ + { "argumentTypes": null, - "id": 2830, - "name": "listing", + "id": 3000, + "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5463:7:6", + "referencedDeclaration": 2972, + "src": "5519:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", - "typeString": "struct Registry.Listing storage pointer" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2997, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2976, + "src": "5491:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 2998, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "5491:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2831, + "id": 2999, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "unstakedDeposit", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5463:23:6", + "referencedDeclaration": 3866, + "src": "5491:27:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 2832, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5489:7:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "5463:33:6", + "id": 3001, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5491:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20034,14 +20837,14 @@ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2836, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5518:12:6", + "src": "5549:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -20059,32 +20862,32 @@ ], "expression": { "argumentTypes": null, - "id": 2834, + "id": 3002, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "5500:13:6", + "referencedDeclaration": 2796, + "src": "5531:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2835, + "id": 3003, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "5500:17:6", + "referencedDeclaration": 2512, + "src": "5531:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2837, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": false, @@ -20092,13 +20895,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5500:31:6", + "src": "5531:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5463:68:6", + "src": "5491:71:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20112,21 +20915,21 @@ "typeString": "bool" } ], - "id": 2829, + "id": 2996, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5455:7:6", + "referencedDeclaration": 4156, + "src": "5483:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2839, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": false, @@ -20134,20 +20937,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5455:77:6", + "src": "5483:80:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2840, + "id": 3008, "nodeType": "ExpressionStatement", - "src": "5455:77:6" + "src": "5483:80:8" }, { "expression": { "argumentTypes": null, - "id": 2845, + "id": 3017, "isConstant": false, "isLValue": false, "isPure": false, @@ -20156,55 +20959,123 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2841, + "id": 3009, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5539:7:6", + "referencedDeclaration": 2976, + "src": "5570:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2843, + "id": 3011, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5539:23:6", + "referencedDeclaration": 2764, + "src": "5570:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2844, - "name": "_amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5566:7:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3015, + "name": "_amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2972, + "src": "5624:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 3012, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2976, + "src": "5596:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 3013, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "5596:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3014, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "5596:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3016, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5596:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5539:34:6", + "src": "5570:62:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2846, + "id": 3018, "nodeType": "ExpressionStatement", - "src": "5539:34:6" + "src": "5570:62:8" }, { "expression": { @@ -20217,18 +21088,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2850, + "id": 3022, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5602:3:6", + "referencedDeclaration": 4153, + "src": "5661:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2851, + "id": 3023, "isConstant": false, "isLValue": false, "isPure": false, @@ -20236,7 +21107,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5602:10:6", + "src": "5661:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20244,12 +21115,12 @@ }, { "argumentTypes": null, - "id": 2852, + "id": 3024, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5614:7:6", + "referencedDeclaration": 2972, + "src": "5673:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20269,32 +21140,32 @@ ], "expression": { "argumentTypes": null, - "id": 2848, + "id": 3020, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "5587:5:6", + "referencedDeclaration": 2792, + "src": "5646:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 2849, + "id": 3021, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "5587:14:6", + "referencedDeclaration": 551, + "src": "5646:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2853, + "id": 3025, "isConstant": false, "isLValue": false, "isPure": false, @@ -20302,7 +21173,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5587:35:6", + "src": "5646:35:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20316,21 +21187,21 @@ "typeString": "bool" } ], - "id": 2847, + "id": 3019, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "5579:7:6", + "referencedDeclaration": 4156, + "src": "5638:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2854, + "id": 3026, "isConstant": false, "isLValue": false, "isPure": false, @@ -20338,15 +21209,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5579:44:6", + "src": "5638:44:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2855, + "id": 3027, "nodeType": "ExpressionStatement", - "src": "5579:44:6" + "src": "5638:44:8" }, { "eventCall": { @@ -20354,12 +21225,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 3029, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, - "src": "5654:12:6", + "referencedDeclaration": 2970, + "src": "5713:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20367,12 +21238,12 @@ }, { "argumentTypes": null, - "id": 2858, + "id": 3030, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2805, - "src": "5674:7:6", + "referencedDeclaration": 2972, + "src": "5733:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20382,26 +21253,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2859, + "id": 3031, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2809, - "src": "5689:7:6", + "referencedDeclaration": 2976, + "src": "5748:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2860, + "id": 3032, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "5689:23:6", + "referencedDeclaration": 2764, + "src": "5748:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20411,18 +21282,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2861, + "id": 3033, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "5720:3:6", + "referencedDeclaration": 4153, + "src": "5779:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2862, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -20430,7 +21301,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5720:10:6", + "src": "5779:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20456,18 +21327,18 @@ "typeString": "address" } ], - "id": 2856, + "id": 3028, "name": "_Withdrawal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2542, - "src": "5635:11:6", + "referencedDeclaration": 2705, + "src": "5694:11:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,uint256,address)" } }, - "id": 2863, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -20475,20 +21346,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5635:101:6", + "src": "5694:101:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2864, + "id": 3036, "nodeType": "EmitStatement", - "src": "5630:106:6" + "src": "5689:106:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to decrease their unstaked deposit.\n@param _listingHash A listingHash msg.sender is the owner of.\n@param _amount The number of ERC20 tokens to withdraw from the unstaked deposit.", - "id": 2866, + "id": 3038, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -20496,16 +21367,16 @@ "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 2806, + "id": 2973, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2803, + "id": 2970, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5258:20:6", + "scope": 3038, + "src": "5286:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20513,10 +21384,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2802, + "id": 2969, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5258:7:6", + "src": "5286:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20527,11 +21398,11 @@ }, { "constant": false, - "id": 2805, + "id": 2972, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2866, - "src": "5280:12:6", + "scope": 3038, + "src": "5308:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20539,10 +21410,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2804, + "id": 2971, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "5280:4:6", + "src": "5308:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20552,54 +21423,54 @@ "visibility": "internal" } ], - "src": "5257:36:6" + "src": "5285:36:8" }, "payable": false, "returnParameters": { - "id": 2807, + "id": 2974, "nodeType": "ParameterList", "parameters": [], - "src": "5303:0:6" + "src": "5331:0:8" }, - "scope": 3593, - "src": "5240:501:6", + "scope": 3797, + "src": "5268:532:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 2912, + "id": 3084, "nodeType": "Block", - "src": "6039:389:6", + "src": "6098:389:8", "statements": [ { "assignments": [ - 2872 + 3044 ], "declarations": [ { "constant": false, - "id": 2872, + "id": 3044, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 2913, - "src": "6045:23:6", + "scope": 3085, + "src": "6104:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2871, + "id": 3043, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "6045:7:6", + "referencedDeclaration": 2767, + "src": "6104:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -20607,31 +21478,31 @@ "visibility": "internal" } ], - "id": 2876, + "id": 3048, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2873, + "id": 3045, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "6071:8:6", + "referencedDeclaration": 2790, + "src": "6130:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2875, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2874, + "id": 3046, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6080:12:6", + "referencedDeclaration": 3040, + "src": "6139:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20642,14 +21513,14 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6071:22:6", + "src": "6130:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "6045:48:6" + "src": "6104:48:8" }, { "expression": { @@ -20661,7 +21532,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2882, + "id": 3054, "isConstant": false, "isLValue": false, "isPure": false, @@ -20670,18 +21541,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2878, + "id": 3050, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "6108:3:6", + "referencedDeclaration": 4153, + "src": "6167:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2879, + "id": 3051, "isConstant": false, "isLValue": false, "isPure": false, @@ -20689,7 +21560,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6108:10:6", + "src": "6167:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20701,32 +21572,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2880, + "id": 3052, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6122:7:6", + "referencedDeclaration": 3044, + "src": "6181:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2881, + "id": 3053, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "6122:13:6", + "referencedDeclaration": 2762, + "src": "6181:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6108:27:6", + "src": "6167:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20740,21 +21611,21 @@ "typeString": "bool" } ], - "id": 2877, + "id": 3049, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6100:7:6", + "referencedDeclaration": 4156, + "src": "6159:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2883, + "id": 3055, "isConstant": false, "isLValue": false, "isPure": false, @@ -20762,15 +21633,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6100:36:6", + "src": "6159:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2884, + "id": 3056, "nodeType": "ExpressionStatement", - "src": "6100:36:6" + "src": "6159:36:8" }, { "expression": { @@ -20781,12 +21652,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 3059, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6164:12:6", + "referencedDeclaration": 3040, + "src": "6223:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20800,18 +21671,18 @@ "typeString": "bytes32" } ], - "id": 2886, + "id": 3058, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "6150:13:6", + "referencedDeclaration": 3476, + "src": "6209:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2888, + "id": 3060, "isConstant": false, "isLValue": false, "isPure": false, @@ -20819,7 +21690,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6150:27:6", + "src": "6209:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20833,21 +21704,21 @@ "typeString": "bool" } ], - "id": 2885, + "id": 3057, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6142:7:6", + "referencedDeclaration": 4156, + "src": "6201:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2889, + "id": 3061, "isConstant": false, "isLValue": false, "isPure": false, @@ -20855,15 +21726,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6142:36:6", + "src": "6201:36:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2890, + "id": 3062, "nodeType": "ExpressionStatement", - "src": "6142:36:6" + "src": "6201:36:8" }, { "expression": { @@ -20875,7 +21746,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2901, + "id": 3073, "isConstant": false, "isLValue": false, "isPure": false, @@ -20886,7 +21757,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2895, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -20895,26 +21766,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2892, + "id": 3064, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6237:7:6", + "referencedDeclaration": 3044, + "src": "6296:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2893, + "id": 3065, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "6237:19:6", + "referencedDeclaration": 2766, + "src": "6296:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20925,14 +21796,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2894, + "id": 3066, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "6260:1:6", + "src": "6319:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -20940,7 +21811,7 @@ }, "value": "0" }, - "src": "6237:24:6", + "src": "6296:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20954,42 +21825,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2896, + "id": 3068, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "6265:10:6", + "referencedDeclaration": 2786, + "src": "6324:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2899, + "id": 3071, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2897, + "id": 3069, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2872, - "src": "6276:7:6", + "referencedDeclaration": 3044, + "src": "6335:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2898, + "id": 3070, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "6276:19:6", + "referencedDeclaration": 2766, + "src": "6335:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21000,27 +21871,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6265:31:6", + "src": "6324:31:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 2900, + "id": 3072, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "6265:40:6", + "referencedDeclaration": 2773, + "src": "6324:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "6237:68:6", + "src": "6296:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21034,21 +21905,21 @@ "typeString": "bool" } ], - "id": 2891, + "id": 3063, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "6229:7:6", + "referencedDeclaration": 4156, + "src": "6288:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2902, + "id": 3074, "isConstant": false, "isLValue": false, "isPure": false, @@ -21056,15 +21927,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6229:77:6", + "src": "6288:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2903, + "id": 3075, "nodeType": "ExpressionStatement", - "src": "6229:77:6" + "src": "6288:77:8" }, { "expression": { @@ -21072,12 +21943,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2905, + "id": 3077, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6368:12:6", + "referencedDeclaration": 3040, + "src": "6427:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21091,18 +21962,18 @@ "typeString": "bytes32" } ], - "id": 2904, + "id": 3076, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "6355:12:6", + "referencedDeclaration": 3796, + "src": "6414:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2906, + "id": 3078, "isConstant": false, "isLValue": false, "isPure": false, @@ -21110,15 +21981,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6355:26:6", + "src": "6414:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2907, + "id": 3079, "nodeType": "ExpressionStatement", - "src": "6355:26:6" + "src": "6414:26:8" }, { "eventCall": { @@ -21126,12 +21997,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2909, + "id": 3081, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2868, - "src": "6410:12:6", + "referencedDeclaration": 3040, + "src": "6469:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21145,18 +22016,18 @@ "typeString": "bytes32" } ], - "id": 2908, + "id": 3080, "name": "_ListingWithdrawn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2558, - "src": "6392:17:6", + "referencedDeclaration": 2721, + "src": "6451:17:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2910, + "id": 3082, "isConstant": false, "isLValue": false, "isPure": false, @@ -21164,20 +22035,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6392:31:6", + "src": "6451:31:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2911, + "id": 3083, "nodeType": "EmitStatement", - "src": "6387:36:6" + "src": "6446:36:8" } ] }, "documentation": "@dev Allows the owner of a listingHash to remove the listingHash from the whitelist\nReturns all tokens to the owner of the listingHash\n@param _listingHash A listingHash msg.sender is the owner of.", - "id": 2913, + "id": 3085, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -21185,16 +22056,16 @@ "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 2869, + "id": 3041, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2868, + "id": 3040, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 2913, - "src": "6008:20:6", + "scope": 3085, + "src": "6067:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21202,10 +22073,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2867, + "id": 3039, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6008:7:6", + "src": "6067:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21215,54 +22086,54 @@ "visibility": "internal" } ], - "src": "6007:22:6" + "src": "6066:22:8" }, "payable": false, "returnParameters": { - "id": 2870, + "id": 3042, "nodeType": "ParameterList", "parameters": [], - "src": "6039:0:6" + "src": "6098:0:8" }, - "scope": 3593, - "src": "5994:434:6", + "scope": 3797, + "src": "6053:434:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 3064, + "id": 3243, "nodeType": "Block", - "src": "7030:1536:6", + "src": "7089:1575:8", "statements": [ { "assignments": [ - 2923 + 3095 ], "declarations": [ { "constant": false, - "id": 2923, + "id": 3095, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7036:23:6", + "scope": 3244, + "src": "7095:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 2922, + "id": 3094, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "7036:7:6", + "referencedDeclaration": 2767, + "src": "7095:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -21270,31 +22141,31 @@ "visibility": "internal" } ], - "id": 2927, + "id": 3099, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2924, + "id": 3096, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "7062:8:6", + "referencedDeclaration": 2790, + "src": "7121:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 2926, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 2925, + "id": 3097, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7071:12:6", + "referencedDeclaration": 3087, + "src": "7130:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21305,27 +22176,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7062:22:6", + "src": "7121:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "7036:48:6" + "src": "7095:48:8" }, { "assignments": [ - 2929 + 3101 ], "declarations": [ { "constant": false, - "id": 2929, + "id": 3101, "name": "minDeposit", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7090:15:6", + "scope": 3244, + "src": "7149:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21333,10 +22204,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2928, + "id": 3100, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7090:4:6", + "src": "7149:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21346,21 +22217,21 @@ "visibility": "internal" } ], - "id": 2934, + "id": 3106, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "6d696e4465706f736974", - "id": 2932, + "id": 3104, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7126:12:6", + "src": "7185:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1562a3cff09047061ba41141a6bb560ed15f1ca2968c821562d091212629199d", @@ -21378,32 +22249,32 @@ ], "expression": { "argumentTypes": null, - "id": 2930, + "id": 3102, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7108:13:6", + "referencedDeclaration": 2796, + "src": "7167:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2931, + "id": 3103, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7108:17:6", + "referencedDeclaration": 2512, + "src": "7167:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2933, + "id": 3105, "isConstant": false, "isLValue": false, "isPure": false, @@ -21411,14 +22282,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7108:31:6", + "src": "7167:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7090:49:6" + "src": "7149:49:8" }, { "expression": { @@ -21430,7 +22301,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2941, + "id": 3113, "isConstant": false, "isLValue": false, "isPure": false, @@ -21440,12 +22311,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2937, + "id": 3109, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7231:12:6", + "referencedDeclaration": 3087, + "src": "7290:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21459,18 +22330,18 @@ "typeString": "bytes32" } ], - "id": 2936, + "id": 3108, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "7220:10:6", + "referencedDeclaration": 3491, + "src": "7279:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 2938, + "id": 3110, "isConstant": false, "isLValue": false, "isPure": false, @@ -21478,7 +22349,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7220:24:6", + "src": "7279:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21490,32 +22361,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2939, + "id": 3111, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7248:7:6", + "referencedDeclaration": 3095, + "src": "7307:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2940, + "id": 3112, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "7248:19:6", + "referencedDeclaration": 2760, + "src": "7307:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "7220:47:6", + "src": "7279:47:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21529,21 +22400,21 @@ "typeString": "bool" } ], - "id": 2935, + "id": 3107, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7212:7:6", + "referencedDeclaration": 4156, + "src": "7271:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2942, + "id": 3114, "isConstant": false, "isLValue": false, "isPure": false, @@ -21551,15 +22422,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7212:56:6", + "src": "7271:56:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2943, + "id": 3115, "nodeType": "ExpressionStatement", - "src": "7212:56:6" + "src": "7271:56:8" }, { "expression": { @@ -21571,7 +22442,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2954, + "id": 3126, "isConstant": false, "isLValue": false, "isPure": false, @@ -21582,7 +22453,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2948, + "id": 3120, "isConstant": false, "isLValue": false, "isPure": false, @@ -21591,26 +22462,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2945, + "id": 3117, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7317:7:6", + "referencedDeclaration": 3095, + "src": "7376:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2946, + "id": 3118, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "7317:19:6", + "referencedDeclaration": 2766, + "src": "7376:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21621,14 +22492,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2947, + "id": 3119, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7340:1:6", + "src": "7399:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -21636,7 +22507,7 @@ }, "value": "0" }, - "src": "7317:24:6", + "src": "7376:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21650,42 +22521,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2949, + "id": 3121, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "7345:10:6", + "referencedDeclaration": 2786, + "src": "7404:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2952, + "id": 3124, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2950, + "id": 3122, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7356:7:6", + "referencedDeclaration": 3095, + "src": "7415:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2951, + "id": 3123, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "7356:19:6", + "referencedDeclaration": 2766, + "src": "7415:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21696,27 +22567,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7345:31:6", + "src": "7404:31:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 2953, + "id": 3125, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "7345:40:6", + "referencedDeclaration": 2773, + "src": "7404:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "7317:68:6", + "src": "7376:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21730,21 +22601,21 @@ "typeString": "bool" } ], - "id": 2944, + "id": 3116, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "7309:7:6", + "referencedDeclaration": 4156, + "src": "7368:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 2955, + "id": 3127, "isConstant": false, "isLValue": false, "isPure": false, @@ -21752,15 +22623,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7309:77:6", + "src": "7368:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2956, + "id": 3128, "nodeType": "ExpressionStatement", - "src": "7309:77:6" + "src": "7368:77:8" }, { "condition": { @@ -21769,7 +22640,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2960, + "id": 3132, "isConstant": false, "isLValue": false, "isPure": false, @@ -21778,26 +22649,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2957, + "id": 3129, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "7397:7:6", + "referencedDeclaration": 3095, + "src": "7456:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 2958, + "id": 3130, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "7397:23:6", + "referencedDeclaration": 2764, + "src": "7456:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21807,31 +22678,31 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 2959, + "id": 3131, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7423:10:6", + "referencedDeclaration": 3101, + "src": "7482:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7397:36:6", + "src": "7456:36:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2972, + "id": 3144, "nodeType": "IfStatement", - "src": "7393:196:6", + "src": "7452:196:8", "trueBody": { - "id": 2971, + "id": 3143, "nodeType": "Block", - "src": "7435:154:6", + "src": "7494:154:8", "statements": [ { "expression": { @@ -21839,12 +22710,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2962, + "id": 3134, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7510:12:6", + "referencedDeclaration": 3087, + "src": "7569:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21858,18 +22729,18 @@ "typeString": "bytes32" } ], - "id": 2961, + "id": 3133, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "7497:12:6", + "referencedDeclaration": 3796, + "src": "7556:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2963, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -21877,15 +22748,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7497:26:6", + "src": "7556:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2964, + "id": 3136, "nodeType": "ExpressionStatement", - "src": "7497:26:6" + "src": "7556:26:8" }, { "eventCall": { @@ -21893,12 +22764,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2966, + "id": 3138, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "7553:12:6", + "referencedDeclaration": 3087, + "src": "7612:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21912,18 +22783,18 @@ "typeString": "bytes32" } ], - "id": 2965, + "id": 3137, "name": "_TouchAndRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2562, - "src": "7536:16:6", + "referencedDeclaration": 2725, + "src": "7595:16:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 2967, + "id": 3139, "isConstant": false, "isLValue": false, "isPure": false, @@ -21931,28 +22802,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7536:30:6", + "src": "7595:30:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2968, + "id": 3140, "nodeType": "EmitStatement", - "src": "7531:35:6" + "src": "7590:35:8" }, { "expression": { "argumentTypes": null, "hexValue": "30", - "id": 2969, + "id": 3141, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7581:1:6", + "src": "7640:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -21960,26 +22831,26 @@ }, "value": "0" }, - "functionReturnParameters": 2921, - "id": 2970, + "functionReturnParameters": 3093, + "id": 3142, "nodeType": "Return", - "src": "7574:8:6" + "src": "7633:8:8" } ] } }, { "assignments": [ - 2974 + 3146 ], "declarations": [ { "constant": false, - "id": 2974, + "id": 3146, "name": "pollID", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7614:11:6", + "scope": 3244, + "src": "7673:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21987,10 +22858,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2973, + "id": 3145, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7614:4:6", + "src": "7673:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22000,7 +22871,7 @@ "visibility": "internal" } ], - "id": 2990, + "id": 3162, "initialValue": { "argumentTypes": null, "arguments": [ @@ -22010,14 +22881,14 @@ { "argumentTypes": null, "hexValue": "766f746551756f72756d", - "id": 2979, + "id": 3151, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7670:12:6", + "src": "7729:12:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9b01c2212638b995654bf3d584befbb3576184e03cd1a9ae5693a18a1f559878", @@ -22035,32 +22906,32 @@ ], "expression": { "argumentTypes": null, - "id": 2977, + "id": 3149, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7652:13:6", + "referencedDeclaration": 2796, + "src": "7711:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2978, + "id": 3150, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7652:17:6", + "referencedDeclaration": 2512, + "src": "7711:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2980, + "id": 3152, "isConstant": false, "isLValue": false, "isPure": false, @@ -22068,7 +22939,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7652:31:6", + "src": "7711:31:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22080,14 +22951,14 @@ { "argumentTypes": null, "hexValue": "636f6d6d697453746167654c656e", - "id": 2983, + "id": 3155, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7709:16:6", + "src": "7768:16:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22aa10f6207ed6245b2e23bddfcdfa1a542b375f7cf45082a1a75b9304a6150d", @@ -22105,32 +22976,32 @@ ], "expression": { "argumentTypes": null, - "id": 2981, + "id": 3153, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7691:13:6", + "referencedDeclaration": 2796, + "src": "7750:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2982, + "id": 3154, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7691:17:6", + "referencedDeclaration": 2512, + "src": "7750:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2984, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": false, @@ -22138,7 +23009,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7691:35:6", + "src": "7750:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22150,14 +23021,14 @@ { "argumentTypes": null, "hexValue": "72657665616c53746167654c656e", - "id": 2987, + "id": 3159, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "7752:16:6", + "src": "7811:16:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8858300ed02b4242350c6412c69b3951ae8f1d10eb49beafb9ecebaba7a0af1", @@ -22175,32 +23046,32 @@ ], "expression": { "argumentTypes": null, - "id": 2985, + "id": 3157, "name": "parameterizer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7734:13:6", + "referencedDeclaration": 2796, + "src": "7793:13:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", + "typeIdentifier": "t_contract$_Parameterizer_$2653", "typeString": "contract Parameterizer" } }, - "id": 2986, + "id": 3158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "get", "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7734:17:6", + "referencedDeclaration": 2512, + "src": "7793:17:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (string memory) view external returns (uint256)" } }, - "id": 2988, + "id": 3160, "isConstant": false, "isLValue": false, "isPure": false, @@ -22208,7 +23079,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7734:35:6", + "src": "7793:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22232,32 +23103,32 @@ ], "expression": { "argumentTypes": null, - "id": 2975, + "id": 3147, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "7628:6:6", + "referencedDeclaration": 2794, + "src": "7687:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 2976, + "id": 3148, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "startPoll", "nodeType": "MemberAccess", - "referencedDeclaration": 1101, - "src": "7628:16:6", + "referencedDeclaration": 1246, + "src": "7687:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 2989, + "id": 3161, "isConstant": false, "isLValue": false, "isPure": false, @@ -22265,19 +23136,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "7628:147:6", + "src": "7687:147:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "7614:161:6" + "src": "7673:161:8" }, { "expression": { "argumentTypes": null, - "id": 3013, + "id": 3188, "isConstant": false, "isLValue": false, "isPure": false, @@ -22286,26 +23157,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2991, + "id": 3163, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "7782:10:6", + "referencedDeclaration": 2786, + "src": "7841:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 2993, + "id": 3165, "indexExpression": { "argumentTypes": null, - "id": 2992, + "id": 3164, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "7793:6:6", + "referencedDeclaration": 3146, + "src": "7852:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22316,9 +23187,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "7782:18:6", + "src": "7841:18:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, @@ -22331,18 +23202,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2995, + "id": 3167, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "7833:3:6", + "referencedDeclaration": 4153, + "src": "7892:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2996, + "id": 3168, "isConstant": false, "isLValue": false, "isPure": false, @@ -22350,7 +23221,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7833:10:6", + "src": "7892:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22358,209 +23229,273 @@ }, { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3008, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 3182, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7994:3:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3005, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 3179, + "name": "minDeposit", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3101, + "src": "7978:10:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "components": [ + "arguments": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3002, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 2997, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7865:3:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "arguments": [ + "arguments": [ + { + "argumentTypes": null, + "hexValue": "64697370656e736174696f6e506374", + "id": 3175, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7954:17:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", + "typeString": "literal_string \"dispensationPct\"" + }, + "value": "dispensationPct" + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "hexValue": "64697370656e736174696f6e506374", - "id": 3000, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7889:17:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", - "typeString": "literal_string \"dispensationPct\"" - }, - "value": "dispensationPct" + "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", + "typeString": "literal_string \"dispensationPct\"" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_stringliteral_a44475ce52a893bc7cadba79a6351960ca7e12219e3b7f3a04da4d29c39864e4", - "typeString": "literal_string \"dispensationPct\"" - } - ], - "expression": { - "argumentTypes": null, - "id": 2998, - "name": "parameterizer", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2633, - "src": "7871:13:6", - "typeDescriptions": { - "typeIdentifier": "t_contract$_Parameterizer_$2490", - "typeString": "contract Parameterizer" - } - }, - "id": 2999, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "get", - "nodeType": "MemberAccess", - "referencedDeclaration": 2349, - "src": "7871:17:6", + "argumentTypes": null, + "id": 3173, + "name": "parameterizer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2796, + "src": "7936:13:8", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", - "typeString": "function (string memory) view external returns (uint256)" + "typeIdentifier": "t_contract$_Parameterizer_$2653", + "typeString": "contract Parameterizer" } }, - "id": 3001, + "id": 3174, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "7871:36:6", + "memberName": "get", + "nodeType": "MemberAccess", + "referencedDeclaration": 2512, + "src": "7936:17:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_view$_t_string_memory_ptr_$returns$_t_uint256_$", + "typeString": "function (string memory) view external returns (uint256)" } }, - "src": "7865:42:6", + "id": 3176, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7936:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 3003, + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 3170, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "7927:3:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "id": 3169, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "7922:4:8", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" + }, + "id": 3171, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:9:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3172, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "7922:13:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3177, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "7864:44:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { - "argumentTypes": null, - "id": 3004, - "name": "minDeposit", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7911:10:6", + "names": [], + "nodeType": "FunctionCall", + "src": "7922:51:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7864:57:6", + "id": 3178, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "7922:55:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 3180, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:67:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 3006, + }, + "id": 3181, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "7863:59:6", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "7922:71:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "hexValue": "313030", - "id": 3007, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "7925:3:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_100_by_1", - "typeString": "int_const 100" - }, - "value": "100" - }, - "src": "7863:65:6", + "id": 3183, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "7922:76:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22568,12 +23503,12 @@ }, { "argumentTypes": null, - "id": 3009, + "id": 3184, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "7943:10:6", + "referencedDeclaration": 3101, + "src": "8013:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22582,14 +23517,14 @@ { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3010, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "7971:5:6", + "src": "8041:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -22600,14 +23535,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3011, + "id": 3186, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "7997:1:6", + "src": "8067:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -22618,18 +23553,18 @@ ], "expression": { "argumentTypes": null, - "id": 2994, + "id": 3166, "name": "Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2619, - "src": "7803:9:6", + "referencedDeclaration": 2782, + "src": "7862:9:8", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Challenge_$2619_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Challenge_$2782_storage_ptr_$", "typeString": "type(struct Registry.Challenge storage pointer)" } }, - "id": 3012, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -22643,26 +23578,26 @@ "totalTokens" ], "nodeType": "FunctionCall", - "src": "7803:202:6", + "src": "7862:213:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_memory", + "typeIdentifier": "t_struct$_Challenge_$2782_memory", "typeString": "struct Registry.Challenge memory" } }, - "src": "7782:223:6", + "src": "7841:234:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3014, + "id": 3189, "nodeType": "ExpressionStatement", - "src": "7782:223:6" + "src": "7841:234:8" }, { "expression": { "argumentTypes": null, - "id": 3019, + "id": 3194, "isConstant": false, "isLValue": false, "isPure": false, @@ -22671,26 +23606,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3015, + "id": 3190, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "8070:7:6", + "referencedDeclaration": 3095, + "src": "8140:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3017, + "id": 3192, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "8070:19:6", + "referencedDeclaration": 2766, + "src": "8140:19:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22700,31 +23635,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3018, + "id": 3193, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8092:6:6", + "referencedDeclaration": 3146, + "src": "8162:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8070:28:6", + "src": "8140:28:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3020, + "id": 3195, "nodeType": "ExpressionStatement", - "src": "8070:28:6" + "src": "8140:28:8" }, { "expression": { "argumentTypes": null, - "id": 3025, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -22733,55 +23668,123 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3021, + "id": 3196, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, - "src": "8158:7:6", + "referencedDeclaration": 3095, + "src": "8228:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3023, + "id": 3198, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "8158:23:6", + "referencedDeclaration": 2764, + "src": "8228:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3024, - "name": "minDeposit", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "8185:10:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3202, + "name": "minDeposit", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3101, + "src": "8282:10:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 3199, + "name": "listing", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3095, + "src": "8254:7:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", + "typeString": "struct Registry.Listing storage pointer" + } + }, + "id": 3200, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "8254:23:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3201, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "8254:27:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3203, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "8254:39:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8158:37:6", + "src": "8228:65:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3026, + "id": 3205, "nodeType": "ExpressionStatement", - "src": "8158:37:6" + "src": "8228:65:8" }, { "expression": { @@ -22794,18 +23797,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3030, + "id": 3209, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8265:3:6", + "referencedDeclaration": 4153, + "src": "8363:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3031, + "id": 3210, "isConstant": false, "isLValue": false, "isPure": false, @@ -22813,7 +23816,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8265:10:6", + "src": "8363:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22821,25 +23824,25 @@ }, { "argumentTypes": null, - "id": 3032, + "id": 3211, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3729, - "src": "8277:4:6", + "referencedDeclaration": 4186, + "src": "8375:4:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" } }, { "argumentTypes": null, - "id": 3033, + "id": 3212, "name": "minDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2929, - "src": "8283:10:6", + "referencedDeclaration": 3101, + "src": "8381:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22853,7 +23856,7 @@ "typeString": "address" }, { - "typeIdentifier": "t_contract$_Registry_$3593", + "typeIdentifier": "t_contract$_Registry_$3797", "typeString": "contract Registry" }, { @@ -22863,32 +23866,32 @@ ], "expression": { "argumentTypes": null, - "id": 3028, + "id": 3207, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "8246:5:6", + "referencedDeclaration": 2792, + "src": "8344:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3029, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 390, - "src": "8246:18:6", + "referencedDeclaration": 510, + "src": "8344:18:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 3034, + "id": 3213, "isConstant": false, "isLValue": false, "isPure": false, @@ -22896,7 +23899,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8246:48:6", + "src": "8344:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22910,21 +23913,21 @@ "typeString": "bool" } ], - "id": 3027, + "id": 3206, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "8238:7:6", + "referencedDeclaration": 4156, + "src": "8336:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3035, + "id": 3214, "isConstant": false, "isLValue": false, "isPure": false, @@ -22932,26 +23935,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8238:57:6", + "src": "8336:57:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3036, + "id": 3215, "nodeType": "ExpressionStatement", - "src": "8238:57:6" + "src": "8336:57:8" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 3038, + "id": 3217, "name": "commitEndDate", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "8302:18:6", + "scope": 3244, + "src": "8400:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22959,10 +23962,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3037, + "id": 3216, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8302:4:6", + "src": "8400:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22972,21 +23975,21 @@ "visibility": "internal" } ], - "id": 3039, + "id": 3218, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "8302:18:6" + "src": "8400:18:8" }, { "assignments": [], "declarations": [ { "constant": false, - "id": 3041, + "id": 3220, "name": "revealEndDate", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "8326:18:6", + "scope": 3244, + "src": "8424:18:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22994,10 +23997,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3040, + "id": 3219, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "8326:4:6", + "src": "8424:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23007,15 +24010,15 @@ "visibility": "internal" } ], - "id": 3042, + "id": 3221, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "8326:18:6" + "src": "8424:18:8" }, { "expression": { "argumentTypes": null, - "id": 3050, + "id": 3229, "isConstant": false, "isLValue": false, "isPure": false, @@ -23025,12 +24028,12 @@ "components": [ { "argumentTypes": null, - "id": 3043, + "id": 3222, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3038, - "src": "8351:13:6", + "referencedDeclaration": 3217, + "src": "8449:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23038,12 +24041,12 @@ }, { "argumentTypes": null, - "id": 3044, + "id": 3223, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3041, - "src": "8366:13:6", + "referencedDeclaration": 3220, + "src": "8464:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23051,14 +24054,14 @@ }, null ], - "id": 3045, + "id": 3224, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "8350:31:6", + "src": "8448:31:8", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$__$", "typeString": "tuple(uint256,uint256,)" @@ -23071,12 +24074,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3048, + "id": 3227, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8399:6:6", + "referencedDeclaration": 3146, + "src": "8497:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23092,32 +24095,32 @@ ], "expression": { "argumentTypes": null, - "id": 3046, + "id": 3225, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "8384:6:6", + "referencedDeclaration": 2794, + "src": "8482:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3047, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollMap", "nodeType": "MemberAccess", - "referencedDeclaration": 535, - "src": "8384:14:6", + "referencedDeclaration": 655, + "src": "8482:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 3049, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, @@ -23125,21 +24128,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8384:22:6", + "src": "8482:22:8", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "tuple(uint256,uint256,uint256,uint256,uint256)" } }, - "src": "8350:56:6", + "src": "8448:56:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3051, + "id": 3230, "nodeType": "ExpressionStatement", - "src": "8350:56:6" + "src": "8448:56:8" }, { "eventCall": { @@ -23147,12 +24150,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3053, + "id": 3232, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2915, - "src": "8436:12:6", + "referencedDeclaration": 3087, + "src": "8534:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23160,12 +24163,12 @@ }, { "argumentTypes": null, - "id": 3054, + "id": 3233, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8456:6:6", + "referencedDeclaration": 3146, + "src": "8554:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23173,12 +24176,12 @@ }, { "argumentTypes": null, - "id": 3055, + "id": 3234, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2917, - "src": "8470:5:6", + "referencedDeclaration": 3089, + "src": "8568:5:8", "typeDescriptions": { "typeIdentifier": "t_string_calldata_ptr", "typeString": "string calldata" @@ -23186,12 +24189,12 @@ }, { "argumentTypes": null, - "id": 3056, + "id": 3235, "name": "commitEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3038, - "src": "8483:13:6", + "referencedDeclaration": 3217, + "src": "8581:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23199,12 +24202,12 @@ }, { "argumentTypes": null, - "id": 3057, + "id": 3236, "name": "revealEndDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3041, - "src": "8504:13:6", + "referencedDeclaration": 3220, + "src": "8602:13:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23214,18 +24217,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3058, + "id": 3237, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "8525:3:6", + "referencedDeclaration": 4153, + "src": "8623:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3059, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": false, @@ -23233,7 +24236,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8525:10:6", + "src": "8623:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23267,18 +24270,18 @@ "typeString": "address" } ], - "id": 3052, + "id": 3231, "name": "_Challenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2522, - "src": "8418:10:6", + "referencedDeclaration": 2685, + "src": "8516:10:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_string_memory_ptr_$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (bytes32,uint256,string memory,uint256,uint256,address)" } }, - "id": 3060, + "id": 3239, "isConstant": false, "isLValue": false, "isPure": false, @@ -23286,39 +24289,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8418:123:6", + "src": "8516:123:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3061, + "id": 3240, "nodeType": "EmitStatement", - "src": "8413:128:6" + "src": "8511:128:8" }, { "expression": { "argumentTypes": null, - "id": 3062, + "id": 3241, "name": "pollID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2974, - "src": "8555:6:6", + "referencedDeclaration": 3146, + "src": "8653:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2921, - "id": 3063, + "functionReturnParameters": 3093, + "id": 3242, "nodeType": "Return", - "src": "8548:13:6" + "src": "8646:13:8" } ] }, "documentation": "@dev Starts a poll for a listingHash which is either in the apply stage or\nalready in the whitelist. Tokens are taken from the challenger and the\napplicant's deposits are locked.\n@param _listingHash The listingHash being challenged, whether listed or in application\n@param _data Extra data relevant to the challenge. Think IPFS hashes.", - "id": 3065, + "id": 3244, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -23326,16 +24329,16 @@ "name": "challenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 2918, + "id": 3090, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2915, + "id": 3087, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "6958:20:6", + "scope": 3244, + "src": "7017:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23343,10 +24346,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2914, + "id": 3086, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6958:7:6", + "src": "7017:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23357,11 +24360,11 @@ }, { "constant": false, - "id": 2917, + "id": 3089, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "6980:12:6", + "scope": 3244, + "src": "7039:12:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23369,10 +24372,10 @@ "typeString": "string" }, "typeName": { - "id": 2916, + "id": 3088, "name": "string", "nodeType": "ElementaryTypeName", - "src": "6980:6:6", + "src": "7039:6:8", "typeDescriptions": { "typeIdentifier": "t_string_storage_ptr", "typeString": "string" @@ -23382,20 +24385,20 @@ "visibility": "internal" } ], - "src": "6957:36:6" + "src": "7016:36:8" }, "payable": false, "returnParameters": { - "id": 2921, + "id": 3093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2920, + "id": 3092, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3065, - "src": "7012:16:6", + "scope": 3244, + "src": "7071:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23403,10 +24406,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2919, + "id": 3091, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "7012:4:6", + "src": "7071:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23416,19 +24419,19 @@ "visibility": "internal" } ], - "src": "7011:18:6" + "src": "7070:18:8" }, - "scope": 3593, - "src": "6939:1627:6", + "scope": 3797, + "src": "6998:1666:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 3092, + "id": 3271, "nodeType": "Block", - "src": "8846:217:6", + "src": "8944:217:8", "statements": [ { "condition": { @@ -23436,12 +24439,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3071, + "id": 3250, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8873:12:6", + "referencedDeclaration": 3246, + "src": "8971:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23455,18 +24458,18 @@ "typeString": "bytes32" } ], - "id": 3070, + "id": 3249, "name": "canBeWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, - "src": "8856:16:6", + "referencedDeclaration": 3463, + "src": "8954:16:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3072, + "id": 3251, "isConstant": false, "isLValue": false, "isPure": false, @@ -23474,7 +24477,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8856:30:6", + "src": "8954:30:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23486,12 +24489,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3079, + "id": 3258, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8970:12:6", + "referencedDeclaration": 3246, + "src": "9068:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23505,18 +24508,18 @@ "typeString": "bytes32" } ], - "id": 3078, + "id": 3257, "name": "challengeCanBeResolved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3354, - "src": "8947:22:6", + "referencedDeclaration": 3546, + "src": "9045:22:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3080, + "id": 3259, "isConstant": false, "isLValue": false, "isPure": false, @@ -23524,16 +24527,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8947:36:6", + "src": "9045:36:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3089, + "id": 3268, "nodeType": "Block", - "src": "9036:23:6", + "src": "9134:23:8", "statements": [ { "expression": { @@ -23541,21 +24544,21 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3086, + "id": 3265, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 3707, - 3708 + 4158, + 4159 ], - "referencedDeclaration": 3707, - "src": "9044:6:6", + "referencedDeclaration": 4158, + "src": "9142:6:8", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 3087, + "id": 3266, "isConstant": false, "isLValue": false, "isPure": false, @@ -23563,25 +24566,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9044:8:6", + "src": "9142:8:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3088, + "id": 3267, "nodeType": "ExpressionStatement", - "src": "9044:8:6" + "src": "9142:8:8" } ] }, - "id": 3090, + "id": 3269, "nodeType": "IfStatement", - "src": "8943:116:6", + "src": "9041:116:8", "trueBody": { - "id": 3085, + "id": 3264, "nodeType": "Block", - "src": "8985:45:6", + "src": "9083:45:8", "statements": [ { "expression": { @@ -23589,12 +24592,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3082, + "id": 3261, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "9010:12:6", + "referencedDeclaration": 3246, + "src": "9108:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23608,18 +24611,18 @@ "typeString": "bytes32" } ], - "id": 3081, + "id": 3260, "name": "resolveChallenge", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3515, - "src": "8993:16:6", + "referencedDeclaration": 3719, + "src": "9091:16:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3083, + "id": 3262, "isConstant": false, "isLValue": false, "isPure": false, @@ -23627,26 +24630,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8993:30:6", + "src": "9091:30:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3084, + "id": 3263, "nodeType": "ExpressionStatement", - "src": "8993:30:6" + "src": "9091:30:8" } ] } }, - "id": 3091, + "id": 3270, "nodeType": "IfStatement", - "src": "8852:207:6", + "src": "8950:207:8", "trueBody": { - "id": 3077, + "id": 3256, "nodeType": "Block", - "src": "8888:49:6", + "src": "8986:49:8", "statements": [ { "expression": { @@ -23654,12 +24657,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3074, + "id": 3253, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3067, - "src": "8917:12:6", + "referencedDeclaration": 3246, + "src": "9015:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23673,18 +24676,18 @@ "typeString": "bytes32" } ], - "id": 3073, + "id": 3252, "name": "whitelistApplication", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3539, - "src": "8896:20:6", + "referencedDeclaration": 3743, + "src": "8994:20:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3075, + "id": 3254, "isConstant": false, "isLValue": false, "isPure": false, @@ -23692,15 +24695,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8896:34:6", + "src": "8994:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3076, + "id": 3255, "nodeType": "ExpressionStatement", - "src": "8896:34:6" + "src": "8994:34:8" } ] } @@ -23708,7 +24711,7 @@ ] }, "documentation": "@dev Updates a listingHash's status from 'application' to 'listing' or resolves\na challenge if one exists.\n@param _listingHash The listingHash whose status is being updated", - "id": 3093, + "id": 3272, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -23716,16 +24719,16 @@ "name": "updateStatus", "nodeType": "FunctionDefinition", "parameters": { - "id": 3068, + "id": 3247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3067, + "id": 3246, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3093, - "src": "8817:20:6", + "scope": 3272, + "src": "8915:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23733,10 +24736,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3066, + "id": 3245, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8817:7:6", + "src": "8915:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23746,26 +24749,26 @@ "visibility": "internal" } ], - "src": "8816:22:6" + "src": "8914:22:8" }, "payable": false, "returnParameters": { - "id": 3069, + "id": 3248, "nodeType": "ParameterList", "parameters": [], - "src": "8846:0:6" + "src": "8944:0:8" }, - "scope": 3593, - "src": "8795:268:6", + "scope": 3797, + "src": "8893:268:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3180, + "id": 3371, "nodeType": "Block", - "src": "9532:853:6", + "src": "9630:934:8", "statements": [ { "expression": { @@ -23777,7 +24780,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3109, + "id": 3288, "isConstant": false, "isLValue": false, "isPure": false, @@ -23790,26 +24793,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3101, + "id": 3280, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "9644:10:6", + "referencedDeclaration": 2786, + "src": "9742:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3103, + "id": 3282, "indexExpression": { "argumentTypes": null, - "id": 3102, + "id": 3281, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9655:12:6", + "referencedDeclaration": 3274, + "src": "9753:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23820,43 +24823,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9644:24:6", + "src": "9742:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3104, + "id": 3283, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "9644:36:6", + "referencedDeclaration": 2781, + "src": "9742:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3107, + "id": 3286, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3105, + "id": 3284, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9681:3:6", + "referencedDeclaration": 4153, + "src": "9779:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3106, + "id": 3285, "isConstant": false, "isLValue": false, "isPure": false, @@ -23864,7 +24867,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9681:10:6", + "src": "9779:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23875,7 +24878,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9644:48:6", + "src": "9742:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23886,14 +24889,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3108, + "id": 3287, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9696:5:6", + "src": "9794:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -23901,7 +24904,7 @@ }, "value": "false" }, - "src": "9644:57:6", + "src": "9742:57:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23915,21 +24918,21 @@ "typeString": "bool" } ], - "id": 3100, + "id": 3279, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9636:7:6", + "referencedDeclaration": 4156, + "src": "9734:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3110, + "id": 3289, "isConstant": false, "isLValue": false, "isPure": false, @@ -23937,15 +24940,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9636:66:6", + "src": "9734:66:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3111, + "id": 3290, "nodeType": "ExpressionStatement", - "src": "9636:66:6" + "src": "9734:66:8" }, { "expression": { @@ -23957,7 +24960,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3118, + "id": 3297, "isConstant": false, "isLValue": false, "isPure": false, @@ -23968,26 +24971,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3113, + "id": 3292, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "9716:10:6", + "referencedDeclaration": 2786, + "src": "9814:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3115, + "id": 3294, "indexExpression": { "argumentTypes": null, - "id": 3114, + "id": 3293, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9727:12:6", + "referencedDeclaration": 3274, + "src": "9825:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23998,21 +25001,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9716:24:6", + "src": "9814:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3116, + "id": 3295, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "9716:33:6", + "referencedDeclaration": 2773, + "src": "9814:33:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24023,14 +25026,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3117, + "id": 3296, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "9753:4:6", + "src": "9851:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -24038,7 +25041,7 @@ }, "value": "true" }, - "src": "9716:41:6", + "src": "9814:41:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24052,21 +25055,21 @@ "typeString": "bool" } ], - "id": 3112, + "id": 3291, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "9708:7:6", + "referencedDeclaration": 4156, + "src": "9806:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3119, + "id": 3298, "isConstant": false, "isLValue": false, "isPure": false, @@ -24074,28 +25077,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9708:50:6", + "src": "9806:50:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3120, + "id": 3299, "nodeType": "ExpressionStatement", - "src": "9708:50:6" + "src": "9806:50:8" }, { "assignments": [ - 3122 + 3301 ], "declarations": [ { "constant": false, - "id": 3122, + "id": 3301, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9765:16:6", + "scope": 3372, + "src": "9863:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24103,10 +25106,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3121, + "id": 3300, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9765:4:6", + "src": "9863:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24116,7 +25119,7 @@ "visibility": "internal" } ], - "id": 3130, + "id": 3309, "initialValue": { "argumentTypes": null, "arguments": [ @@ -24124,18 +25127,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3125, + "id": 3304, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9811:3:6", + "referencedDeclaration": 4153, + "src": "9909:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3126, + "id": 3305, "isConstant": false, "isLValue": false, "isPure": false, @@ -24143,7 +25146,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9811:10:6", + "src": "9909:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24151,12 +25154,12 @@ }, { "argumentTypes": null, - "id": 3127, + "id": 3306, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9823:12:6", + "referencedDeclaration": 3274, + "src": "9921:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24164,12 +25167,12 @@ }, { "argumentTypes": null, - "id": 3128, + "id": 3307, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3097, - "src": "9837:5:6", + "referencedDeclaration": 3276, + "src": "9935:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24193,32 +25196,32 @@ ], "expression": { "argumentTypes": null, - "id": 3123, + "id": 3302, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "9784:6:6", + "referencedDeclaration": 2794, + "src": "9882:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3124, + "id": 3303, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "9784:26:6", + "referencedDeclaration": 1189, + "src": "9882:26:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 3129, + "id": 3308, "isConstant": false, "isLValue": false, "isPure": false, @@ -24226,27 +25229,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9784:59:6", + "src": "9882:59:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9765:78:6" + "src": "9863:78:8" }, { "assignments": [ - 3132 + 3311 ], "declarations": [ { "constant": false, - "id": 3132, + "id": 3311, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9849:11:6", + "scope": 3372, + "src": "9947:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24254,10 +25257,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3131, + "id": 3310, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9849:4:6", + "src": "9947:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24267,7 +25270,7 @@ "visibility": "internal" } ], - "id": 3139, + "id": 3318, "initialValue": { "argumentTypes": null, "arguments": [ @@ -24275,18 +25278,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3134, + "id": 3313, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "9875:3:6", + "referencedDeclaration": 4153, + "src": "9973:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3135, + "id": 3314, "isConstant": false, "isLValue": false, "isPure": false, @@ -24294,7 +25297,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9875:10:6", + "src": "9973:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24302,12 +25305,12 @@ }, { "argumentTypes": null, - "id": 3136, + "id": 3315, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "9887:12:6", + "referencedDeclaration": 3274, + "src": "9985:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24315,12 +25318,12 @@ }, { "argumentTypes": null, - "id": 3137, + "id": 3316, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3097, - "src": "9901:5:6", + "referencedDeclaration": 3276, + "src": "9999:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24342,18 +25345,18 @@ "typeString": "uint256" } ], - "id": 3133, + "id": 3312, "name": "voterReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3223, - "src": "9863:11:6", + "referencedDeclaration": 3415, + "src": "9961:11:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view returns (uint256)" } }, - "id": 3138, + "id": 3317, "isConstant": false, "isLValue": false, "isPure": false, @@ -24361,19 +25364,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9863:44:6", + "src": "9961:44:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "9849:58:6" + "src": "9947:58:8" }, { "expression": { "argumentTypes": null, - "id": 3145, + "id": 3330, "isConstant": false, "isLValue": false, "isPure": false, @@ -24384,26 +25387,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3140, + "id": 3319, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10057:10:6", + "referencedDeclaration": 2786, + "src": "10155:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3142, + "id": 3321, "indexExpression": { "argumentTypes": null, - "id": 3141, + "id": 3320, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10068:12:6", + "referencedDeclaration": 3274, + "src": "10166:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24414,55 +25417,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10057:24:6", + "src": "10155:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3143, + "id": 3322, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "10057:36:6", + "referencedDeclaration": 2777, + "src": "10155:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3144, - "name": "voterTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3122, - "src": "10097:11:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3328, + "name": "voterTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3301, + "src": "10235:11:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3323, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "10194:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3325, + "indexExpression": { + "argumentTypes": null, + "id": 3324, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3274, + "src": "10205:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "10194:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3326, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "totalTokens", + "nodeType": "MemberAccess", + "referencedDeclaration": 2777, + "src": "10194:36:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3327, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "10194:40:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3329, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10194:53:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10057:51:6", + "src": "10155:92:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3146, + "id": 3331, "nodeType": "ExpressionStatement", - "src": "10057:51:6" + "src": "10155:92:8" }, { "expression": { "argumentTypes": null, - "id": 3152, + "id": 3343, "isConstant": false, "isLValue": false, "isPure": false, @@ -24473,26 +25571,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3147, + "id": 3332, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10114:10:6", + "referencedDeclaration": 2786, + "src": "10253:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3149, + "id": 3334, "indexExpression": { "argumentTypes": null, - "id": 3148, + "id": 3333, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10125:12:6", + "referencedDeclaration": 3274, + "src": "10264:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24503,55 +25601,150 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10114:24:6", + "src": "10253:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3150, + "id": 3335, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "10114:35:6", + "referencedDeclaration": 2769, + "src": "10253:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "-=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3151, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10153:6:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3341, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3311, + "src": "10331:6:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3336, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "10291:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3338, + "indexExpression": { + "argumentTypes": null, + "id": 3337, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3274, + "src": "10302:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "10291:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3339, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 2769, + "src": "10291:35:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3340, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 3866, + "src": "10291:39:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3342, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10291:47:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10114:45:6", + "src": "10253:85:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3153, + "id": 3344, "nodeType": "ExpressionStatement", - "src": "10114:45:6" + "src": "10253:85:8" }, { "expression": { "argumentTypes": null, - "id": 3162, + "id": 3353, "isConstant": false, "isLValue": false, "isPure": false, @@ -24564,26 +25757,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3154, + "id": 3345, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10215:10:6", + "referencedDeclaration": 2786, + "src": "10394:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3156, + "id": 3347, "indexExpression": { "argumentTypes": null, - "id": 3155, + "id": 3346, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10226:12:6", + "referencedDeclaration": 3274, + "src": "10405:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24594,43 +25787,43 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10215:24:6", + "src": "10394:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3157, + "id": 3348, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "10215:36:6", + "referencedDeclaration": 2781, + "src": "10394:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3160, + "id": 3351, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3158, + "id": 3349, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10252:3:6", + "referencedDeclaration": 4153, + "src": "10431:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3159, + "id": 3350, "isConstant": false, "isLValue": false, "isPure": false, @@ -24638,7 +25831,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10252:10:6", + "src": "10431:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24649,7 +25842,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "10215:48:6", + "src": "10394:48:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24660,14 +25853,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3161, + "id": 3352, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "10266:4:6", + "src": "10445:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -24675,15 +25868,15 @@ }, "value": "true" }, - "src": "10215:55:6", + "src": "10394:55:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3163, + "id": 3354, "nodeType": "ExpressionStatement", - "src": "10215:55:6" + "src": "10394:55:8" }, { "expression": { @@ -24696,18 +25889,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3167, + "id": 3358, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10300:3:6", + "referencedDeclaration": 4153, + "src": "10479:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3168, + "id": 3359, "isConstant": false, "isLValue": false, "isPure": false, @@ -24715,7 +25908,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10300:10:6", + "src": "10479:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24723,12 +25916,12 @@ }, { "argumentTypes": null, - "id": 3169, + "id": 3360, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10312:6:6", + "referencedDeclaration": 3311, + "src": "10491:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24748,32 +25941,32 @@ ], "expression": { "argumentTypes": null, - "id": 3165, + "id": 3356, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "10285:5:6", + "referencedDeclaration": 2792, + "src": "10464:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3166, + "id": 3357, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "10285:14:6", + "referencedDeclaration": 551, + "src": "10464:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3170, + "id": 3361, "isConstant": false, "isLValue": false, "isPure": false, @@ -24781,7 +25974,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10285:34:6", + "src": "10464:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24795,21 +25988,21 @@ "typeString": "bool" } ], - "id": 3164, + "id": 3355, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "10277:7:6", + "referencedDeclaration": 4156, + "src": "10456:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3171, + "id": 3362, "isConstant": false, "isLValue": false, "isPure": false, @@ -24817,15 +26010,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10277:43:6", + "src": "10456:43:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3172, + "id": 3363, "nodeType": "ExpressionStatement", - "src": "10277:43:6" + "src": "10456:43:8" }, { "eventCall": { @@ -24833,12 +26026,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3174, + "id": 3365, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3095, - "src": "10347:12:6", + "referencedDeclaration": 3274, + "src": "10526:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24846,12 +26039,12 @@ }, { "argumentTypes": null, - "id": 3175, + "id": 3366, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3132, - "src": "10361:6:6", + "referencedDeclaration": 3311, + "src": "10540:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24861,18 +26054,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3176, + "id": 3367, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3702, - "src": "10369:3:6", + "referencedDeclaration": 4153, + "src": "10548:3:8", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3177, + "id": 3368, "isConstant": false, "isLValue": false, "isPure": false, @@ -24880,7 +26073,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10369:10:6", + "src": "10548:10:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24902,18 +26095,18 @@ "typeString": "address" } ], - "id": 3173, + "id": 3364, "name": "_RewardClaimed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2590, - "src": "10332:14:6", + "referencedDeclaration": 2753, + "src": "10511:14:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,uint256,address)" } }, - "id": 3178, + "id": 3369, "isConstant": false, "isLValue": false, "isPure": false, @@ -24921,20 +26114,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10332:48:6", + "src": "10511:48:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3179, + "id": 3370, "nodeType": "EmitStatement", - "src": "10327:53:6" + "src": "10506:53:8" } ] }, "documentation": "@dev Called by a voter to claim their reward for each completed vote. Someone\nmust call updateStatus() before this can be called.\n@param _challengeID The PLCR pollID of the challenge a reward is being claimed for\n@param _salt The salt of a voter's commit hash in the given poll", - "id": 3181, + "id": 3372, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -24942,16 +26135,16 @@ "name": "claimReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3098, + "id": 3277, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3095, + "id": 3274, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9494:17:6", + "scope": 3372, + "src": "9592:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24959,10 +26152,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3094, + "id": 3273, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9494:4:6", + "src": "9592:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24973,11 +26166,11 @@ }, { "constant": false, - "id": 3097, + "id": 3276, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 3181, - "src": "9513:10:6", + "scope": 3372, + "src": "9611:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24985,10 +26178,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3096, + "id": 3275, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "9513:4:6", + "src": "9611:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24998,39 +26191,39 @@ "visibility": "internal" } ], - "src": "9493:31:6" + "src": "9591:31:8" }, "payable": false, "returnParameters": { - "id": 3099, + "id": 3278, "nodeType": "ParameterList", "parameters": [], - "src": "9532:0:6" + "src": "9630:0:8" }, - "scope": 3593, - "src": "9473:912:6", + "scope": 3797, + "src": "9571:993:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3222, + "id": 3414, "nodeType": "Block", - "src": "10940:258:6", + "src": "11119:262:8", "statements": [ { "assignments": [ - 3193 + 3384 ], "declarations": [ { "constant": false, - "id": 3193, + "id": 3384, "name": "totalTokens", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10946:16:6", + "scope": 3415, + "src": "11125:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25038,10 +26231,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3192, + "id": 3383, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10946:4:6", + "src": "11125:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25051,33 +26244,33 @@ "visibility": "internal" } ], - "id": 3198, + "id": 3389, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3194, + "id": 3385, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "10965:10:6", + "referencedDeclaration": 2786, + "src": "11144:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3196, + "id": 3387, "indexExpression": { "argumentTypes": null, - "id": 3195, + "id": 3386, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "10976:12:6", + "referencedDeclaration": 3376, + "src": "11155:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25088,41 +26281,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "10965:24:6", + "src": "11144:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3197, + "id": 3388, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "10965:36:6", + "referencedDeclaration": 2777, + "src": "11144:36:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "10946:55:6" + "src": "11125:55:8" }, { "assignments": [ - 3200 + 3391 ], "declarations": [ { "constant": false, - "id": 3200, + "id": 3391, "name": "rewardPool", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "11007:15:6", + "scope": 3415, + "src": "11186:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25130,10 +26323,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3199, + "id": 3390, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11007:4:6", + "src": "11186:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25143,33 +26336,33 @@ "visibility": "internal" } ], - "id": 3205, + "id": 3396, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3201, + "id": 3392, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "11025:10:6", + "referencedDeclaration": 2786, + "src": "11204:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3203, + "id": 3394, "indexExpression": { "argumentTypes": null, - "id": 3202, + "id": 3393, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "11036:12:6", + "referencedDeclaration": 3376, + "src": "11215:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25180,41 +26373,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11025:24:6", + "src": "11204:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3204, + "id": 3395, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "11025:35:6", + "referencedDeclaration": 2769, + "src": "11204:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11007:53:6" + "src": "11186:53:8" }, { "assignments": [ - 3207 + 3398 ], "declarations": [ { "constant": false, - "id": 3207, + "id": 3398, "name": "voterTokens", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "11066:16:6", + "scope": 3415, + "src": "11245:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25222,10 +26415,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3206, + "id": 3397, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11066:4:6", + "src": "11245:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25235,18 +26428,18 @@ "visibility": "internal" } ], - "id": 3214, + "id": 3405, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3210, + "id": 3401, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3183, - "src": "11112:6:6", + "referencedDeclaration": 3374, + "src": "11291:6:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25254,12 +26447,12 @@ }, { "argumentTypes": null, - "id": 3211, + "id": 3402, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3185, - "src": "11120:12:6", + "referencedDeclaration": 3376, + "src": "11299:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25267,12 +26460,12 @@ }, { "argumentTypes": null, - "id": 3212, + "id": 3403, "name": "_salt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3187, - "src": "11134:5:6", + "referencedDeclaration": 3378, + "src": "11313:5:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25296,32 +26489,32 @@ ], "expression": { "argumentTypes": null, - "id": 3208, + "id": 3399, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "11085:6:6", + "referencedDeclaration": 2794, + "src": "11264:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3209, + "id": 3400, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getNumPassingTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 1045, - "src": "11085:26:6", + "referencedDeclaration": 1189, + "src": "11264:26:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) view external returns (uint256)" } }, - "id": 3213, + "id": 3404, "isConstant": false, "isLValue": false, "isPure": false, @@ -25329,119 +26522,142 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11085:55:6", + "src": "11264:55:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11066:74:6" + "src": "11245:74:8" }, { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3220, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ + "arguments": [ + { + "argumentTypes": null, + "id": 3411, + "name": "totalTokens", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3384, + "src": "11364:11:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3217, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 3215, - "name": "voterTokens", + "id": 3408, + "name": "rewardPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3207, - "src": "11154:11:6", + "referencedDeclaration": 3391, + "src": "11348:10:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "id": 3216, - "name": "rewardPool", + "id": 3406, + "name": "voterTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3200, - "src": "11168:10:6", + "referencedDeclaration": 3398, + "src": "11332:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11154:24:6", + "id": 3407, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "11332:15:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } + }, + "id": 3409, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11332:27:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 3218, + }, + "id": 3410, "isConstant": false, - "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "11153:26:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "/", - "rightExpression": { - "argumentTypes": null, - "id": 3219, - "name": "totalTokens", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3193, - "src": "11182:11:6", + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 3846, + "src": "11332:31:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "11153:40:6", + "id": 3412, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11332:44:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3191, - "id": 3221, + "functionReturnParameters": 3382, + "id": 3413, "nodeType": "Return", - "src": "11146:47:6" + "src": "11325:51:8" } ] }, "documentation": "@dev Calculates the provided voter's token reward for the given poll.\n@param _voter The address of the voter whose reward balance is to be returned\n@param _challengeID The pollID of the challenge a reward balance is being queried for\n@param _salt The salt of the voter's commit hash in the given poll\n@return The uint indicating the voter's reward", - "id": 3223, + "id": 3415, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25449,16 +26665,16 @@ "name": "voterReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3188, + "id": 3379, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3183, + "id": 3374, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10862:14:6", + "scope": 3415, + "src": "11041:14:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25466,10 +26682,10 @@ "typeString": "address" }, "typeName": { - "id": 3182, + "id": 3373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10862:7:6", + "src": "11041:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25480,11 +26696,11 @@ }, { "constant": false, - "id": 3185, + "id": 3376, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10878:17:6", + "scope": 3415, + "src": "11057:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25492,10 +26708,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3184, + "id": 3375, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10878:4:6", + "src": "11057:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25506,11 +26722,11 @@ }, { "constant": false, - "id": 3187, + "id": 3378, "name": "_salt", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10897:10:6", + "scope": 3415, + "src": "11076:10:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25518,10 +26734,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3186, + "id": 3377, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10897:4:6", + "src": "11076:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25531,20 +26747,20 @@ "visibility": "internal" } ], - "src": "10861:47:6" + "src": "11040:47:8" }, "payable": false, "returnParameters": { - "id": 3191, + "id": 3382, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3190, + "id": 3381, "name": "", "nodeType": "VariableDeclaration", - "scope": 3223, - "src": "10932:4:6", + "scope": 3415, + "src": "11111:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25552,10 +26768,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3189, + "id": 3380, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "10932:4:6", + "src": "11111:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25565,32 +26781,32 @@ "visibility": "internal" } ], - "src": "10931:6:6" + "src": "11110:6:8" }, - "scope": 3593, - "src": "10841:357:6", + "scope": 3797, + "src": "11020:361:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3270, + "id": 3462, "nodeType": "Block", - "src": "11436:629:6", + "src": "11619:629:8", "statements": [ { "assignments": [ - 3231 + 3423 ], "declarations": [ { "constant": false, - "id": 3231, + "id": 3423, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11442:16:6", + "scope": 3463, + "src": "11625:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25598,10 +26814,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3230, + "id": 3422, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "11442:4:6", + "src": "11625:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25611,33 +26827,33 @@ "visibility": "internal" } ], - "id": 3236, + "id": 3428, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3232, + "id": 3424, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "11461:8:6", + "referencedDeclaration": 2790, + "src": "11644:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3234, + "id": 3426, "indexExpression": { "argumentTypes": null, - "id": 3233, + "id": 3425, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11470:12:6", + "referencedDeclaration": 3417, + "src": "11653:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25648,28 +26864,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11461:22:6", + "src": "11644:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3235, + "id": 3427, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "11461:34:6", + "referencedDeclaration": 2766, + "src": "11644:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "11442:53:6" + "src": "11625:53:8" }, { "condition": { @@ -25678,7 +26894,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3263, + "id": 3455, "isConstant": false, "isLValue": false, "isPure": false, @@ -25689,7 +26905,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3251, + "id": 3443, "isConstant": false, "isLValue": false, "isPure": false, @@ -25700,7 +26916,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3246, + "id": 3438, "isConstant": false, "isLValue": false, "isPure": false, @@ -25710,12 +26926,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3238, + "id": 3430, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11768:12:6", + "referencedDeclaration": 3417, + "src": "11951:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25729,18 +26945,18 @@ "typeString": "bytes32" } ], - "id": 3237, + "id": 3429, "name": "appWasMade", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3299, - "src": "11757:10:6", + "referencedDeclaration": 3491, + "src": "11940:10:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3239, + "id": 3431, "isConstant": false, "isLValue": false, "isPure": false, @@ -25748,7 +26964,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11757:24:6", + "src": "11940:24:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25762,7 +26978,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3245, + "id": 3437, "isConstant": false, "isLValue": false, "isPure": false, @@ -25773,26 +26989,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3240, + "id": 3432, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "11828:8:6", + "referencedDeclaration": 2790, + "src": "12011:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3242, + "id": 3434, "indexExpression": { "argumentTypes": null, - "id": 3241, + "id": 3433, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11837:12:6", + "referencedDeclaration": 3417, + "src": "12020:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25803,21 +27019,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11828:22:6", + "src": "12011:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3243, + "id": 3435, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "11828:40:6", + "referencedDeclaration": 2758, + "src": "12011:40:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25827,24 +27043,24 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 3244, + "id": 3436, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, - "src": "11871:3:6", + "referencedDeclaration": 4155, + "src": "12054:3:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11828:46:6", + "src": "12011:46:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11757:117:6", + "src": "11940:117:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25854,7 +27070,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 3250, + "id": 3442, "isConstant": false, "isLValue": false, "isPure": false, @@ -25862,18 +27078,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "11921:28:6", + "src": "12104:28:8", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3248, + "id": 3440, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3225, - "src": "11936:12:6", + "referencedDeclaration": 3417, + "src": "12119:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25887,18 +27103,18 @@ "typeString": "bytes32" } ], - "id": 3247, + "id": 3439, "name": "isWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3284, - "src": "11922:13:6", + "referencedDeclaration": 3476, + "src": "12105:13:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3249, + "id": 3441, "isConstant": false, "isLValue": false, "isPure": false, @@ -25906,7 +27122,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11922:27:6", + "src": "12105:27:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25917,7 +27133,7 @@ "typeString": "bool" } }, - "src": "11757:192:6", + "src": "11940:192:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25934,7 +27150,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3261, + "id": 3453, "isConstant": false, "isLValue": false, "isPure": false, @@ -25945,19 +27161,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3254, + "id": 3446, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3252, + "id": 3444, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3231, - "src": "11960:11:6", + "referencedDeclaration": 3423, + "src": "12143:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25968,14 +27184,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3253, + "id": 3445, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11975:1:6", + "src": "12158:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -25983,7 +27199,7 @@ }, "value": "0" }, - "src": "11960:16:6", + "src": "12143:16:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25997,7 +27213,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3260, + "id": 3452, "isConstant": false, "isLValue": false, "isPure": false, @@ -26008,26 +27224,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3255, + "id": 3447, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "11980:10:6", + "referencedDeclaration": 2786, + "src": "12163:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3257, + "id": 3449, "indexExpression": { "argumentTypes": null, - "id": 3256, + "id": 3448, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3231, - "src": "11991:11:6", + "referencedDeclaration": 3423, + "src": "12174:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26038,21 +27254,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11980:23:6", + "src": "12163:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3258, + "id": 3450, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "11980:32:6", + "referencedDeclaration": 2773, + "src": "12163:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26063,14 +27279,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3259, + "id": 3451, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12016:4:6", + "src": "12199:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -26078,59 +27294,59 @@ }, "value": "true" }, - "src": "11980:40:6", + "src": "12163:40:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11960:60:6", + "src": "12143:60:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 3262, + "id": 3454, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "11959:62:6", + "src": "12142:62:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "11757:264:6", + "src": "11940:264:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3267, + "id": 3459, "nodeType": "IfStatement", - "src": "11709:333:6", + "src": "11892:333:8", "trueBody": { - "id": 3266, + "id": 3458, "nodeType": "Block", - "src": "12028:14:6", + "src": "12211:14:8", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3264, + "id": 3456, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12036:4:6", + "src": "12219:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -26138,10 +27354,10 @@ }, "value": "true" }, - "functionReturnParameters": 3229, - "id": 3265, + "functionReturnParameters": 3421, + "id": 3457, "nodeType": "Return", - "src": "12029:11:6" + "src": "12212:11:8" } ] } @@ -26150,14 +27366,14 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3268, + "id": 3460, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "12055:5:6", + "src": "12238:5:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -26165,15 +27381,15 @@ }, "value": "false" }, - "functionReturnParameters": 3229, - "id": 3269, + "functionReturnParameters": 3421, + "id": 3461, "nodeType": "Return", - "src": "12048:12:6" + "src": "12231:12:8" } ] }, "documentation": "@dev Determines whether the given listingHash be whitelisted.\n@param _listingHash The listingHash whose status is to be examined", - "id": 3271, + "id": 3463, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26181,16 +27397,16 @@ "name": "canBeWhitelisted", "nodeType": "FunctionDefinition", "parameters": { - "id": 3226, + "id": 3418, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3225, + "id": 3417, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11387:20:6", + "scope": 3463, + "src": "11570:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26198,10 +27414,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3224, + "id": 3416, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11387:7:6", + "src": "11570:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26211,20 +27427,20 @@ "visibility": "internal" } ], - "src": "11386:22:6" + "src": "11569:22:8" }, "payable": false, "returnParameters": { - "id": 3229, + "id": 3421, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3228, + "id": 3420, "name": "", "nodeType": "VariableDeclaration", - "scope": 3271, - "src": "11430:4:6", + "scope": 3463, + "src": "11613:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26232,10 +27448,10 @@ "typeString": "bool" }, "typeName": { - "id": 3227, + "id": 3419, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "11430:4:6", + "src": "11613:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26245,19 +27461,19 @@ "visibility": "internal" } ], - "src": "11429:6:6" + "src": "11612:6:8" }, - "scope": 3593, - "src": "11361:704:6", + "scope": 3797, + "src": "11544:704:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3283, + "id": 3475, "nodeType": "Block", - "src": "12311:52:6", + "src": "12494:52:8", "statements": [ { "expression": { @@ -26266,26 +27482,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3278, + "id": 3470, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12324:8:6", + "referencedDeclaration": 2790, + "src": "12507:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3280, + "id": 3472, "indexExpression": { "argumentTypes": null, - "id": 3279, + "id": 3471, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, - "src": "12333:12:6", + "referencedDeclaration": 3465, + "src": "12516:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26296,35 +27512,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12324:22:6", + "src": "12507:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3281, + "id": 3473, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "12324:34:6", + "referencedDeclaration": 2760, + "src": "12507:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3277, - "id": 3282, + "functionReturnParameters": 3469, + "id": 3474, "nodeType": "Return", - "src": "12317:41:6" + "src": "12500:41:8" } ] }, "documentation": "@dev Returns true if the provided listingHash is whitelisted\n@param _listingHash The listingHash whose status is to be examined", - "id": 3284, + "id": 3476, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26332,16 +27548,16 @@ "name": "isWhitelisted", "nodeType": "FunctionDefinition", "parameters": { - "id": 3274, + "id": 3466, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3273, + "id": 3465, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3284, - "src": "12250:20:6", + "scope": 3476, + "src": "12433:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26349,10 +27565,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3272, + "id": 3464, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12250:7:6", + "src": "12433:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26362,20 +27578,20 @@ "visibility": "internal" } ], - "src": "12249:22:6" + "src": "12432:22:8" }, "payable": false, "returnParameters": { - "id": 3277, + "id": 3469, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3276, + "id": 3468, "name": "whitelisted", "nodeType": "VariableDeclaration", - "scope": 3284, - "src": "12293:16:6", + "scope": 3476, + "src": "12476:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26383,10 +27599,10 @@ "typeString": "bool" }, "typeName": { - "id": 3275, + "id": 3467, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12293:4:6", + "src": "12476:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26396,19 +27612,19 @@ "visibility": "internal" } ], - "src": "12292:18:6" + "src": "12475:18:8" }, - "scope": 3593, - "src": "12227:136:6", + "scope": 3797, + "src": "12410:136:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3298, + "id": 3490, "nodeType": "Block", - "src": "12599:62:6", + "src": "12782:62:8", "statements": [ { "expression": { @@ -26417,7 +27633,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3296, + "id": 3488, "isConstant": false, "isLValue": false, "isPure": false, @@ -26428,26 +27644,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3291, + "id": 3483, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12612:8:6", + "referencedDeclaration": 2790, + "src": "12795:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3293, + "id": 3485, "indexExpression": { "argumentTypes": null, - "id": 3292, + "id": 3484, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3286, - "src": "12621:12:6", + "referencedDeclaration": 3478, + "src": "12804:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26458,21 +27674,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12612:22:6", + "src": "12795:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3294, + "id": 3486, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "applicationExpiry", "nodeType": "MemberAccess", - "referencedDeclaration": 2595, - "src": "12612:40:6", + "referencedDeclaration": 2758, + "src": "12795:40:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26483,14 +27699,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3295, + "id": 3487, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12655:1:6", + "src": "12838:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26498,21 +27714,21 @@ }, "value": "0" }, - "src": "12612:44:6", + "src": "12795:44:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3290, - "id": 3297, + "functionReturnParameters": 3482, + "id": 3489, "nodeType": "Return", - "src": "12605:51:6" + "src": "12788:51:8" } ] }, "documentation": "@dev Returns true if apply was called for this listingHash\n@param _listingHash The listingHash whose status is to be examined", - "id": 3299, + "id": 3491, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26520,16 +27736,16 @@ "name": "appWasMade", "nodeType": "FunctionDefinition", "parameters": { - "id": 3287, + "id": 3479, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3286, + "id": 3478, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3299, - "src": "12543:20:6", + "scope": 3491, + "src": "12726:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26537,10 +27753,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3285, + "id": 3477, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12543:7:6", + "src": "12726:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26550,20 +27766,20 @@ "visibility": "internal" } ], - "src": "12542:22:6" + "src": "12725:22:8" }, "payable": false, "returnParameters": { - "id": 3290, + "id": 3482, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3289, + "id": 3481, "name": "exists", "nodeType": "VariableDeclaration", - "scope": 3299, - "src": "12586:11:6", + "scope": 3491, + "src": "12769:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26571,10 +27787,10 @@ "typeString": "bool" }, "typeName": { - "id": 3288, + "id": 3480, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12586:4:6", + "src": "12769:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26584,32 +27800,32 @@ "visibility": "internal" } ], - "src": "12585:13:6" + "src": "12768:13:8" }, - "scope": 3593, - "src": "12523:138:6", + "scope": 3797, + "src": "12706:138:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3327, + "id": 3519, "nodeType": "Block", - "src": "12913:155:6", + "src": "13096:155:8", "statements": [ { "assignments": [ - 3307 + 3499 ], "declarations": [ { "constant": false, - "id": 3307, + "id": 3499, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12919:16:6", + "scope": 3520, + "src": "13102:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26617,10 +27833,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3306, + "id": 3498, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "12919:4:6", + "src": "13102:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26630,33 +27846,33 @@ "visibility": "internal" } ], - "id": 3312, + "id": 3504, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3308, + "id": 3500, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12938:8:6", + "referencedDeclaration": 2790, + "src": "13121:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3310, + "id": 3502, "indexExpression": { "argumentTypes": null, - "id": 3309, + "id": 3501, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3301, - "src": "12947:12:6", + "referencedDeclaration": 3493, + "src": "13130:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26667,28 +27883,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12938:22:6", + "src": "13121:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3311, + "id": 3503, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "12938:34:6", + "referencedDeclaration": 2766, + "src": "13121:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12919:53:6" + "src": "13102:53:8" }, { "expression": { @@ -26700,7 +27916,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3324, + "id": 3516, "isConstant": false, "isLValue": false, "isPure": false, @@ -26711,7 +27927,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3318, + "id": 3510, "isConstant": false, "isLValue": false, "isPure": false, @@ -26722,26 +27938,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3313, + "id": 3505, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "12987:8:6", + "referencedDeclaration": 2790, + "src": "13170:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3315, + "id": 3507, "indexExpression": { "argumentTypes": null, - "id": 3314, + "id": 3506, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3301, - "src": "12996:12:6", + "referencedDeclaration": 3493, + "src": "13179:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26752,21 +27968,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12987:22:6", + "src": "13170:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3316, + "id": 3508, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "12987:34:6", + "referencedDeclaration": 2766, + "src": "13170:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26777,14 +27993,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3317, + "id": 3509, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "13024:1:6", + "src": "13207:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26792,7 +28008,7 @@ }, "value": "0" }, - "src": "12987:38:6", + "src": "13170:38:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26802,7 +28018,7 @@ "operator": "&&", "rightExpression": { "argumentTypes": null, - "id": 3323, + "id": 3515, "isConstant": false, "isLValue": false, "isPure": false, @@ -26810,33 +28026,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "13029:33:6", + "src": "13212:33:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3319, + "id": 3511, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "13030:10:6", + "referencedDeclaration": 2786, + "src": "13213:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3321, + "id": 3513, "indexExpression": { "argumentTypes": null, - "id": 3320, + "id": 3512, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, - "src": "13041:11:6", + "referencedDeclaration": 3499, + "src": "13224:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26847,21 +28063,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13030:23:6", + "src": "13213:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3322, + "id": 3514, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "13030:32:6", + "referencedDeclaration": 2773, + "src": "13213:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26872,35 +28088,35 @@ "typeString": "bool" } }, - "src": "12987:75:6", + "src": "13170:75:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 3325, + "id": 3517, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "12986:77:6", + "src": "13169:77:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3305, - "id": 3326, + "functionReturnParameters": 3497, + "id": 3518, "nodeType": "Return", - "src": "12979:84:6" + "src": "13162:84:8" } ] }, "documentation": "@dev Returns true if the application/listingHash has an unresolved challenge\n@param _listingHash The listingHash whose status is to be examined", - "id": 3328, + "id": 3520, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -26908,16 +28124,16 @@ "name": "challengeExists", "nodeType": "FunctionDefinition", "parameters": { - "id": 3302, + "id": 3494, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3301, + "id": 3493, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12864:20:6", + "scope": 3520, + "src": "13047:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26925,10 +28141,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3300, + "id": 3492, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12864:7:6", + "src": "13047:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26938,20 +28154,20 @@ "visibility": "internal" } ], - "src": "12863:22:6" + "src": "13046:22:8" }, "payable": false, "returnParameters": { - "id": 3305, + "id": 3497, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3304, + "id": 3496, "name": "", "nodeType": "VariableDeclaration", - "scope": 3328, - "src": "12907:4:6", + "scope": 3520, + "src": "13090:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26959,10 +28175,10 @@ "typeString": "bool" }, "typeName": { - "id": 3303, + "id": 3495, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "12907:4:6", + "src": "13090:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26972,32 +28188,32 @@ "visibility": "internal" } ], - "src": "12906:6:6" + "src": "13089:6:8" }, - "scope": 3593, - "src": "12839:229:6", + "scope": 3797, + "src": "13022:229:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3353, + "id": 3545, "nodeType": "Block", - "src": "13384:152:6", + "src": "13567:152:8", "statements": [ { "assignments": [ - 3336 + 3528 ], "declarations": [ { "constant": false, - "id": 3336, + "id": 3528, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13390:16:6", + "scope": 3546, + "src": "13573:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27005,10 +28221,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3335, + "id": 3527, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13390:4:6", + "src": "13573:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27018,33 +28234,33 @@ "visibility": "internal" } ], - "id": 3341, + "id": 3533, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3337, + "id": 3529, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "13409:8:6", + "referencedDeclaration": 2790, + "src": "13592:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3339, + "id": 3531, "indexExpression": { "argumentTypes": null, - "id": 3338, + "id": 3530, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3330, - "src": "13418:12:6", + "referencedDeclaration": 3522, + "src": "13601:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -27055,28 +28271,28 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13409:22:6", + "src": "13592:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3340, + "id": 3532, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "13409:34:6", + "referencedDeclaration": 2766, + "src": "13592:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "13390:53:6" + "src": "13573:53:8" }, { "expression": { @@ -27087,12 +28303,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3344, + "id": 3536, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3330, - "src": "13474:12:6", + "referencedDeclaration": 3522, + "src": "13657:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -27106,18 +28322,18 @@ "typeString": "bytes32" } ], - "id": 3343, + "id": 3535, "name": "challengeExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3328, - "src": "13458:15:6", + "referencedDeclaration": 3520, + "src": "13641:15:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 3345, + "id": 3537, "isConstant": false, "isLValue": false, "isPure": false, @@ -27125,7 +28341,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13458:29:6", + "src": "13641:29:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27139,21 +28355,21 @@ "typeString": "bool" } ], - "id": 3342, + "id": 3534, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "13450:7:6", + "referencedDeclaration": 4156, + "src": "13633:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3346, + "id": 3538, "isConstant": false, "isLValue": false, "isPure": false, @@ -27161,15 +28377,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13450:38:6", + "src": "13633:38:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3347, + "id": 3539, "nodeType": "ExpressionStatement", - "src": "13450:38:6" + "src": "13633:38:8" }, { "expression": { @@ -27177,12 +28393,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3350, + "id": 3542, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3336, - "src": "13519:11:6", + "referencedDeclaration": 3528, + "src": "13702:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27198,32 +28414,32 @@ ], "expression": { "argumentTypes": null, - "id": 3348, + "id": 3540, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13502:6:6", + "referencedDeclaration": 2794, + "src": "13685:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3349, + "id": 3541, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "13502:16:6", + "referencedDeclaration": 1334, + "src": "13685:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3351, + "id": 3543, "isConstant": false, "isLValue": false, "isPure": false, @@ -27231,21 +28447,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13502:29:6", + "src": "13685:29:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3334, - "id": 3352, + "functionReturnParameters": 3526, + "id": 3544, "nodeType": "Return", - "src": "13495:36:6" + "src": "13678:36:8" } ] }, "documentation": "@dev Determines whether voting has concluded in a challenge for a given\nlistingHash. Throws if no challenge exists.\n@param _listingHash A listingHash with an unresolved challenge", - "id": 3354, + "id": 3546, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27253,16 +28469,16 @@ "name": "challengeCanBeResolved", "nodeType": "FunctionDefinition", "parameters": { - "id": 3331, + "id": 3523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3330, + "id": 3522, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13335:20:6", + "scope": 3546, + "src": "13518:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27270,10 +28486,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3329, + "id": 3521, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13335:7:6", + "src": "13518:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -27283,20 +28499,20 @@ "visibility": "internal" } ], - "src": "13334:22:6" + "src": "13517:22:8" }, "payable": false, "returnParameters": { - "id": 3334, + "id": 3526, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3333, + "id": 3525, "name": "", "nodeType": "VariableDeclaration", - "scope": 3354, - "src": "13378:4:6", + "scope": 3546, + "src": "13561:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27304,10 +28520,10 @@ "typeString": "bool" }, "typeName": { - "id": 3332, + "id": 3524, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13378:4:6", + "src": "13561:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27317,19 +28533,19 @@ "visibility": "internal" } ], - "src": "13377:6:6" + "src": "13560:6:8" }, - "scope": 3593, - "src": "13303:233:6", + "scope": 3797, + "src": "13486:233:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3402, + "id": 3600, "nodeType": "Block", - "src": "13785:375:6", + "src": "13968:394:8", "statements": [ { "expression": { @@ -27341,14 +28557,14 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3371, + "id": 3563, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3366, + "id": 3558, "isConstant": false, "isLValue": false, "isPure": false, @@ -27356,33 +28572,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "13799:34:6", + "src": "13982:34:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3362, + "id": 3554, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "13800:10:6", + "referencedDeclaration": 2786, + "src": "13983:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3364, + "id": 3556, "indexExpression": { "argumentTypes": null, - "id": 3363, + "id": 3555, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13811:12:6", + "referencedDeclaration": 3548, + "src": "13994:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27393,21 +28609,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13800:24:6", + "src": "13983:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3365, + "id": 3557, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "13800:33:6", + "referencedDeclaration": 2773, + "src": "13983:33:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27425,12 +28641,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3369, + "id": 3561, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13854:12:6", + "referencedDeclaration": 3548, + "src": "14037:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27446,32 +28662,32 @@ ], "expression": { "argumentTypes": null, - "id": 3367, + "id": 3559, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13837:6:6", + "referencedDeclaration": 2794, + "src": "14020:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3368, + "id": 3560, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "pollEnded", "nodeType": "MemberAccess", - "referencedDeclaration": 1187, - "src": "13837:16:6", + "referencedDeclaration": 1334, + "src": "14020:16:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3370, + "id": 3562, "isConstant": false, "isLValue": false, "isPure": false, @@ -27479,13 +28695,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13837:30:6", + "src": "14020:30:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "13799:68:6", + "src": "13982:68:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27499,21 +28715,21 @@ "typeString": "bool" } ], - "id": 3361, + "id": 3553, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "13791:7:6", + "referencedDeclaration": 4156, + "src": "13974:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3372, + "id": 3564, "isConstant": false, "isLValue": false, "isPure": false, @@ -27521,15 +28737,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13791:77:6", + "src": "13974:77:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3373, + "id": 3565, "nodeType": "ExpressionStatement", - "src": "13791:77:6" + "src": "13974:77:8" }, { "condition": { @@ -27538,7 +28754,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3379, + "id": 3571, "isConstant": false, "isLValue": false, "isPure": false, @@ -27548,12 +28764,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3376, + "id": 3568, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "13992:12:6", + "referencedDeclaration": 3548, + "src": "14175:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27569,32 +28785,32 @@ ], "expression": { "argumentTypes": null, - "id": 3374, + "id": 3566, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "13946:6:6", + "referencedDeclaration": 2794, + "src": "14129:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3375, + "id": 3567, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "13946:45:6", + "referencedDeclaration": 1313, + "src": "14129:45:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 3377, + "id": 3569, "isConstant": false, "isLValue": false, "isPure": false, @@ -27602,7 +28818,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13946:59:6", + "src": "14129:59:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27613,14 +28829,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3378, + "id": 3570, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14009:1:6", + "src": "14192:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -27628,79 +28844,278 @@ }, "value": "0" }, - "src": "13946:64:6", + "src": "14129:64:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3388, + "id": 3583, "nodeType": "IfStatement", - "src": "13942:126:6", + "src": "14125:135:8", "trueBody": { - "id": 3387, + "id": 3582, "nodeType": "Block", - "src": "14012:56:6", + "src": "14195:65:8", "statements": [ { "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3576, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "14222:10:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } + }, + "id": 3578, + "indexExpression": { + "argumentTypes": null, + "id": 3577, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3548, + "src": "14233:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "14222:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3579, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "stake", + "nodeType": "MemberAccess", + "referencedDeclaration": 2775, + "src": "14222:30:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "32", + "id": 3573, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "14215:1:8", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + } + ], + "id": 3572, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "14210:4:8", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" + }, + "id": 3574, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14210:7:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3575, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "14210:11:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } }, - "id": 3385, + "id": 3580, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "leftExpression": { + "names": [], + "nodeType": "FunctionCall", + "src": "14210:43:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "functionReturnParameters": 3552, + "id": 3581, + "nodeType": "Return", + "src": "14203:50:8" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { "argumentTypes": null, - "hexValue": "32", - "id": 3380, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "14027:1:6", - "subdenomination": null, + "id": 3594, + "name": "challenges", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2786, + "src": "14321:10:8", "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", + "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" + } }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + "id": 3596, + "indexExpression": { + "argumentTypes": null, + "id": 3595, + "name": "_challengeID", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3548, + "src": "14332:12:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "14321:24:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Challenge_$2782_storage", + "typeString": "struct Registry.Challenge storage ref" + } + }, + "id": 3597, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "rewardPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 2769, + "src": "14321:35:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3381, + "id": 3588, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14031:10:6", + "referencedDeclaration": 2786, + "src": "14285:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3383, + "id": 3590, "indexExpression": { "argumentTypes": null, - "id": 3382, + "id": 3589, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14042:12:6", + "referencedDeclaration": 3548, + "src": "14296:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27711,235 +29126,155 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14031:24:6", + "src": "14285:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3384, + "id": 3591, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "stake", "nodeType": "MemberAccess", - "referencedDeclaration": 2612, - "src": "14031:30:6", + "referencedDeclaration": 2775, + "src": "14285:30:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } - }, - "src": "14027:34:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" } - }, - "functionReturnParameters": 3360, - "id": 3386, - "nodeType": "Return", - "src": "14020:41:6" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3400, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 3394, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "hexValue": "32", - "id": 3389, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "14082:1:6", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_2_by_1", - "typeString": "int_const 2" - }, - "value": "2" - }, - "nodeType": "BinaryOperation", - "operator": "*", - "rightExpression": { + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 3390, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14086:10:6", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", - "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" - } - }, - "id": 3392, - "indexExpression": { + "arguments": [ + { "argumentTypes": null, - "id": 3391, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14097:12:6", + "hexValue": "32", + "id": 3585, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "14278:1:8", + "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" + }, + "value": "2" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_2_by_1", + "typeString": "int_const 2" } - }, + ], + "id": 3584, "isConstant": false, - "isLValue": true, - "isPure": false, + "isLValue": false, + "isPure": true, "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "14086:24:6", + "nodeType": "ElementaryTypeNameExpression", + "src": "14273:4:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", - "typeString": "struct Registry.Challenge storage ref" - } + "typeIdentifier": "t_type$_t_uint256_$", + "typeString": "type(uint256)" + }, + "typeName": "uint" }, - "id": 3393, + "id": 3586, "isConstant": false, - "isLValue": true, - "isPure": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", "lValueRequested": false, - "memberName": "stake", - "nodeType": "MemberAccess", - "referencedDeclaration": 2612, - "src": "14086:30:6", + "names": [], + "nodeType": "FunctionCall", + "src": "14273:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "14082:34:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "id": 3395, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "14081:36:6", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "id": 3396, - "name": "challenges", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14120:10:6", - "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", - "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" - } - }, - "id": 3398, - "indexExpression": { - "argumentTypes": null, - "id": 3397, - "name": "_challengeID", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3356, - "src": "14131:12:6", + "id": 3587, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 3832, + "src": "14273:11:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, + "id": 3592, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "IndexAccess", - "src": "14120:24:6", + "names": [], + "nodeType": "FunctionCall", + "src": "14273:43:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", - "typeString": "struct Registry.Challenge storage ref" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 3399, + "id": 3593, "isConstant": false, - "isLValue": true, + "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "rewardPool", + "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "14120:35:6", + "referencedDeclaration": 3866, + "src": "14273:47:8", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "src": "14081:74:6", + "id": 3598, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14273:84:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3360, - "id": 3401, + "functionReturnParameters": 3552, + "id": 3599, "nodeType": "Return", - "src": "14074:81:6" + "src": "14266:91:8" } ] }, "documentation": "@dev Determines the number of tokens awarded to the winning party in a challenge.\n@param _challengeID The challengeID to determine a reward for", - "id": 3403, + "id": 3601, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -27947,16 +29282,16 @@ "name": "determineReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 3357, + "id": 3549, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3356, + "id": 3548, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3403, - "src": "13739:17:6", + "scope": 3601, + "src": "13922:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27964,10 +29299,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3355, + "id": 3547, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13739:4:6", + "src": "13922:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27977,20 +29312,20 @@ "visibility": "internal" } ], - "src": "13738:19:6" + "src": "13921:19:8" }, "payable": false, "returnParameters": { - "id": 3360, + "id": 3552, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3359, + "id": 3551, "name": "", "nodeType": "VariableDeclaration", - "scope": 3403, - "src": "13779:4:6", + "scope": 3601, + "src": "13962:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27998,10 +29333,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3358, + "id": 3550, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "13779:4:6", + "src": "13962:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28011,19 +29346,19 @@ "visibility": "internal" } ], - "src": "13778:6:6" + "src": "13961:6:8" }, - "scope": 3593, - "src": "13714:446:6", + "scope": 3797, + "src": "13897:465:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3419, + "id": 3617, "nodeType": "Block", - "src": "14458:62:6", + "src": "14660:62:8", "statements": [ { "expression": { @@ -28034,26 +29369,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3412, + "id": 3610, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "14471:10:6", + "referencedDeclaration": 2786, + "src": "14673:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3414, + "id": 3612, "indexExpression": { "argumentTypes": null, - "id": 3413, + "id": 3611, "name": "_challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3405, - "src": "14482:12:6", + "referencedDeclaration": 3603, + "src": "14684:12:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28064,35 +29399,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14471:24:6", + "src": "14673:24:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3415, + "id": 3613, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenClaims", "nodeType": "MemberAccess", - "referencedDeclaration": 2618, - "src": "14471:36:6", + "referencedDeclaration": 2781, + "src": "14673:36:8", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3417, + "id": 3615, "indexExpression": { "argumentTypes": null, - "id": 3416, + "id": 3614, "name": "_voter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3407, - "src": "14508:6:6", + "referencedDeclaration": 3605, + "src": "14710:6:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28103,21 +29438,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14471:44:6", + "src": "14673:44:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 3411, - "id": 3418, + "functionReturnParameters": 3609, + "id": 3616, "nodeType": "Return", - "src": "14464:51:6" + "src": "14666:51:8" } ] }, "documentation": "@dev Getter for Challenge tokenClaims mappings\n@param _challengeID The challengeID to query\n@param _voter The voter whose claim status to query for the provided challengeID", - "id": 3420, + "id": 3618, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -28125,16 +29460,16 @@ "name": "tokenClaims", "nodeType": "FunctionDefinition", "parameters": { - "id": 3408, + "id": 3606, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3405, + "id": 3603, "name": "_challengeID", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14396:17:6", + "scope": 3618, + "src": "14598:17:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28142,10 +29477,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3404, + "id": 3602, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14396:4:6", + "src": "14598:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28156,11 +29491,11 @@ }, { "constant": false, - "id": 3407, + "id": 3605, "name": "_voter", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14415:14:6", + "scope": 3618, + "src": "14617:14:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28168,10 +29503,10 @@ "typeString": "address" }, "typeName": { - "id": 3406, + "id": 3604, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14415:7:6", + "src": "14617:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28181,20 +29516,20 @@ "visibility": "internal" } ], - "src": "14395:35:6" + "src": "14597:35:8" }, "payable": false, "returnParameters": { - "id": 3411, + "id": 3609, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3410, + "id": 3608, "name": "", "nodeType": "VariableDeclaration", - "scope": 3420, - "src": "14452:4:6", + "scope": 3618, + "src": "14654:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28202,10 +29537,10 @@ "typeString": "bool" }, "typeName": { - "id": 3409, + "id": 3607, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "14452:4:6", + "src": "14654:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28215,32 +29550,32 @@ "visibility": "internal" } ], - "src": "14451:6:6" + "src": "14653:6:8" }, - "scope": 3593, - "src": "14375:145:6", + "scope": 3797, + "src": "14577:145:8", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 3514, + "id": 3718, "nodeType": "Block", - "src": "14900:1308:6", + "src": "15102:1351:8", "statements": [ { "assignments": [ - 3426 + 3624 ], "declarations": [ { "constant": false, - "id": 3426, + "id": 3624, "name": "challengeID", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "14906:16:6", + "scope": 3719, + "src": "15108:16:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28248,10 +29583,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3425, + "id": 3623, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "14906:4:6", + "src": "15108:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28261,33 +29596,33 @@ "visibility": "internal" } ], - "id": 3431, + "id": 3629, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3427, + "id": 3625, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "14925:8:6", + "referencedDeclaration": 2790, + "src": "15127:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3429, + "id": 3627, "indexExpression": { "argumentTypes": null, - "id": 3428, + "id": 3626, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "14934:12:6", + "referencedDeclaration": 3620, + "src": "15136:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28298,41 +29633,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14925:22:6", + "src": "15127:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3430, + "id": 3628, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challengeID", "nodeType": "MemberAccess", - "referencedDeclaration": 2603, - "src": "14925:34:6", + "referencedDeclaration": 2766, + "src": "15127:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "14906:53:6" + "src": "15108:53:8" }, { "assignments": [ - 3433 + 3631 ], "declarations": [ { "constant": false, - "id": 3433, + "id": 3631, "name": "reward", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "15080:11:6", + "scope": 3719, + "src": "15282:11:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28340,10 +29675,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3432, + "id": 3630, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "15080:4:6", + "src": "15282:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28353,18 +29688,18 @@ "visibility": "internal" } ], - "id": 3437, + "id": 3635, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3435, + "id": 3633, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15110:11:6", + "referencedDeclaration": 3624, + "src": "15312:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28378,18 +29713,18 @@ "typeString": "uint256" } ], - "id": 3434, + "id": 3632, "name": "determineReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3403, - "src": "15094:15:6", + "referencedDeclaration": 3601, + "src": "15296:15:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view returns (uint256)" } }, - "id": 3436, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, @@ -28397,19 +29732,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15094:28:6", + "src": "15296:28:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "15080:42:6" + "src": "15282:42:8" }, { "expression": { "argumentTypes": null, - "id": 3443, + "id": 3641, "isConstant": false, "isLValue": false, "isPure": false, @@ -28420,26 +29755,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3438, + "id": 3636, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15175:10:6", + "referencedDeclaration": 2786, + "src": "15377:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3440, + "id": 3638, "indexExpression": { "argumentTypes": null, - "id": 3439, + "id": 3637, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15186:11:6", + "referencedDeclaration": 3624, + "src": "15388:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28450,21 +29785,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15175:23:6", + "src": "15377:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3441, + "id": 3639, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "resolved", "nodeType": "MemberAccess", - "referencedDeclaration": 2610, - "src": "15175:32:6", + "referencedDeclaration": 2773, + "src": "15377:32:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28475,14 +29810,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3442, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15210:4:6", + "src": "15412:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -28490,20 +29825,20 @@ }, "value": "true" }, - "src": "15175:39:6", + "src": "15377:39:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3444, + "id": 3642, "nodeType": "ExpressionStatement", - "src": "15175:39:6" + "src": "15377:39:8" }, { "expression": { "argumentTypes": null, - "id": 3453, + "id": 3651, "isConstant": false, "isLValue": false, "isPure": false, @@ -28514,26 +29849,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3445, + "id": 3643, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15308:10:6", + "referencedDeclaration": 2786, + "src": "15510:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3447, + "id": 3645, "indexExpression": { "argumentTypes": null, - "id": 3446, + "id": 3644, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15319:11:6", + "referencedDeclaration": 3624, + "src": "15521:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28544,21 +29879,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15308:23:6", + "src": "15510:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3448, + "id": 3646, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "15308:35:6", + "referencedDeclaration": 2777, + "src": "15510:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28571,12 +29906,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3451, + "id": 3649, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15392:11:6", + "referencedDeclaration": 3624, + "src": "15594:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28592,32 +29927,32 @@ ], "expression": { "argumentTypes": null, - "id": 3449, + "id": 3647, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "15346:6:6", + "referencedDeclaration": 2794, + "src": "15548:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3450, + "id": 3648, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTotalNumberOfTokensForWinningOption", "nodeType": "MemberAccess", - "referencedDeclaration": 1166, - "src": "15346:45:6", + "referencedDeclaration": 1313, + "src": "15548:45:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 3452, + "id": 3650, "isConstant": false, "isLValue": false, "isPure": false, @@ -28625,21 +29960,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15346:58:6", + "src": "15548:58:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15308:96:6", + "src": "15510:96:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3454, + "id": 3652, "nodeType": "ExpressionStatement", - "src": "15308:96:6" + "src": "15510:96:8" }, { "condition": { @@ -28647,12 +29982,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3457, + "id": 3655, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15461:11:6", + "referencedDeclaration": 3624, + "src": "15663:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28668,32 +30003,32 @@ ], "expression": { "argumentTypes": null, - "id": 3455, + "id": 3653, "name": "voting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2631, - "src": "15445:6:6", + "referencedDeclaration": 2794, + "src": "15647:6:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_PLCRVoting_$1471", + "typeIdentifier": "t_contract$_PLCRVoting_$1618", "typeString": "contract PLCRVoting" } }, - "id": 3456, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "isPassed", "nodeType": "MemberAccess", - "referencedDeclaration": 1138, - "src": "15445:15:6", + "referencedDeclaration": 1285, + "src": "15647:15:8", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint256) view external returns (bool)" } }, - "id": 3458, + "id": 3656, "isConstant": false, "isLValue": false, "isPure": false, @@ -28701,16 +30036,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15445:28:6", + "src": "15647:28:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3512, + "id": 3716, "nodeType": "Block", - "src": "15823:381:6", + "src": "16068:381:8", "statements": [ { "expression": { @@ -28718,12 +30053,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3485, + "id": 3689, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15889:12:6", + "referencedDeclaration": 3620, + "src": "16134:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28737,18 +30072,18 @@ "typeString": "bytes32" } ], - "id": 3484, + "id": 3688, "name": "resetListing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3592, - "src": "15876:12:6", + "referencedDeclaration": 3796, + "src": "16121:12:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3486, + "id": 3690, "isConstant": false, "isLValue": false, "isPure": false, @@ -28756,15 +30091,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15876:26:6", + "src": "16121:26:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3487, + "id": 3691, "nodeType": "ExpressionStatement", - "src": "15876:26:6" + "src": "16121:26:8" }, { "expression": { @@ -28779,26 +30114,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3491, + "id": 3695, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15980:10:6", + "referencedDeclaration": 2786, + "src": "16225:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3493, + "id": 3697, "indexExpression": { "argumentTypes": null, - "id": 3492, + "id": 3696, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15991:11:6", + "referencedDeclaration": 3624, + "src": "16236:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28809,21 +30144,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15980:23:6", + "src": "16225:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3494, + "id": 3698, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "challenger", "nodeType": "MemberAccess", - "referencedDeclaration": 2608, - "src": "15980:34:6", + "referencedDeclaration": 2771, + "src": "16225:34:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28831,12 +30166,12 @@ }, { "argumentTypes": null, - "id": 3495, + "id": 3699, "name": "reward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3433, - "src": "16016:6:6", + "referencedDeclaration": 3631, + "src": "16261:6:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28856,32 +30191,32 @@ ], "expression": { "argumentTypes": null, - "id": 3489, + "id": 3693, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "15965:5:6", + "referencedDeclaration": 2792, + "src": "16210:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3490, + "id": 3694, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "15965:14:6", + "referencedDeclaration": 551, + "src": "16210:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3496, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -28889,7 +30224,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15965:58:6", + "src": "16210:58:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28903,21 +30238,21 @@ "typeString": "bool" } ], - "id": 3488, + "id": 3692, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "15957:7:6", + "referencedDeclaration": 4156, + "src": "16202:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3497, + "id": 3701, "isConstant": false, "isLValue": false, "isPure": false, @@ -28925,15 +30260,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15957:67:6", + "src": "16202:67:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3498, + "id": 3702, "nodeType": "ExpressionStatement", - "src": "15957:67:6" + "src": "16202:67:8" }, { "eventCall": { @@ -28941,12 +30276,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3500, + "id": 3704, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "16067:12:6", + "referencedDeclaration": 3620, + "src": "16312:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -28954,12 +30289,12 @@ }, { "argumentTypes": null, - "id": 3501, + "id": 3705, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16089:11:6", + "referencedDeclaration": 3624, + "src": "16334:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28971,26 +30306,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3502, + "id": 3706, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "16110:10:6", + "referencedDeclaration": 2786, + "src": "16355:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3504, + "id": 3708, "indexExpression": { "argumentTypes": null, - "id": 3503, + "id": 3707, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16121:11:6", + "referencedDeclaration": 3624, + "src": "16366:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29001,21 +30336,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16110:23:6", + "src": "16355:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3505, + "id": 3709, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "16110:34:6", + "referencedDeclaration": 2769, + "src": "16355:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29027,26 +30362,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3506, + "id": 3710, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "16154:10:6", + "referencedDeclaration": 2786, + "src": "16399:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3508, + "id": 3712, "indexExpression": { "argumentTypes": null, - "id": 3507, + "id": 3711, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "16165:11:6", + "referencedDeclaration": 3624, + "src": "16410:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29057,21 +30392,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16154:23:6", + "src": "16399:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3509, + "id": 3713, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "16154:35:6", + "referencedDeclaration": 2777, + "src": "16399:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29097,18 +30432,18 @@ "typeString": "uint256" } ], - "id": 3499, + "id": 3703, "name": "_ChallengeSucceeded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2582, - "src": "16038:19:6", + "referencedDeclaration": 2745, + "src": "16283:19:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 3510, + "id": 3714, "isConstant": false, "isLValue": false, "isPure": false, @@ -29116,25 +30451,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16038:159:6", + "src": "16283:159:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3511, + "id": 3715, "nodeType": "EmitStatement", - "src": "16033:164:6" + "src": "16278:164:8" } ] }, - "id": 3513, + "id": 3717, "nodeType": "IfStatement", - "src": "15441:763:6", + "src": "15643:806:8", "trueBody": { - "id": 3483, + "id": 3687, "nodeType": "Block", - "src": "15475:342:6", + "src": "15677:385:8", "statements": [ { "expression": { @@ -29142,12 +30477,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3460, + "id": 3658, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15504:12:6", + "referencedDeclaration": 3620, + "src": "15706:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29161,18 +30496,18 @@ "typeString": "bytes32" } ], - "id": 3459, + "id": 3657, "name": "whitelistApplication", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3539, - "src": "15483:20:6", + "referencedDeclaration": 3743, + "src": "15685:20:8", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3461, + "id": 3659, "isConstant": false, "isLValue": false, "isPure": false, @@ -29180,20 +30515,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15483:34:6", + "src": "15685:34:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3462, + "id": 3660, "nodeType": "ExpressionStatement", - "src": "15483:34:6" + "src": "15685:34:8" }, { "expression": { "argumentTypes": null, - "id": 3468, + "id": 3672, "isConstant": false, "isLValue": false, "isPure": false, @@ -29204,26 +30539,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3463, + "id": 3661, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "15592:8:6", + "referencedDeclaration": 2790, + "src": "15794:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3465, + "id": 3663, "indexExpression": { "argumentTypes": null, - "id": 3464, + "id": 3662, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15601:12:6", + "referencedDeclaration": 3620, + "src": "15803:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29234,50 +30569,145 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15592:22:6", + "src": "15794:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3466, + "id": 3664, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "15592:38:6", + "referencedDeclaration": 2764, + "src": "15794:38:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "Assignment", - "operator": "+=", + "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3467, - "name": "reward", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3433, - "src": "15634:6:6", + "arguments": [ + { + "argumentTypes": null, + "id": 3670, + "name": "reward", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3631, + "src": "15878:6:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 3665, + "name": "listings", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2790, + "src": "15835:8:8", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", + "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" + } + }, + "id": 3667, + "indexExpression": { + "argumentTypes": null, + "id": 3666, + "name": "_listingHash", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3620, + "src": "15844:12:8", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "15835:22:8", + "typeDescriptions": { + "typeIdentifier": "t_struct$_Listing_$2767_storage", + "typeString": "struct Registry.Listing storage ref" + } + }, + "id": 3668, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "unstakedDeposit", + "nodeType": "MemberAccess", + "referencedDeclaration": 2764, + "src": "15835:38:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 3669, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 3890, + "src": "15835:42:8", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 3671, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "15835:50:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15592:48:6", + "src": "15794:91:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3469, + "id": 3673, "nodeType": "ExpressionStatement", - "src": "15592:48:6" + "src": "15794:91:8" }, { "eventCall": { @@ -29285,12 +30715,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3471, + "id": 3675, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3422, - "src": "15680:12:6", + "referencedDeclaration": 3620, + "src": "15925:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29298,12 +30728,12 @@ }, { "argumentTypes": null, - "id": 3472, + "id": 3676, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15702:11:6", + "referencedDeclaration": 3624, + "src": "15947:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29315,26 +30745,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3473, + "id": 3677, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15723:10:6", + "referencedDeclaration": 2786, + "src": "15968:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3475, + "id": 3679, "indexExpression": { "argumentTypes": null, - "id": 3474, + "id": 3678, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15734:11:6", + "referencedDeclaration": 3624, + "src": "15979:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29345,21 +30775,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15723:23:6", + "src": "15968:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3476, + "id": 3680, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "rewardPool", "nodeType": "MemberAccess", - "referencedDeclaration": 2606, - "src": "15723:34:6", + "referencedDeclaration": 2769, + "src": "15968:34:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29371,26 +30801,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3477, + "id": 3681, "name": "challenges", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2623, - "src": "15767:10:6", + "referencedDeclaration": 2786, + "src": "16012:10:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2619_storage_$", + "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Challenge_$2782_storage_$", "typeString": "mapping(uint256 => struct Registry.Challenge storage ref)" } }, - "id": 3479, + "id": 3683, "indexExpression": { "argumentTypes": null, - "id": 3478, + "id": 3682, "name": "challengeID", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, - "src": "15778:11:6", + "referencedDeclaration": 3624, + "src": "16023:11:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29401,21 +30831,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15767:23:6", + "src": "16012:23:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Challenge_$2619_storage", + "typeIdentifier": "t_struct$_Challenge_$2782_storage", "typeString": "struct Registry.Challenge storage ref" } }, - "id": 3480, + "id": 3684, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "totalTokens", "nodeType": "MemberAccess", - "referencedDeclaration": 2614, - "src": "15767:35:6", + "referencedDeclaration": 2777, + "src": "16012:35:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29441,18 +30871,18 @@ "typeString": "uint256" } ], - "id": 3470, + "id": 3674, "name": "_ChallengeFailed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2572, - "src": "15654:16:6", + "referencedDeclaration": 2735, + "src": "15899:16:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint256,uint256,uint256)" } }, - "id": 3481, + "id": 3685, "isConstant": false, "isLValue": false, "isPure": false, @@ -29460,15 +30890,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15654:156:6", + "src": "15899:156:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3482, + "id": 3686, "nodeType": "EmitStatement", - "src": "15649:161:6" + "src": "15894:161:8" } ] } @@ -29476,7 +30906,7 @@ ] }, "documentation": "@dev Determines the winner in a challenge. Rewards the winner tokens and\neither whitelists or de-whitelists the listingHash.\n@param _listingHash A listingHash with a challenge that is to be resolved", - "id": 3515, + "id": 3719, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -29484,16 +30914,16 @@ "name": "resolveChallenge", "nodeType": "FunctionDefinition", "parameters": { - "id": 3423, + "id": 3621, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3422, + "id": 3620, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3515, - "src": "14870:20:6", + "scope": 3719, + "src": "15072:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29501,10 +30931,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3421, + "id": 3619, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14870:7:6", + "src": "15072:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29514,31 +30944,31 @@ "visibility": "internal" } ], - "src": "14869:22:6" + "src": "15071:22:8" }, "payable": false, "returnParameters": { - "id": 3424, + "id": 3622, "nodeType": "ParameterList", "parameters": [], - "src": "14900:0:6" + "src": "15102:0:8" }, - "scope": 3593, - "src": "14844:1364:6", + "scope": 3797, + "src": "15046:1407:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 3538, + "id": 3742, "nodeType": "Block", - "src": "16602:143:6", + "src": "16847:143:8", "statements": [ { "condition": { "argumentTypes": null, - "id": 3524, + "id": 3728, "isConstant": false, "isLValue": false, "isPure": false, @@ -29546,33 +30976,33 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "16612:35:6", + "src": "16857:35:8", "subExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3520, + "id": 3724, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16613:8:6", + "referencedDeclaration": 2790, + "src": "16858:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3522, + "id": 3726, "indexExpression": { "argumentTypes": null, - "id": 3521, + "id": 3725, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16622:12:6", + "referencedDeclaration": 3721, + "src": "16867:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29583,21 +31013,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16613:22:6", + "src": "16858:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3523, + "id": 3727, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "16613:34:6", + "referencedDeclaration": 2760, + "src": "16858:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -29609,13 +31039,13 @@ } }, "falseBody": null, - "id": 3530, + "id": 3734, "nodeType": "IfStatement", - "src": "16608:86:6", + "src": "16853:86:8", "trueBody": { - "id": 3529, + "id": 3733, "nodeType": "Block", - "src": "16649:45:6", + "src": "16894:45:8", "statements": [ { "eventCall": { @@ -29623,12 +31053,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3526, + "id": 3730, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16679:12:6", + "referencedDeclaration": 3721, + "src": "16924:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29642,18 +31072,18 @@ "typeString": "bytes32" } ], - "id": 3525, + "id": 3729, "name": "_ApplicationWhitelisted", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "16655:23:6", + "referencedDeclaration": 2709, + "src": "16900:23:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3527, + "id": 3731, "isConstant": false, "isLValue": false, "isPure": false, @@ -29661,15 +31091,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16655:37:6", + "src": "16900:37:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3528, + "id": 3732, "nodeType": "EmitStatement", - "src": "16650:42:6" + "src": "16895:42:8" } ] } @@ -29677,7 +31107,7 @@ { "expression": { "argumentTypes": null, - "id": 3536, + "id": 3740, "isConstant": false, "isLValue": false, "isPure": false, @@ -29688,26 +31118,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3531, + "id": 3735, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16699:8:6", + "referencedDeclaration": 2790, + "src": "16944:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3533, + "id": 3737, "indexExpression": { "argumentTypes": null, - "id": 3532, + "id": 3736, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3517, - "src": "16708:12:6", + "referencedDeclaration": 3721, + "src": "16953:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29718,21 +31148,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16699:22:6", + "src": "16944:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, - "id": 3534, + "id": 3738, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "16699:34:6", + "referencedDeclaration": 2760, + "src": "16944:34:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -29743,14 +31173,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3535, + "id": 3739, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16736:4:6", + "src": "16981:4:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -29758,20 +31188,20 @@ }, "value": "true" }, - "src": "16699:41:6", + "src": "16944:41:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 3537, + "id": 3741, "nodeType": "ExpressionStatement", - "src": "16699:41:6" + "src": "16944:41:8" } ] }, "documentation": "@dev Called by updateStatus() if the applicationExpiry date passed without a\nchallenge being made. Called by resolveChallenge() if an\napplication/listing beat a challenge.\n@param _listingHash The listingHash of an application/listingHash to be whitelisted", - "id": 3539, + "id": 3743, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -29779,16 +31209,16 @@ "name": "whitelistApplication", "nodeType": "FunctionDefinition", "parameters": { - "id": 3518, + "id": 3722, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3517, + "id": 3721, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3539, - "src": "16572:20:6", + "scope": 3743, + "src": "16817:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29796,10 +31226,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3516, + "id": 3720, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16572:7:6", + "src": "16817:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29809,54 +31239,54 @@ "visibility": "internal" } ], - "src": "16571:22:6" + "src": "16816:22:8" }, "payable": false, "returnParameters": { - "id": 3519, + "id": 3723, "nodeType": "ParameterList", "parameters": [], - "src": "16602:0:6" + "src": "16847:0:8" }, - "scope": 3593, - "src": "16542:203:6", + "scope": 3797, + "src": "16787:203:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 3591, + "id": 3795, "nodeType": "Block", - "src": "16959:589:6", + "src": "17204:589:8", "statements": [ { "assignments": [ - 3545 + 3749 ], "declarations": [ { "constant": false, - "id": 3545, + "id": 3749, "name": "listing", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "16965:23:6", + "scope": 3796, + "src": "17210:23:8", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" }, "typeName": { "contractScope": null, - "id": 3544, + "id": 3748, "name": "Listing", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2604, - "src": "16965:7:6", + "referencedDeclaration": 2767, + "src": "17210:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing" } }, @@ -29864,31 +31294,31 @@ "visibility": "internal" } ], - "id": 3549, + "id": 3753, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3546, + "id": 3750, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "16991:8:6", + "referencedDeclaration": 2790, + "src": "17236:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3548, + "id": 3752, "indexExpression": { "argumentTypes": null, - "id": 3547, + "id": 3751, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17000:12:6", + "referencedDeclaration": 3745, + "src": "17245:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29899,49 +31329,49 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16991:22:6", + "src": "17236:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "16965:48:6" + "src": "17210:48:8" }, { "condition": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3550, + "id": 3754, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17099:7:6", + "referencedDeclaration": 3749, + "src": "17344:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3551, + "id": 3755, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "whitelisted", "nodeType": "MemberAccess", - "referencedDeclaration": 2597, - "src": "17099:19:6", + "referencedDeclaration": 2760, + "src": "17344:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 3561, + "id": 3765, "nodeType": "Block", - "src": "17175:53:6", + "src": "17420:53:8", "statements": [ { "eventCall": { @@ -29949,12 +31379,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3762, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17208:12:6", + "referencedDeclaration": 3745, + "src": "17453:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29968,18 +31398,18 @@ "typeString": "bytes32" } ], - "id": 3557, + "id": 3761, "name": "_ApplicationRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2550, - "src": "17188:19:6", + "referencedDeclaration": 2713, + "src": "17433:19:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3559, + "id": 3763, "isConstant": false, "isLValue": false, "isPure": false, @@ -29987,25 +31417,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17188:33:6", + "src": "17433:33:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3560, + "id": 3764, "nodeType": "EmitStatement", - "src": "17183:38:6" + "src": "17428:38:8" } ] }, - "id": 3562, + "id": 3766, "nodeType": "IfStatement", - "src": "17095:133:6", + "src": "17340:133:8", "trueBody": { - "id": 3556, + "id": 3760, "nodeType": "Block", - "src": "17120:49:6", + "src": "17365:49:8", "statements": [ { "eventCall": { @@ -30013,12 +31443,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3553, + "id": 3757, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17149:12:6", + "referencedDeclaration": 3745, + "src": "17394:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30032,18 +31462,18 @@ "typeString": "bytes32" } ], - "id": 3552, + "id": 3756, "name": "_ListingRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2554, - "src": "17133:15:6", + "referencedDeclaration": 2717, + "src": "17378:15:8", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$returns$__$", "typeString": "function (bytes32)" } }, - "id": 3554, + "id": 3758, "isConstant": false, "isLValue": false, "isPure": false, @@ -30051,31 +31481,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17133:29:6", + "src": "17378:29:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3555, + "id": 3759, "nodeType": "EmitStatement", - "src": "17128:34:6" + "src": "17373:34:8" } ] } }, { "assignments": [ - 3564 + 3768 ], "declarations": [ { "constant": false, - "id": 3564, + "id": 3768, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "17277:13:6", + "scope": 3796, + "src": "17522:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30083,10 +31513,10 @@ "typeString": "address" }, "typeName": { - "id": 3563, + "id": 3767, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17277:7:6", + "src": "17522:7:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -30096,51 +31526,51 @@ "visibility": "internal" } ], - "id": 3567, + "id": 3771, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3565, + "id": 3769, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17293:7:6", + "referencedDeclaration": 3749, + "src": "17538:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3566, + "id": 3770, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "owner", "nodeType": "MemberAccess", - "referencedDeclaration": 2599, - "src": "17293:13:6", + "referencedDeclaration": 2762, + "src": "17538:13:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "17277:29:6" + "src": "17522:29:8" }, { "assignments": [ - 3569 + 3773 ], "declarations": [ { "constant": false, - "id": 3569, + "id": 3773, "name": "unstakedDeposit", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "17312:20:6", + "scope": 3796, + "src": "17557:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30148,10 +31578,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3568, + "id": 3772, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17312:4:6", + "src": "17557:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30161,43 +31591,43 @@ "visibility": "internal" } ], - "id": 3572, + "id": 3776, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3570, + "id": 3774, "name": "listing", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3545, - "src": "17335:7:6", + "referencedDeclaration": 3749, + "src": "17580:7:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage_ptr", + "typeIdentifier": "t_struct$_Listing_$2767_storage_ptr", "typeString": "struct Registry.Listing storage pointer" } }, - "id": 3571, + "id": 3775, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "unstakedDeposit", "nodeType": "MemberAccess", - "referencedDeclaration": 2601, - "src": "17335:23:6", + "referencedDeclaration": 2764, + "src": "17580:23:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "17312:46:6" + "src": "17557:46:8" }, { "expression": { "argumentTypes": null, - "id": 3576, + "id": 3780, "isConstant": false, "isLValue": false, "isPure": false, @@ -30205,31 +31635,31 @@ "nodeType": "UnaryOperation", "operator": "delete", "prefix": true, - "src": "17364:29:6", + "src": "17609:29:8", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3573, + "id": 3777, "name": "listings", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2627, - "src": "17371:8:6", + "referencedDeclaration": 2790, + "src": "17616:8:8", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2604_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Listing_$2767_storage_$", "typeString": "mapping(bytes32 => struct Registry.Listing storage ref)" } }, - "id": 3575, + "id": 3779, "indexExpression": { "argumentTypes": null, - "id": 3574, + "id": 3778, "name": "_listingHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, - "src": "17380:12:6", + "referencedDeclaration": 3745, + "src": "17625:12:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30240,9 +31670,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "17371:22:6", + "src": "17616:22:8", "typeDescriptions": { - "typeIdentifier": "t_struct$_Listing_$2604_storage", + "typeIdentifier": "t_struct$_Listing_$2767_storage", "typeString": "struct Registry.Listing storage ref" } }, @@ -30251,9 +31681,9 @@ "typeString": "tuple()" } }, - "id": 3577, + "id": 3781, "nodeType": "ExpressionStatement", - "src": "17364:29:6" + "src": "17609:29:8" }, { "condition": { @@ -30262,19 +31692,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3580, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3578, + "id": 3782, "name": "unstakedDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3569, - "src": "17461:15:6", + "referencedDeclaration": 3773, + "src": "17706:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30285,14 +31715,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3579, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17479:1:6", + "src": "17724:1:8", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -30300,20 +31730,20 @@ }, "value": "0" }, - "src": "17461:19:6", + "src": "17706:19:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3590, + "id": 3794, "nodeType": "IfStatement", - "src": "17457:87:6", + "src": "17702:87:8", "trueBody": { - "id": 3589, + "id": 3793, "nodeType": "Block", - "src": "17482:62:6", + "src": "17727:62:8", "statements": [ { "expression": { @@ -30324,12 +31754,12 @@ "arguments": [ { "argumentTypes": null, - "id": 3584, + "id": 3788, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3564, - "src": "17513:5:6", + "referencedDeclaration": 3768, + "src": "17758:5:8", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -30337,12 +31767,12 @@ }, { "argumentTypes": null, - "id": 3585, + "id": 3789, "name": "unstakedDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3569, - "src": "17520:15:6", + "referencedDeclaration": 3773, + "src": "17765:15:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30362,32 +31792,32 @@ ], "expression": { "argumentTypes": null, - "id": 3582, + "id": 3786, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2629, - "src": "17498:5:6", + "referencedDeclaration": 2792, + "src": "17743:5:8", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$408", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3583, + "id": 3787, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 431, - "src": "17498:14:6", + "referencedDeclaration": 551, + "src": "17743:14:8", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 3586, + "id": 3790, "isConstant": false, "isLValue": false, "isPure": false, @@ -30395,7 +31825,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17498:38:6", + "src": "17743:38:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -30409,21 +31839,21 @@ "typeString": "bool" } ], - "id": 3581, + "id": 3785, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 3705, - 3706 + 4156, + 4157 ], - "referencedDeclaration": 3705, - "src": "17490:7:6", + "referencedDeclaration": 4156, + "src": "17735:7:8", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3587, + "id": 3791, "isConstant": false, "isLValue": false, "isPure": false, @@ -30431,15 +31861,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17490:47:6", + "src": "17735:47:8", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3588, + "id": 3792, "nodeType": "ExpressionStatement", - "src": "17490:47:6" + "src": "17735:47:8" } ] } @@ -30447,7 +31877,7 @@ ] }, "documentation": "@dev Deletes a listingHash from the whitelist and transfers tokens back to owner\n@param _listingHash The listing hash to delete", - "id": 3592, + "id": 3796, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -30455,16 +31885,16 @@ "name": "resetListing", "nodeType": "FunctionDefinition", "parameters": { - "id": 3542, + "id": 3746, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3541, + "id": 3745, "name": "_listingHash", "nodeType": "VariableDeclaration", - "scope": 3592, - "src": "16929:20:6", + "scope": 3796, + "src": "17174:20:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30472,10 +31902,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 3540, + "id": 3744, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16929:7:6", + "src": "17174:7:8", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30485,27 +31915,27 @@ "visibility": "internal" } ], - "src": "16928:22:6" + "src": "17173:22:8" }, "payable": false, "returnParameters": { - "id": 3543, + "id": 3747, "nodeType": "ParameterList", "parameters": [], - "src": "16959:0:6" + "src": "17204:0:8" }, - "scope": 3593, - "src": "16907:641:6", + "scope": 3797, + "src": "17152:641:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 3594, - "src": "131:17419:6" + "scope": 3798, + "src": "131:17664:8" } ], - "src": "0:17551:6" + "src": "0:17796:8" }, "compiler": { "name": "solc", @@ -30513,5 +31943,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.380Z" + "updatedAt": "2018-06-26T02:58:22.343Z" } \ No newline at end of file diff --git a/build/contracts/SafeMath.json b/build/contracts/SafeMath.json index 4e61ad6..3c7fb1e 100644 --- a/build/contracts/SafeMath.json +++ b/build/contracts/SafeMath.json @@ -1,31 +1,31 @@ { "contractName": "SafeMath", "abi": [], - "bytecode": "0x604c602c600b82828239805160001a60731460008114601c57601e565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600080fd00a165627a7a7230582037fb7dd9177000bc20d24930cbc2c4657d0d02ced0bbd113619e0553eb4c006b0029", - "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fd00a165627a7a7230582037fb7dd9177000bc20d24930cbc2c4657d0d02ced0bbd113619e0553eb4c006b0029", - "sourceMap": "116:1222:7:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24", - "deployedSourceMap": "116:1222:7:-;;;;;;;;", + "bytecode": "0x604c602c600b82828239805160001a60731460008114601c57601e565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600080fd00a165627a7a72305820402dc8cd86b897c6cd9835cf805fe3bf3cbff984942c64026fdcfd94b0320c5e0029", + "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fd00a165627a7a72305820402dc8cd86b897c6cd9835cf805fe3bf3cbff984942c64026fdcfd94b0320c5e0029", + "sourceMap": "116:1222:9:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24", + "deployedSourceMap": "116:1222:9:-;;;;;;;;", "source": "pragma solidity 0.4.24;\n\n\n/**\n * @title SafeMath\n * @dev Math operations with safety checks that throw on error\n */\nlibrary SafeMath {\n\n /**\n * @dev Multiplies two numbers, throws on overflow.\n */\n function mul(uint256 a, uint256 b) internal pure returns (uint256 c) {\n // Gas optimization: this is cheaper than asserting 'a' not being zero, but the\n // benefit is lost if 'b' is also tested.\n // See: https://github.com/OpenZeppelin/openzeppelin-solidity/pull/522\n if (a == 0) {\n return 0;\n }\n\n c = a * b;\n assert(c / a == b);\n return c;\n }\n\n /**\n * @dev Integer division of two numbers, truncating the quotient.\n */\n function div(uint256 a, uint256 b) internal pure returns (uint256) {\n // assert(b > 0); // Solidity automatically throws when dividing by 0\n // uint256 c = a / b;\n // assert(a == b * c + a % b); // There is no case in which this doesn't hold\n return a / b;\n }\n\n /**\n * @dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).\n */\n function sub(uint256 a, uint256 b) internal pure returns (uint256) {\n assert(b <= a);\n return a - b;\n }\n\n /**\n * @dev Adds two numbers, throws on overflow.\n */\n function add(uint256 a, uint256 b) internal pure returns (uint256 c) {\n c = a + b;\n assert(c >= a);\n return c;\n }\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "sourcePath": "/home/bharath/computable/contracts/SafeMath.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "exportedSymbols": { "SafeMath": [ - 3687 + 3891 ] }, - "id": 3688, + "id": 3892, "nodeType": "SourceUnit", "nodes": [ { - "id": 3595, + "id": 3799, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:7" + "src": "0:23:9" }, { "baseContracts": [], @@ -33,18 +33,18 @@ "contractKind": "library", "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error", "fullyImplemented": true, - "id": 3687, + "id": 3891, "linearizedBaseContracts": [ - 3687 + 3891 ], "name": "SafeMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 3627, + "id": 3831, "nodeType": "Block", - "src": "271:304:7", + "src": "271:304:9", "statements": [ { "condition": { @@ -53,19 +53,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3606, + "id": 3810, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3604, + "id": 3808, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "486:1:7", + "referencedDeclaration": 3801, + "src": "486:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -76,14 +76,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3605, + "id": 3809, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "491:1:7", + "src": "491:1:9", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -91,33 +91,33 @@ }, "value": "0" }, - "src": "486:6:7", + "src": "486:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3610, + "id": 3814, "nodeType": "IfStatement", - "src": "482:35:7", + "src": "482:35:9", "trueBody": { - "id": 3609, + "id": 3813, "nodeType": "Block", - "src": "494:23:7", + "src": "494:23:9", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "30", - "id": 3607, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "509:1:7", + "src": "509:1:9", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -125,10 +125,10 @@ }, "value": "0" }, - "functionReturnParameters": 3603, - "id": 3608, + "functionReturnParameters": 3807, + "id": 3812, "nodeType": "Return", - "src": "502:8:7" + "src": "502:8:9" } ] } @@ -136,19 +136,19 @@ { "expression": { "argumentTypes": null, - "id": 3615, + "id": 3819, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3611, + "id": 3815, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "523:1:7", + "referencedDeclaration": 3806, + "src": "523:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -162,19 +162,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3614, + "id": 3818, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3612, + "id": 3816, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "527:1:7", + "referencedDeclaration": 3801, + "src": "527:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -184,32 +184,32 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 3613, + "id": 3817, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3599, - "src": "531:1:7", + "referencedDeclaration": 3803, + "src": "531:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "527:5:7", + "src": "527:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "523:9:7", + "src": "523:9:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3616, + "id": 3820, "nodeType": "ExpressionStatement", - "src": "523:9:7" + "src": "523:9:9" }, { "expression": { @@ -221,7 +221,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3622, + "id": 3826, "isConstant": false, "isLValue": false, "isPure": false, @@ -232,19 +232,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3620, + "id": 3824, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3618, + "id": 3822, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "545:1:7", + "referencedDeclaration": 3806, + "src": "545:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -254,18 +254,18 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3619, + "id": 3823, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "549:1:7", + "referencedDeclaration": 3801, + "src": "549:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "545:5:7", + "src": "545:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -275,18 +275,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 3621, + "id": 3825, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3599, - "src": "554:1:7", + "referencedDeclaration": 3803, + "src": "554:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "545:10:7", + "src": "545:10:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -300,18 +300,18 @@ "typeString": "bool" } ], - "id": 3617, + "id": 3821, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "538:6:7", + "referencedDeclaration": 4142, + "src": "538:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3623, + "id": 3827, "isConstant": false, "isLValue": false, "isPure": false, @@ -319,39 +319,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "538:18:7", + "src": "538:18:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3624, + "id": 3828, "nodeType": "ExpressionStatement", - "src": "538:18:7" + "src": "538:18:9" }, { "expression": { "argumentTypes": null, - "id": 3625, + "id": 3829, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "569:1:7", + "referencedDeclaration": 3806, + "src": "569:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3603, - "id": 3626, + "functionReturnParameters": 3807, + "id": 3830, "nodeType": "Return", - "src": "562:8:7" + "src": "562:8:9" } ] }, "documentation": "@dev Multiplies two numbers, throws on overflow.", - "id": 3628, + "id": 3832, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -359,16 +359,16 @@ "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3600, + "id": 3804, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3597, + "id": 3801, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "215:9:7", + "scope": 3832, + "src": "215:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -376,10 +376,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3596, + "id": 3800, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "215:7:7", + "src": "215:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -390,11 +390,11 @@ }, { "constant": false, - "id": 3599, + "id": 3803, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "226:9:7", + "scope": 3832, + "src": "226:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -402,10 +402,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3598, + "id": 3802, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "226:7:7", + "src": "226:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -415,20 +415,20 @@ "visibility": "internal" } ], - "src": "214:22:7" + "src": "214:22:9" }, "payable": false, "returnParameters": { - "id": 3603, + "id": 3807, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3602, + "id": 3806, "name": "c", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "260:9:7", + "scope": 3832, + "src": "260:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -436,10 +436,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3601, + "id": 3805, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "260:7:7", + "src": "260:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -449,19 +449,19 @@ "visibility": "internal" } ], - "src": "259:11:7" + "src": "259:11:9" }, - "scope": 3687, - "src": "202:373:7", + "scope": 3891, + "src": "202:373:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3641, + "id": 3845, "nodeType": "Block", - "src": "724:205:7", + "src": "724:205:9", "statements": [ { "expression": { @@ -470,19 +470,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3639, + "id": 3843, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3637, + "id": 3841, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3630, - "src": "919:1:7", + "referencedDeclaration": 3834, + "src": "919:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -492,32 +492,32 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3638, + "id": 3842, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, - "src": "923:1:7", + "referencedDeclaration": 3836, + "src": "923:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "919:5:7", + "src": "919:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3636, - "id": 3640, + "functionReturnParameters": 3840, + "id": 3844, "nodeType": "Return", - "src": "912:12:7" + "src": "912:12:9" } ] }, "documentation": "@dev Integer division of two numbers, truncating the quotient.", - "id": 3642, + "id": 3846, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -525,16 +525,16 @@ "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3837, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3630, + "id": 3834, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "670:9:7", + "scope": 3846, + "src": "670:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -542,10 +542,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3629, + "id": 3833, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "670:7:7", + "src": "670:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -556,11 +556,11 @@ }, { "constant": false, - "id": 3632, + "id": 3836, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "681:9:7", + "scope": 3846, + "src": "681:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -568,10 +568,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3631, + "id": 3835, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "681:7:7", + "src": "681:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -581,20 +581,20 @@ "visibility": "internal" } ], - "src": "669:22:7" + "src": "669:22:9" }, "payable": false, "returnParameters": { - "id": 3636, + "id": 3840, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3635, + "id": 3839, "name": "", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "715:7:7", + "scope": 3846, + "src": "715:7:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -602,10 +602,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3634, + "id": 3838, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "715:7:7", + "src": "715:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -615,19 +615,19 @@ "visibility": "internal" } ], - "src": "714:9:7" + "src": "714:9:9" }, - "scope": 3687, - "src": "657:272:7", + "scope": 3891, + "src": "657:272:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3661, + "id": 3865, "nodeType": "Block", - "src": "1108:43:7", + "src": "1108:43:9", "statements": [ { "expression": { @@ -639,19 +639,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3654, + "id": 3858, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3652, + "id": 3856, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3646, - "src": "1121:1:7", + "referencedDeclaration": 3850, + "src": "1121:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -661,18 +661,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3653, + "id": 3857, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3644, - "src": "1126:1:7", + "referencedDeclaration": 3848, + "src": "1126:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1121:6:7", + "src": "1121:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -686,18 +686,18 @@ "typeString": "bool" } ], - "id": 3651, + "id": 3855, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "1114:6:7", + "referencedDeclaration": 4142, + "src": "1114:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3655, + "id": 3859, "isConstant": false, "isLValue": false, "isPure": false, @@ -705,15 +705,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1114:14:7", + "src": "1114:14:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3656, + "id": 3860, "nodeType": "ExpressionStatement", - "src": "1114:14:7" + "src": "1114:14:9" }, { "expression": { @@ -722,19 +722,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3659, + "id": 3863, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3657, + "id": 3861, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3644, - "src": "1141:1:7", + "referencedDeclaration": 3848, + "src": "1141:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -744,32 +744,32 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 3658, + "id": 3862, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3646, - "src": "1145:1:7", + "referencedDeclaration": 3850, + "src": "1145:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1141:5:7", + "src": "1141:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3650, - "id": 3660, + "functionReturnParameters": 3854, + "id": 3864, "nodeType": "Return", - "src": "1134:12:7" + "src": "1134:12:9" } ] }, "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).", - "id": 3662, + "id": 3866, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -777,16 +777,16 @@ "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 3647, + "id": 3851, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3644, + "id": 3848, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1054:9:7", + "scope": 3866, + "src": "1054:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -794,10 +794,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3643, + "id": 3847, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1054:7:7", + "src": "1054:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -808,11 +808,11 @@ }, { "constant": false, - "id": 3646, + "id": 3850, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1065:9:7", + "scope": 3866, + "src": "1065:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -820,10 +820,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3645, + "id": 3849, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1065:7:7", + "src": "1065:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -833,20 +833,20 @@ "visibility": "internal" } ], - "src": "1053:22:7" + "src": "1053:22:9" }, "payable": false, "returnParameters": { - "id": 3650, + "id": 3854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3649, + "id": 3853, "name": "", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1099:7:7", + "scope": 3866, + "src": "1099:7:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -854,10 +854,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3648, + "id": 3852, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1099:7:7", + "src": "1099:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -867,36 +867,36 @@ "visibility": "internal" } ], - "src": "1098:9:7" + "src": "1098:9:9" }, - "scope": 3687, - "src": "1041:110:7", + "scope": 3891, + "src": "1041:110:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3685, + "id": 3889, "nodeType": "Block", - "src": "1282:54:7", + "src": "1282:54:9", "statements": [ { "expression": { "argumentTypes": null, - "id": 3675, + "id": 3879, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3671, + "id": 3875, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1288:1:7", + "referencedDeclaration": 3873, + "src": "1288:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -910,19 +910,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3674, + "id": 3878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3672, + "id": 3876, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3664, - "src": "1292:1:7", + "referencedDeclaration": 3868, + "src": "1292:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -932,32 +932,32 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 3673, + "id": 3877, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3666, - "src": "1296:1:7", + "referencedDeclaration": 3870, + "src": "1296:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1292:5:7", + "src": "1292:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1288:9:7", + "src": "1288:9:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3676, + "id": 3880, "nodeType": "ExpressionStatement", - "src": "1288:9:7" + "src": "1288:9:9" }, { "expression": { @@ -969,19 +969,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3680, + "id": 3884, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3678, + "id": 3882, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1310:1:7", + "referencedDeclaration": 3873, + "src": "1310:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -991,18 +991,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3679, + "id": 3883, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3664, - "src": "1315:1:7", + "referencedDeclaration": 3868, + "src": "1315:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1310:6:7", + "src": "1310:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1016,18 +1016,18 @@ "typeString": "bool" } ], - "id": 3677, + "id": 3881, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "1303:6:7", + "referencedDeclaration": 4142, + "src": "1303:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3681, + "id": 3885, "isConstant": false, "isLValue": false, "isPure": false, @@ -1035,39 +1035,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1303:14:7", + "src": "1303:14:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3682, + "id": 3886, "nodeType": "ExpressionStatement", - "src": "1303:14:7" + "src": "1303:14:9" }, { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3887, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1330:1:7", + "referencedDeclaration": 3873, + "src": "1330:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3670, - "id": 3684, + "functionReturnParameters": 3874, + "id": 3888, "nodeType": "Return", - "src": "1323:8:7" + "src": "1323:8:9" } ] }, "documentation": "@dev Adds two numbers, throws on overflow.", - "id": 3686, + "id": 3890, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1075,16 +1075,16 @@ "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 3667, + "id": 3871, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3664, + "id": 3868, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1226:9:7", + "scope": 3890, + "src": "1226:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1092,10 +1092,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3663, + "id": 3867, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1226:7:7", + "src": "1226:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1106,11 +1106,11 @@ }, { "constant": false, - "id": 3666, + "id": 3870, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1237:9:7", + "scope": 3890, + "src": "1237:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1118,10 +1118,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3665, + "id": 3869, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1237:7:7", + "src": "1237:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1131,20 +1131,20 @@ "visibility": "internal" } ], - "src": "1225:22:7" + "src": "1225:22:9" }, "payable": false, "returnParameters": { - "id": 3670, + "id": 3874, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3669, + "id": 3873, "name": "c", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1271:9:7", + "scope": 3890, + "src": "1271:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1152,10 +1152,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3668, + "id": 3872, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1271:7:7", + "src": "1271:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1165,40 +1165,40 @@ "visibility": "internal" } ], - "src": "1270:11:7" + "src": "1270:11:9" }, - "scope": 3687, - "src": "1213:123:7", + "scope": 3891, + "src": "1213:123:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 3688, - "src": "116:1222:7" + "scope": 3892, + "src": "116:1222:9" } ], - "src": "0:1339:7" + "src": "0:1339:9" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/SafeMath.sol", + "absolutePath": "/home/bharath/computable/contracts/SafeMath.sol", "exportedSymbols": { "SafeMath": [ - 3687 + 3891 ] }, - "id": 3688, + "id": 3892, "nodeType": "SourceUnit", "nodes": [ { - "id": 3595, + "id": 3799, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:7" + "src": "0:23:9" }, { "baseContracts": [], @@ -1206,18 +1206,18 @@ "contractKind": "library", "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error", "fullyImplemented": true, - "id": 3687, + "id": 3891, "linearizedBaseContracts": [ - 3687 + 3891 ], "name": "SafeMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 3627, + "id": 3831, "nodeType": "Block", - "src": "271:304:7", + "src": "271:304:9", "statements": [ { "condition": { @@ -1226,19 +1226,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3606, + "id": 3810, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3604, + "id": 3808, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "486:1:7", + "referencedDeclaration": 3801, + "src": "486:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1249,14 +1249,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3605, + "id": 3809, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "491:1:7", + "src": "491:1:9", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1264,33 +1264,33 @@ }, "value": "0" }, - "src": "486:6:7", + "src": "486:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 3610, + "id": 3814, "nodeType": "IfStatement", - "src": "482:35:7", + "src": "482:35:9", "trueBody": { - "id": 3609, + "id": 3813, "nodeType": "Block", - "src": "494:23:7", + "src": "494:23:9", "statements": [ { "expression": { "argumentTypes": null, "hexValue": "30", - "id": 3607, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "509:1:7", + "src": "509:1:9", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1298,10 +1298,10 @@ }, "value": "0" }, - "functionReturnParameters": 3603, - "id": 3608, + "functionReturnParameters": 3807, + "id": 3812, "nodeType": "Return", - "src": "502:8:7" + "src": "502:8:9" } ] } @@ -1309,19 +1309,19 @@ { "expression": { "argumentTypes": null, - "id": 3615, + "id": 3819, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3611, + "id": 3815, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "523:1:7", + "referencedDeclaration": 3806, + "src": "523:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1335,19 +1335,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3614, + "id": 3818, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3612, + "id": 3816, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "527:1:7", + "referencedDeclaration": 3801, + "src": "527:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1357,32 +1357,32 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 3613, + "id": 3817, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3599, - "src": "531:1:7", + "referencedDeclaration": 3803, + "src": "531:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "527:5:7", + "src": "527:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "523:9:7", + "src": "523:9:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3616, + "id": 3820, "nodeType": "ExpressionStatement", - "src": "523:9:7" + "src": "523:9:9" }, { "expression": { @@ -1394,7 +1394,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3622, + "id": 3826, "isConstant": false, "isLValue": false, "isPure": false, @@ -1405,19 +1405,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3620, + "id": 3824, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3618, + "id": 3822, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "545:1:7", + "referencedDeclaration": 3806, + "src": "545:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1427,18 +1427,18 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3619, + "id": 3823, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3597, - "src": "549:1:7", + "referencedDeclaration": 3801, + "src": "549:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "545:5:7", + "src": "545:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1448,18 +1448,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 3621, + "id": 3825, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3599, - "src": "554:1:7", + "referencedDeclaration": 3803, + "src": "554:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "545:10:7", + "src": "545:10:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1473,18 +1473,18 @@ "typeString": "bool" } ], - "id": 3617, + "id": 3821, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "538:6:7", + "referencedDeclaration": 4142, + "src": "538:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3623, + "id": 3827, "isConstant": false, "isLValue": false, "isPure": false, @@ -1492,39 +1492,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "538:18:7", + "src": "538:18:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3624, + "id": 3828, "nodeType": "ExpressionStatement", - "src": "538:18:7" + "src": "538:18:9" }, { "expression": { "argumentTypes": null, - "id": 3625, + "id": 3829, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3602, - "src": "569:1:7", + "referencedDeclaration": 3806, + "src": "569:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3603, - "id": 3626, + "functionReturnParameters": 3807, + "id": 3830, "nodeType": "Return", - "src": "562:8:7" + "src": "562:8:9" } ] }, "documentation": "@dev Multiplies two numbers, throws on overflow.", - "id": 3628, + "id": 3832, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1532,16 +1532,16 @@ "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3600, + "id": 3804, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3597, + "id": 3801, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "215:9:7", + "scope": 3832, + "src": "215:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1549,10 +1549,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3596, + "id": 3800, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "215:7:7", + "src": "215:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1563,11 +1563,11 @@ }, { "constant": false, - "id": 3599, + "id": 3803, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "226:9:7", + "scope": 3832, + "src": "226:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1575,10 +1575,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3598, + "id": 3802, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "226:7:7", + "src": "226:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1588,20 +1588,20 @@ "visibility": "internal" } ], - "src": "214:22:7" + "src": "214:22:9" }, "payable": false, "returnParameters": { - "id": 3603, + "id": 3807, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3602, + "id": 3806, "name": "c", "nodeType": "VariableDeclaration", - "scope": 3628, - "src": "260:9:7", + "scope": 3832, + "src": "260:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1609,10 +1609,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3601, + "id": 3805, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "260:7:7", + "src": "260:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1622,19 +1622,19 @@ "visibility": "internal" } ], - "src": "259:11:7" + "src": "259:11:9" }, - "scope": 3687, - "src": "202:373:7", + "scope": 3891, + "src": "202:373:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3641, + "id": 3845, "nodeType": "Block", - "src": "724:205:7", + "src": "724:205:9", "statements": [ { "expression": { @@ -1643,19 +1643,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3639, + "id": 3843, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3637, + "id": 3841, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3630, - "src": "919:1:7", + "referencedDeclaration": 3834, + "src": "919:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1665,32 +1665,32 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3638, + "id": 3842, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, - "src": "923:1:7", + "referencedDeclaration": 3836, + "src": "923:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "919:5:7", + "src": "919:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3636, - "id": 3640, + "functionReturnParameters": 3840, + "id": 3844, "nodeType": "Return", - "src": "912:12:7" + "src": "912:12:9" } ] }, "documentation": "@dev Integer division of two numbers, truncating the quotient.", - "id": 3642, + "id": 3846, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1698,16 +1698,16 @@ "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3837, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3630, + "id": 3834, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "670:9:7", + "scope": 3846, + "src": "670:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1715,10 +1715,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3629, + "id": 3833, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "670:7:7", + "src": "670:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1729,11 +1729,11 @@ }, { "constant": false, - "id": 3632, + "id": 3836, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "681:9:7", + "scope": 3846, + "src": "681:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1741,10 +1741,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3631, + "id": 3835, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "681:7:7", + "src": "681:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1754,20 +1754,20 @@ "visibility": "internal" } ], - "src": "669:22:7" + "src": "669:22:9" }, "payable": false, "returnParameters": { - "id": 3636, + "id": 3840, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3635, + "id": 3839, "name": "", "nodeType": "VariableDeclaration", - "scope": 3642, - "src": "715:7:7", + "scope": 3846, + "src": "715:7:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1775,10 +1775,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3634, + "id": 3838, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "715:7:7", + "src": "715:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1788,19 +1788,19 @@ "visibility": "internal" } ], - "src": "714:9:7" + "src": "714:9:9" }, - "scope": 3687, - "src": "657:272:7", + "scope": 3891, + "src": "657:272:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3661, + "id": 3865, "nodeType": "Block", - "src": "1108:43:7", + "src": "1108:43:9", "statements": [ { "expression": { @@ -1812,19 +1812,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3654, + "id": 3858, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3652, + "id": 3856, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3646, - "src": "1121:1:7", + "referencedDeclaration": 3850, + "src": "1121:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1834,18 +1834,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3653, + "id": 3857, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3644, - "src": "1126:1:7", + "referencedDeclaration": 3848, + "src": "1126:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1121:6:7", + "src": "1121:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1859,18 +1859,18 @@ "typeString": "bool" } ], - "id": 3651, + "id": 3855, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "1114:6:7", + "referencedDeclaration": 4142, + "src": "1114:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3655, + "id": 3859, "isConstant": false, "isLValue": false, "isPure": false, @@ -1878,15 +1878,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1114:14:7", + "src": "1114:14:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3656, + "id": 3860, "nodeType": "ExpressionStatement", - "src": "1114:14:7" + "src": "1114:14:9" }, { "expression": { @@ -1895,19 +1895,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3659, + "id": 3863, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3657, + "id": 3861, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3644, - "src": "1141:1:7", + "referencedDeclaration": 3848, + "src": "1141:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1917,32 +1917,32 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 3658, + "id": 3862, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3646, - "src": "1145:1:7", + "referencedDeclaration": 3850, + "src": "1145:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1141:5:7", + "src": "1141:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3650, - "id": 3660, + "functionReturnParameters": 3854, + "id": 3864, "nodeType": "Return", - "src": "1134:12:7" + "src": "1134:12:9" } ] }, "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).", - "id": 3662, + "id": 3866, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -1950,16 +1950,16 @@ "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 3647, + "id": 3851, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3644, + "id": 3848, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1054:9:7", + "scope": 3866, + "src": "1054:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1967,10 +1967,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3643, + "id": 3847, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1054:7:7", + "src": "1054:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1981,11 +1981,11 @@ }, { "constant": false, - "id": 3646, + "id": 3850, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1065:9:7", + "scope": 3866, + "src": "1065:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1993,10 +1993,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3645, + "id": 3849, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1065:7:7", + "src": "1065:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2006,20 +2006,20 @@ "visibility": "internal" } ], - "src": "1053:22:7" + "src": "1053:22:9" }, "payable": false, "returnParameters": { - "id": 3650, + "id": 3854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3649, + "id": 3853, "name": "", "nodeType": "VariableDeclaration", - "scope": 3662, - "src": "1099:7:7", + "scope": 3866, + "src": "1099:7:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2027,10 +2027,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3648, + "id": 3852, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1099:7:7", + "src": "1099:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2040,36 +2040,36 @@ "visibility": "internal" } ], - "src": "1098:9:7" + "src": "1098:9:9" }, - "scope": 3687, - "src": "1041:110:7", + "scope": 3891, + "src": "1041:110:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 3685, + "id": 3889, "nodeType": "Block", - "src": "1282:54:7", + "src": "1282:54:9", "statements": [ { "expression": { "argumentTypes": null, - "id": 3675, + "id": 3879, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3671, + "id": 3875, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1288:1:7", + "referencedDeclaration": 3873, + "src": "1288:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2083,19 +2083,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3674, + "id": 3878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3672, + "id": 3876, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3664, - "src": "1292:1:7", + "referencedDeclaration": 3868, + "src": "1292:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2105,32 +2105,32 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 3673, + "id": 3877, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3666, - "src": "1296:1:7", + "referencedDeclaration": 3870, + "src": "1296:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1292:5:7", + "src": "1292:5:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1288:9:7", + "src": "1288:9:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3676, + "id": 3880, "nodeType": "ExpressionStatement", - "src": "1288:9:7" + "src": "1288:9:9" }, { "expression": { @@ -2142,19 +2142,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3680, + "id": 3884, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3678, + "id": 3882, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1310:1:7", + "referencedDeclaration": 3873, + "src": "1310:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2164,18 +2164,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3679, + "id": 3883, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3664, - "src": "1315:1:7", + "referencedDeclaration": 3868, + "src": "1315:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1310:6:7", + "src": "1310:6:9", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2189,18 +2189,18 @@ "typeString": "bool" } ], - "id": 3677, + "id": 3881, "name": "assert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3691, - "src": "1303:6:7", + "referencedDeclaration": 4142, + "src": "1303:6:9", "typeDescriptions": { "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3681, + "id": 3885, "isConstant": false, "isLValue": false, "isPure": false, @@ -2208,39 +2208,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1303:14:7", + "src": "1303:14:9", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 3682, + "id": 3886, "nodeType": "ExpressionStatement", - "src": "1303:14:7" + "src": "1303:14:9" }, { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3887, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3669, - "src": "1330:1:7", + "referencedDeclaration": 3873, + "src": "1330:1:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 3670, - "id": 3684, + "functionReturnParameters": 3874, + "id": 3888, "nodeType": "Return", - "src": "1323:8:7" + "src": "1323:8:9" } ] }, "documentation": "@dev Adds two numbers, throws on overflow.", - "id": 3686, + "id": 3890, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -2248,16 +2248,16 @@ "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 3667, + "id": 3871, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3664, + "id": 3868, "name": "a", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1226:9:7", + "scope": 3890, + "src": "1226:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2265,10 +2265,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3663, + "id": 3867, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1226:7:7", + "src": "1226:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2279,11 +2279,11 @@ }, { "constant": false, - "id": 3666, + "id": 3870, "name": "b", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1237:9:7", + "scope": 3890, + "src": "1237:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2291,10 +2291,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3665, + "id": 3869, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1237:7:7", + "src": "1237:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2304,20 +2304,20 @@ "visibility": "internal" } ], - "src": "1225:22:7" + "src": "1225:22:9" }, "payable": false, "returnParameters": { - "id": 3670, + "id": 3874, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3669, + "id": 3873, "name": "c", "nodeType": "VariableDeclaration", - "scope": 3686, - "src": "1271:9:7", + "scope": 3890, + "src": "1271:9:9", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2325,10 +2325,10 @@ "typeString": "uint256" }, "typeName": { - "id": 3668, + "id": 3872, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1271:7:7", + "src": "1271:7:9", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2338,20 +2338,20 @@ "visibility": "internal" } ], - "src": "1270:11:7" + "src": "1270:11:9" }, - "scope": 3687, - "src": "1213:123:7", + "scope": 3891, + "src": "1213:123:9", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 3688, - "src": "116:1222:7" + "scope": 3892, + "src": "116:1222:9" } ], - "src": "0:1339:7" + "src": "0:1339:9" }, "compiler": { "name": "solc", @@ -2359,5 +2359,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:48:42.373Z" + "updatedAt": "2018-06-26T02:58:22.318Z" } \ No newline at end of file diff --git a/build/contracts/StandardToken.json b/build/contracts/StandardToken.json index b32a1fd..7a1607f 100644 --- a/build/contracts/StandardToken.json +++ b/build/contracts/StandardToken.json @@ -221,24 +221,24 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b50611037806100206000396000f30060806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a72305820d738b8ecc54cc084f4fc97fe306d739d334dcc598271a09fc53208f9fca1c4c40029", - "deployedBytecode": "0x60806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a72305820d738b8ecc54cc084f4fc97fe306d739d334dcc598271a09fc53208f9fca1c4c40029", + "bytecode": "0x608060405234801561001057600080fd5b50611037806100206000396000f30060806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a723058201c6ec43e932aa607178310d4ecaa6b1c00e09417976065982d771b79b771f1d70029", + "deployedBytecode": "0x60806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063095ea7b31461009357806318160ddd146100f857806323b872dd1461012357806366188463146101a857806370a082311461020d578063a9059cbb14610264578063d73dd623146102c9578063dd62ed3e1461032e575b600080fd5b34801561009f57600080fd5b506100de600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103a5565b604051808215151515815260200191505060405180910390f35b34801561010457600080fd5b5061010d610497565b6040518082815260200191505060405180910390f35b34801561012f57600080fd5b5061018e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104a1565b604051808215151515815260200191505060405180910390f35b3480156101b457600080fd5b506101f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061085b565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061024e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aec565b6040518082815260200191505060405180910390f35b34801561027057600080fd5b506102af600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b34565b604051808215151515815260200191505060405180910390f35b3480156102d557600080fd5b50610314600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610d53565b604051808215151515815260200191505060405180910390f35b34801561033a57600080fd5b5061038f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f4f565b6040518082815260200191505060405180910390f35b600081600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600154905090565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515156104de57600080fd5b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561052b57600080fd5b600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111515156105b657600080fd5b610607826000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061069a826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061076b82600260008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b600260008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600080600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508083111561096c576000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a00565b61097f8382610fd690919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a3600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610b7157600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548211151515610bbe57600080fd5b610c0f826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fd690919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ca2826000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b6000610de482600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610fef90919063ffffffff16565b600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000828211151515610fe457fe5b818303905092915050565b6000818301905082811015151561100257fe5b809050929150505600a165627a7a723058201c6ec43e932aa607178310d4ecaa6b1c00e09417976065982d771b79b771f1d70029", "sourceMap": "333:3779:10:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;333:3779:10;;;;;;;", "deployedSourceMap": "333:3779:10:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:188;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1813:188:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;361:83:1;;8:9:-1;5:2;;;30:1;27;20:12;5:2;361:83:1;;;;;;;;;;;;;;;;;;;;;;;725:470:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;725:470:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3678:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3678:431:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1121:99:1;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1121:99:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;598:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;598:321:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2925:296:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2925:296:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2320:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2320:153:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1813:188;1880:4;1924:6;1892:7;:19;1900:10;1892:19;;;;;;;;;;;;;;;:29;1912:8;1892:29;;;;;;;;;;;;;;;:38;;;;1962:8;1941:38;;1950:10;1941:38;;;1972:6;1941:38;;;;;;;;;;;;;;;;;;1992:4;1985:11;;1813:188;;;;:::o;361:83:1:-;405:7;427:12;;420:19;;361:83;:::o;725:470:10:-;831:4;868:1;853:17;;:3;:17;;;;845:26;;;;;;;;895:8;:15;904:5;895:15;;;;;;;;;;;;;;;;885:6;:25;;877:34;;;;;;;;935:7;:14;943:5;935:14;;;;;;;;;;;;;;;:26;950:10;935:26;;;;;;;;;;;;;;;;925:6;:36;;917:45;;;;;;;;987:27;1007:6;987:8;:15;996:5;987:15;;;;;;;;;;;;;;;;:19;;:27;;;;:::i;:::-;969:8;:15;978:5;969:15;;;;;;;;;;;;;;;:45;;;;1036:25;1054:6;1036:8;:13;1045:3;1036:13;;;;;;;;;;;;;;;;:17;;:25;;;;:::i;:::-;1020:8;:13;1029:3;1020:13;;;;;;;;;;;;;;;:41;;;;1096:38;1127:6;1096:7;:14;1104:5;1096:14;;;;;;;;;;;;;;;:26;1111:10;1096:26;;;;;;;;;;;;;;;;:30;;:38;;;;:::i;:::-;1067:7;:14;1075:5;1067:14;;;;;;;;;;;;;;;:26;1082:10;1067:26;;;;;;;;;;;;;;;:67;;;;1161:3;1145:28;;1154:5;1145:28;;;1166:6;1145:28;;;;;;;;;;;;;;;;;;1186:4;1179:11;;725:470;;;;;:::o;3678:431::-;3784:4;3798:16;3817:7;:19;3825:10;3817:19;;;;;;;;;;;;;;;:29;3837:8;3817:29;;;;;;;;;;;;;;;;3798:48;;3875:8;3856:16;:27;3852:164;;;3925:1;3893:7;:19;3901:10;3893:19;;;;;;;;;;;;;;;:29;3913:8;3893:29;;;;;;;;;;;;;;;:33;;;;3852:164;;;3979:30;3992:16;3979:8;:12;;:30;;;;:::i;:::-;3947:7;:19;3955:10;3947:19;;;;;;;;;;;;;;;:29;3967:8;3947:29;;;;;;;;;;;;;;;:62;;;;3852:164;4047:8;4026:61;;4035:10;4026:61;;;4057:7;:19;4065:10;4057:19;;;;;;;;;;;;;;;:29;4077:8;4057:29;;;;;;;;;;;;;;;;4026:61;;;;;;;;;;;;;;;;;;4100:4;4093:11;;3678:431;;;;;:::o;1121:99:1:-;1177:7;1199:8;:16;1208:6;1199:16;;;;;;;;;;;;;;;;1192:23;;1121:99;;;:::o;598:321::-;661:4;696:1;681:17;;:3;:17;;;;673:26;;;;;;;;723:8;:20;732:10;723:20;;;;;;;;;;;;;;;;713:6;:30;;705:39;;;;;;;;774:32;799:6;774:8;:20;783:10;774:20;;;;;;;;;;;;;;;;:24;;:32;;;;:::i;:::-;751:8;:20;760:10;751:20;;;;;;;;;;;;;;;:55;;;;828:25;846:6;828:8;:13;837:3;828:13;;;;;;;;;;;;;;;;:17;;:25;;;;:::i;:::-;812:8;:13;821:3;812:13;;;;;;;;;;;;;;;:41;;;;885:3;864:33;;873:10;864:33;;;890:6;864:33;;;;;;;;;;;;;;;;;;910:4;903:11;;598:321;;;;:::o;2925:296:10:-;3026:4;3080:46;3114:11;3080:7;:19;3088:10;3080:19;;;;;;;;;;;;;;;:29;3100:8;3080:29;;;;;;;;;;;;;;;;:33;;:46;;;;:::i;:::-;3040:7;:19;3048:10;3040:19;;;;;;;;;;;;;;;:29;3060:8;3040:29;;;;;;;;;;;;;;;:87;;;;3159:8;3138:61;;3147:10;3138:61;;;3169:7;:19;3177:10;3169:19;;;;;;;;;;;;;;;:29;3189:8;3169:29;;;;;;;;;;;;;;;;3138:61;;;;;;;;;;;;;;;;;;3212:4;3205:11;;2925:296;;;;:::o;2320:153::-;2419:7;2443;:15;2451:6;2443:15;;;;;;;;;;;;;;;:25;2459:8;2443:25;;;;;;;;;;;;;;;;2436:32;;2320:153;;;;:::o;1041:110:9:-;1099:7;1126:1;1121;:6;;1114:14;;;;;;1145:1;1141;:5;1134:12;;1041:110;;;;:::o;1213:123::-;1271:9;1296:1;1292;:5;1288:9;;1315:1;1310;:6;;1303:14;;;;;;1330:1;1323:8;;1213:123;;;;:::o", "source": "pragma solidity 0.4.24;\n\nimport \"./BasicToken.sol\";\nimport \"./ERC20.sol\";\n\n\n/**\n * @title Standard ERC20 token\n *\n * @dev Implementation of the basic standard token.\n * https://github.com/ethereum/EIPs/issues/20\n * Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol\n */\ncontract StandardToken is ERC20, BasicToken {\n\n mapping (address => mapping (address => uint256)) internal allowed;\n\n\n /**\n * @dev Transfer tokens from one address to another\n * @param _from address The address which you want to send tokens from\n * @param _to address The address which you want to transfer to\n * @param _value uint256 the amount of tokens to be transferred\n */\n function transferFrom(\n address _from,\n address _to,\n uint256 _value\n )\n public\n returns (bool)\n {\n require(_to != address(0));\n require(_value <= balances[_from]);\n require(_value <= allowed[_from][msg.sender]);\n\n balances[_from] = balances[_from].sub(_value);\n balances[_to] = balances[_to].add(_value);\n allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_value);\n emit Transfer(_from, _to, _value);\n return true;\n }\n\n /**\n * @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\n * Beware that changing an allowance with this method brings the risk that someone may use both the old\n * and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\n * race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\n * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n * @param _spender The address which will spend the funds.\n * @param _value The amount of tokens to be spent.\n */\n function approve(address _spender, uint256 _value) public returns (bool) {\n allowed[msg.sender][_spender] = _value;\n emit Approval(msg.sender, _spender, _value);\n return true;\n }\n\n /**\n * @dev Function to check the amount of tokens that an owner allowed to a spender.\n * @param _owner address The address which owns the funds.\n * @param _spender address The address which will spend the funds.\n * @return A uint256 specifying the amount of tokens still available for the spender.\n */\n function allowance(\n address _owner,\n address _spender\n )\n public\n view\n returns (uint256)\n {\n return allowed[_owner][_spender];\n }\n\n /**\n * @dev Increase the amount of tokens that an owner allowed to a spender.\n * approve should be called when allowed[_spender] == 0. To increment\n * allowed value is better to use this function to avoid 2 calls (and wait until\n * the first transaction is mined)\n * From MonolithDAO Token.sol\n * @param _spender The address which will spend the funds.\n * @param _addedValue The amount of tokens to increase the allowance by.\n */\n function increaseApproval(\n address _spender,\n uint256 _addedValue\n )\n public\n returns (bool)\n {\n allowed[msg.sender][_spender] = (\n allowed[msg.sender][_spender].add(_addedValue));\n emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n return true;\n }\n\n /**\n * @dev Decrease the amount of tokens that an owner allowed to a spender.\n * approve should be called when allowed[_spender] == 0. To decrement\n * allowed value is better to use this function to avoid 2 calls (and wait until\n * the first transaction is mined)\n * From MonolithDAO Token.sol\n * @param _spender The address which will spend the funds.\n * @param _subtractedValue The amount of tokens to decrease the allowance by.\n */\n function decreaseApproval(\n address _spender,\n uint256 _subtractedValue\n )\n public\n returns (bool)\n {\n uint256 oldValue = allowed[msg.sender][_spender];\n if (_subtractedValue > oldValue) {\n allowed[msg.sender][_spender] = 0;\n } else {\n allowed[msg.sender][_spender] = oldValue.sub(_subtractedValue);\n }\n emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n return true;\n }\n\n}\n", - "sourcePath": "/home/rob/Github/computable/contracts/StandardToken.sol", + "sourcePath": "/home/bharath/computable/contracts/StandardToken.sol", "ast": { - "absolutePath": "/home/rob/Github/computable/contracts/StandardToken.sol", + "absolutePath": "/home/bharath/computable/contracts/StandardToken.sol", "exportedSymbols": { "StandardToken": [ - 4018 + 4138 ] }, - "id": 4019, + "id": 4139, "nodeType": "SourceUnit", "nodes": [ { - "id": 3773, + "id": 3893, "literals": [ "solidity", "0.4", @@ -248,23 +248,23 @@ "src": "0:23:10" }, { - "absolutePath": "/home/rob/Github/computable/contracts/BasicToken.sol", + "absolutePath": "/home/bharath/computable/contracts/BasicToken.sol", "file": "./BasicToken.sol", - "id": 3774, + "id": 3894, "nodeType": "ImportDirective", - "scope": 4019, - "sourceUnit": 155, + "scope": 4139, + "sourceUnit": 161, "src": "25:26:10", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 3775, + "id": 3895, "nodeType": "ImportDirective", - "scope": 4019, - "sourceUnit": 523, + "scope": 4139, + "sourceUnit": 529, "src": "52:21:10", "symbolAliases": [], "unitAlias": "" @@ -275,17 +275,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3776, + "id": 3896, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 522, + "referencedDeclaration": 528, "src": "359:5:10", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$522", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3777, + "id": 3897, "nodeType": "InheritanceSpecifier", "src": "359:5:10" }, @@ -293,45 +293,45 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3778, + "id": 3898, "name": "BasicToken", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 154, + "referencedDeclaration": 160, "src": "366:10:10", "typeDescriptions": { - "typeIdentifier": "t_contract$_BasicToken_$154", + "typeIdentifier": "t_contract$_BasicToken_$160", "typeString": "contract BasicToken" } }, - "id": 3779, + "id": 3899, "nodeType": "InheritanceSpecifier", "src": "366:10:10" } ], "contractDependencies": [ - 154, - 522, - 554 + 160, + 528, + 560 ], "contractKind": "contract", "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol", "fullyImplemented": true, - "id": 4018, + "id": 4138, "linearizedBaseContracts": [ - 4018, - 154, - 522, - 554 + 4138, + 160, + 528, + 560 ], "name": "StandardToken", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3785, + "id": 3905, "name": "allowed", "nodeType": "VariableDeclaration", - "scope": 4018, + "scope": 4138, "src": "382:66:10", "stateVariable": true, "storageLocation": "default", @@ -340,9 +340,9 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "typeName": { - "id": 3784, + "id": 3904, "keyType": { - "id": 3780, + "id": 3900, "name": "address", "nodeType": "ElementaryTypeName", "src": "391:7:10", @@ -358,9 +358,9 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "valueType": { - "id": 3783, + "id": 3903, "keyType": { - "id": 3781, + "id": 3901, "name": "address", "nodeType": "ElementaryTypeName", "src": "411:7:10", @@ -376,7 +376,7 @@ "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 3782, + "id": 3902, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "422:7:10", @@ -392,7 +392,7 @@ }, { "body": { - "id": 3870, + "id": 3990, "nodeType": "Block", "src": "839:356:10", "statements": [ @@ -406,18 +406,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3801, + "id": 3921, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3797, + "id": 3917, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "853:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -432,7 +432,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3799, + "id": 3919, "isConstant": false, "isLValue": false, "isPure": true, @@ -455,7 +455,7 @@ "typeString": "int_const 0" } ], - "id": 3798, + "id": 3918, "isConstant": false, "isLValue": false, "isPure": true, @@ -468,7 +468,7 @@ }, "typeName": "address" }, - "id": 3800, + "id": 3920, "isConstant": false, "isLValue": false, "isPure": true, @@ -496,21 +496,21 @@ "typeString": "bool" } ], - "id": 3796, + "id": 3916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "845:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3802, + "id": 3922, "isConstant": false, "isLValue": false, "isPure": false, @@ -524,7 +524,7 @@ "typeString": "tuple()" } }, - "id": 3803, + "id": 3923, "nodeType": "ExpressionStatement", "src": "845:26:10" }, @@ -538,18 +538,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3809, + "id": 3929, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3805, + "id": 3925, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "885:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -562,25 +562,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3806, + "id": 3926, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "895:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3808, + "id": 3928, "indexExpression": { "argumentTypes": null, - "id": 3807, + "id": 3927, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "904:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -612,21 +612,21 @@ "typeString": "bool" } ], - "id": 3804, + "id": 3924, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "877:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3810, + "id": 3930, "isConstant": false, "isLValue": false, "isPure": false, @@ -640,7 +640,7 @@ "typeString": "tuple()" } }, - "id": 3811, + "id": 3931, "nodeType": "ExpressionStatement", "src": "877:34:10" }, @@ -654,18 +654,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3820, + "id": 3940, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3813, + "id": 3933, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "925:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -680,25 +680,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3814, + "id": 3934, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "935:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3816, + "id": 3936, "indexExpression": { "argumentTypes": null, - "id": 3815, + "id": 3935, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "943:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -716,23 +716,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3819, + "id": 3939, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3817, + "id": 3937, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "950:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3818, + "id": 3938, "isConstant": false, "isLValue": false, "isPure": false, @@ -771,21 +771,21 @@ "typeString": "bool" } ], - "id": 3812, + "id": 3932, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "917:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3821, + "id": 3941, "isConstant": false, "isLValue": false, "isPure": false, @@ -799,14 +799,14 @@ "typeString": "tuple()" } }, - "id": 3822, + "id": 3942, "nodeType": "ExpressionStatement", "src": "917:45:10" }, { "expression": { "argumentTypes": null, - "id": 3832, + "id": 3952, "isConstant": false, "isLValue": false, "isPure": false, @@ -815,25 +815,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3823, + "id": 3943, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "969:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3825, + "id": 3945, "indexExpression": { "argumentTypes": null, - "id": 3824, + "id": 3944, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "978:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -858,11 +858,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3830, + "id": 3950, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1007:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -881,25 +881,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3826, + "id": 3946, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "987:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3828, + "id": 3948, "indexExpression": { "argumentTypes": null, - "id": 3827, + "id": 3947, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "996:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -917,21 +917,21 @@ "typeString": "uint256" } }, - "id": 3829, + "id": 3949, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "987:19:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3831, + "id": 3951, "isConstant": false, "isLValue": false, "isPure": false, @@ -951,14 +951,14 @@ "typeString": "uint256" } }, - "id": 3833, + "id": 3953, "nodeType": "ExpressionStatement", "src": "969:45:10" }, { "expression": { "argumentTypes": null, - "id": 3843, + "id": 3963, "isConstant": false, "isLValue": false, "isPure": false, @@ -967,25 +967,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3834, + "id": 3954, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1020:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3836, + "id": 3956, "indexExpression": { "argumentTypes": null, - "id": 3835, + "id": 3955, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1029:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1010,11 +1010,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3841, + "id": 3961, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1054:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1033,25 +1033,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3837, + "id": 3957, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1036:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3839, + "id": 3959, "indexExpression": { "argumentTypes": null, - "id": 3838, + "id": 3958, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1045:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1069,21 +1069,21 @@ "typeString": "uint256" } }, - "id": 3840, + "id": 3960, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "1036:17:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3842, + "id": 3962, "isConstant": false, "isLValue": false, "isPure": false, @@ -1103,14 +1103,14 @@ "typeString": "uint256" } }, - "id": 3844, + "id": 3964, "nodeType": "ExpressionStatement", "src": "1020:41:10" }, { "expression": { "argumentTypes": null, - "id": 3860, + "id": 3980, "isConstant": false, "isLValue": false, "isPure": false, @@ -1121,25 +1121,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3845, + "id": 3965, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1067:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3849, + "id": 3969, "indexExpression": { "argumentTypes": null, - "id": 3846, + "id": 3966, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1075:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1157,23 +1157,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3850, + "id": 3970, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3847, + "id": 3967, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1082:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3848, + "id": 3968, "isConstant": false, "isLValue": false, "isPure": false, @@ -1205,11 +1205,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3858, + "id": 3978, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1127:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1230,25 +1230,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3851, + "id": 3971, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1096:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3853, + "id": 3973, "indexExpression": { "argumentTypes": null, - "id": 3852, + "id": 3972, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1104:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1266,23 +1266,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3856, + "id": 3976, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3854, + "id": 3974, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1111:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3855, + "id": 3975, "isConstant": false, "isLValue": false, "isPure": false, @@ -1307,21 +1307,21 @@ "typeString": "uint256" } }, - "id": 3857, + "id": 3977, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "1096:30:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3859, + "id": 3979, "isConstant": false, "isLValue": false, "isPure": false, @@ -1341,7 +1341,7 @@ "typeString": "uint256" } }, - "id": 3861, + "id": 3981, "nodeType": "ExpressionStatement", "src": "1067:67:10" }, @@ -1351,11 +1351,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3863, + "id": 3983, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1154:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1364,11 +1364,11 @@ }, { "argumentTypes": null, - "id": 3864, + "id": 3984, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1161:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1377,11 +1377,11 @@ }, { "argumentTypes": null, - "id": 3865, + "id": 3985, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1166:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1404,18 +1404,18 @@ "typeString": "uint256" } ], - "id": 3862, + "id": 3982, "name": "Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 553, + "referencedDeclaration": 559, "src": "1145:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3866, + "id": 3986, "isConstant": false, "isLValue": false, "isPure": false, @@ -1429,7 +1429,7 @@ "typeString": "tuple()" } }, - "id": 3867, + "id": 3987, "nodeType": "EmitStatement", "src": "1140:33:10" }, @@ -1437,7 +1437,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3868, + "id": 3988, "isConstant": false, "isLValue": false, "isPure": true, @@ -1452,15 +1452,15 @@ }, "value": "true" }, - "functionReturnParameters": 3795, - "id": 3869, + "functionReturnParameters": 3915, + "id": 3989, "nodeType": "Return", "src": "1179:11:10" } ] }, "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred", - "id": 3871, + "id": 3991, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -1468,15 +1468,15 @@ "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3792, + "id": 3912, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3787, + "id": 3907, "name": "_from", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "752:13:10", "stateVariable": false, "storageLocation": "default", @@ -1485,7 +1485,7 @@ "typeString": "address" }, "typeName": { - "id": 3786, + "id": 3906, "name": "address", "nodeType": "ElementaryTypeName", "src": "752:7:10", @@ -1499,10 +1499,10 @@ }, { "constant": false, - "id": 3789, + "id": 3909, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "771:11:10", "stateVariable": false, "storageLocation": "default", @@ -1511,7 +1511,7 @@ "typeString": "address" }, "typeName": { - "id": 3788, + "id": 3908, "name": "address", "nodeType": "ElementaryTypeName", "src": "771:7:10", @@ -1525,10 +1525,10 @@ }, { "constant": false, - "id": 3791, + "id": 3911, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "788:14:10", "stateVariable": false, "storageLocation": "default", @@ -1537,7 +1537,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3790, + "id": 3910, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "788:7:10", @@ -1554,15 +1554,15 @@ }, "payable": false, "returnParameters": { - "id": 3795, + "id": 3915, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3794, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "831:4:10", "stateVariable": false, "storageLocation": "default", @@ -1571,7 +1571,7 @@ "typeString": "bool" }, "typeName": { - "id": 3793, + "id": 3913, "name": "bool", "nodeType": "ElementaryTypeName", "src": "831:4:10", @@ -1586,22 +1586,22 @@ ], "src": "830:6:10" }, - "scope": 4018, + "scope": 4138, "src": "725:470:10", "stateMutability": "nonpayable", - "superFunction": 504, + "superFunction": 510, "visibility": "public" }, { "body": { - "id": 3898, + "id": 4018, "nodeType": "Block", "src": "1886:115:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3887, + "id": 4007, "isConstant": false, "isLValue": false, "isPure": false, @@ -1612,34 +1612,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3880, + "id": 4000, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1892:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3884, + "id": 4004, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3881, + "id": 4001, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1900:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3882, + "id": 4002, "isConstant": false, "isLValue": false, "isPure": false, @@ -1664,14 +1664,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3885, + "id": 4005, "indexExpression": { "argumentTypes": null, - "id": 3883, + "id": 4003, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3873, + "referencedDeclaration": 3993, "src": "1912:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1693,11 +1693,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3886, + "id": 4006, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3875, + "referencedDeclaration": 3995, "src": "1924:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1710,7 +1710,7 @@ "typeString": "uint256" } }, - "id": 3888, + "id": 4008, "nodeType": "ExpressionStatement", "src": "1892:38:10" }, @@ -1722,18 +1722,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3890, + "id": 4010, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1950:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3891, + "id": 4011, "isConstant": false, "isLValue": false, "isPure": false, @@ -1749,11 +1749,11 @@ }, { "argumentTypes": null, - "id": 3892, + "id": 4012, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3873, + "referencedDeclaration": 3993, "src": "1962:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1762,11 +1762,11 @@ }, { "argumentTypes": null, - "id": 3893, + "id": 4013, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3875, + "referencedDeclaration": 3995, "src": "1972:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1789,18 +1789,18 @@ "typeString": "uint256" } ], - "id": 3889, + "id": 4009, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "1941:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3894, + "id": 4014, "isConstant": false, "isLValue": false, "isPure": false, @@ -1814,7 +1814,7 @@ "typeString": "tuple()" } }, - "id": 3895, + "id": 4015, "nodeType": "EmitStatement", "src": "1936:43:10" }, @@ -1822,7 +1822,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3896, + "id": 4016, "isConstant": false, "isLValue": false, "isPure": true, @@ -1837,15 +1837,15 @@ }, "value": "true" }, - "functionReturnParameters": 3879, - "id": 3897, + "functionReturnParameters": 3999, + "id": 4017, "nodeType": "Return", "src": "1985:11:10" } ] }, "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.", - "id": 3899, + "id": 4019, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -1853,15 +1853,15 @@ "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3876, + "id": 3996, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3873, + "id": 3993, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1830:16:10", "stateVariable": false, "storageLocation": "default", @@ -1870,7 +1870,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3992, "name": "address", "nodeType": "ElementaryTypeName", "src": "1830:7:10", @@ -1884,10 +1884,10 @@ }, { "constant": false, - "id": 3875, + "id": 3995, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1848:14:10", "stateVariable": false, "storageLocation": "default", @@ -1896,7 +1896,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3874, + "id": 3994, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1848:7:10", @@ -1913,15 +1913,15 @@ }, "payable": false, "returnParameters": { - "id": 3879, + "id": 3999, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1880:4:10", "stateVariable": false, "storageLocation": "default", @@ -1930,7 +1930,7 @@ "typeString": "bool" }, "typeName": { - "id": 3877, + "id": 3997, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1880:4:10", @@ -1945,15 +1945,15 @@ ], "src": "1879:6:10" }, - "scope": 4018, + "scope": 4138, "src": "1813:188:10", "stateMutability": "nonpayable", - "superFunction": 513, + "superFunction": 519, "visibility": "public" }, { "body": { - "id": 3914, + "id": 4034, "nodeType": "Block", "src": "2430:43:10", "statements": [ @@ -1964,25 +1964,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3908, + "id": 4028, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "2443:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3910, + "id": 4030, "indexExpression": { "argumentTypes": null, - "id": 3909, + "id": 4029, "name": "_owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3901, + "referencedDeclaration": 4021, "src": "2451:6:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2000,14 +2000,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3912, + "id": 4032, "indexExpression": { "argumentTypes": null, - "id": 3911, + "id": 4031, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3903, + "referencedDeclaration": 4023, "src": "2459:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2025,15 +2025,15 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3907, - "id": 3913, + "functionReturnParameters": 4027, + "id": 4033, "nodeType": "Return", "src": "2436:32:10" } ] }, "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.", - "id": 3915, + "id": 4035, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -2041,15 +2041,15 @@ "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 3904, + "id": 4024, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3901, + "id": 4021, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2344:14:10", "stateVariable": false, "storageLocation": "default", @@ -2058,7 +2058,7 @@ "typeString": "address" }, "typeName": { - "id": 3900, + "id": 4020, "name": "address", "nodeType": "ElementaryTypeName", "src": "2344:7:10", @@ -2072,10 +2072,10 @@ }, { "constant": false, - "id": 3903, + "id": 4023, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2364:16:10", "stateVariable": false, "storageLocation": "default", @@ -2084,7 +2084,7 @@ "typeString": "address" }, "typeName": { - "id": 3902, + "id": 4022, "name": "address", "nodeType": "ElementaryTypeName", "src": "2364:7:10", @@ -2101,15 +2101,15 @@ }, "payable": false, "returnParameters": { - "id": 3907, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3906, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2419:7:10", "stateVariable": false, "storageLocation": "default", @@ -2118,7 +2118,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3905, + "id": 4025, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2419:7:10", @@ -2133,22 +2133,22 @@ ], "src": "2418:9:10" }, - "scope": 4018, + "scope": 4138, "src": "2320:153:10", "stateMutability": "view", - "superFunction": 493, + "superFunction": 499, "visibility": "public" }, { "body": { - "id": 3956, + "id": 4076, "nodeType": "Block", "src": "3034:187:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3940, + "id": 4060, "isConstant": false, "isLValue": false, "isPure": false, @@ -2159,34 +2159,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3924, + "id": 4044, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3040:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3928, + "id": 4048, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3925, + "id": 4045, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3048:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3926, + "id": 4046, "isConstant": false, "isLValue": false, "isPure": false, @@ -2211,14 +2211,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3929, + "id": 4049, "indexExpression": { "argumentTypes": null, - "id": 3927, + "id": 4047, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3060:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2246,11 +2246,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3937, + "id": 4057, "name": "_addedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3919, + "referencedDeclaration": 4039, "src": "3114:11:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2271,34 +2271,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3930, + "id": 4050, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3080:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3933, + "id": 4053, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3931, + "id": 4051, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3088:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3932, + "id": 4052, "isConstant": false, "isLValue": false, "isPure": false, @@ -2323,14 +2323,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3935, + "id": 4055, "indexExpression": { "argumentTypes": null, - "id": 3934, + "id": 4054, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3100:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2348,21 +2348,21 @@ "typeString": "uint256" } }, - "id": 3936, + "id": 4056, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "3080:33:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3938, + "id": 4058, "isConstant": false, "isLValue": false, "isPure": false, @@ -2377,7 +2377,7 @@ } } ], - "id": 3939, + "id": 4059, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2396,7 +2396,7 @@ "typeString": "uint256" } }, - "id": 3941, + "id": 4061, "nodeType": "ExpressionStatement", "src": "3040:87:10" }, @@ -2408,18 +2408,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3943, + "id": 4063, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3147:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3944, + "id": 4064, "isConstant": false, "isLValue": false, "isPure": false, @@ -2435,11 +2435,11 @@ }, { "argumentTypes": null, - "id": 3945, + "id": 4065, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3159:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2452,34 +2452,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3946, + "id": 4066, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3169:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3949, + "id": 4069, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3947, + "id": 4067, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3177:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3948, + "id": 4068, "isConstant": false, "isLValue": false, "isPure": false, @@ -2504,14 +2504,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3951, + "id": 4071, "indexExpression": { "argumentTypes": null, - "id": 3950, + "id": 4070, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3189:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2545,18 +2545,18 @@ "typeString": "uint256" } ], - "id": 3942, + "id": 4062, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "3138:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3952, + "id": 4072, "isConstant": false, "isLValue": false, "isPure": false, @@ -2570,7 +2570,7 @@ "typeString": "tuple()" } }, - "id": 3953, + "id": 4073, "nodeType": "EmitStatement", "src": "3133:66:10" }, @@ -2578,7 +2578,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3954, + "id": 4074, "isConstant": false, "isLValue": false, "isPure": true, @@ -2593,15 +2593,15 @@ }, "value": "true" }, - "functionReturnParameters": 3923, - "id": 3955, + "functionReturnParameters": 4043, + "id": 4075, "nodeType": "Return", "src": "3205:11:10" } ] }, "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.", - "id": 3957, + "id": 4077, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -2609,15 +2609,15 @@ "name": "increaseApproval", "nodeType": "FunctionDefinition", "parameters": { - "id": 3920, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3917, + "id": 4037, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "2956:16:10", "stateVariable": false, "storageLocation": "default", @@ -2626,7 +2626,7 @@ "typeString": "address" }, "typeName": { - "id": 3916, + "id": 4036, "name": "address", "nodeType": "ElementaryTypeName", "src": "2956:7:10", @@ -2640,10 +2640,10 @@ }, { "constant": false, - "id": 3919, + "id": 4039, "name": "_addedValue", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "2978:19:10", "stateVariable": false, "storageLocation": "default", @@ -2652,7 +2652,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3918, + "id": 4038, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2978:7:10", @@ -2669,15 +2669,15 @@ }, "payable": false, "returnParameters": { - "id": 3923, + "id": 4043, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3922, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "3026:4:10", "stateVariable": false, "storageLocation": "default", @@ -2686,7 +2686,7 @@ "typeString": "bool" }, "typeName": { - "id": 3921, + "id": 4041, "name": "bool", "nodeType": "ElementaryTypeName", "src": "3026:4:10", @@ -2701,7 +2701,7 @@ ], "src": "3025:6:10" }, - "scope": 4018, + "scope": 4138, "src": "2925:296:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2709,21 +2709,21 @@ }, { "body": { - "id": 4016, + "id": 4136, "nodeType": "Block", "src": "3792:317:10", "statements": [ { "assignments": [ - 3967 + 4087 ], "declarations": [ { "constant": false, - "id": 3967, + "id": 4087, "name": "oldValue", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3798:16:10", "stateVariable": false, "storageLocation": "default", @@ -2732,7 +2732,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3966, + "id": 4086, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3798:7:10", @@ -2745,41 +2745,41 @@ "visibility": "internal" } ], - "id": 3974, + "id": 4094, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3968, + "id": 4088, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3817:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3971, + "id": 4091, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3969, + "id": 4089, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3825:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3970, + "id": 4090, "isConstant": false, "isLValue": false, "isPure": false, @@ -2804,14 +2804,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3973, + "id": 4093, "indexExpression": { "argumentTypes": null, - "id": 3972, + "id": 4092, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3837:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2839,18 +2839,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3977, + "id": 4097, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3975, + "id": 4095, "name": "_subtractedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3961, + "referencedDeclaration": 4081, "src": "3856:16:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2861,11 +2861,11 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 3976, + "id": 4096, "name": "oldValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3967, + "referencedDeclaration": 4087, "src": "3875:8:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2879,14 +2879,14 @@ } }, "falseBody": { - "id": 4000, + "id": 4120, "nodeType": "Block", "src": "3939:77:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3998, + "id": 4118, "isConstant": false, "isLValue": false, "isPure": false, @@ -2897,34 +2897,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3988, + "id": 4108, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3947:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3992, + "id": 4112, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3989, + "id": 4109, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3955:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3990, + "id": 4110, "isConstant": false, "isLValue": false, "isPure": false, @@ -2949,14 +2949,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3993, + "id": 4113, "indexExpression": { "argumentTypes": null, - "id": 3991, + "id": 4111, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3967:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2981,11 +2981,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3996, + "id": 4116, "name": "_subtractedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3961, + "referencedDeclaration": 4081, "src": "3992:16:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3002,32 +3002,32 @@ ], "expression": { "argumentTypes": null, - "id": 3994, + "id": 4114, "name": "oldValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3967, + "referencedDeclaration": 4087, "src": "3979:8:10", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3995, + "id": 4115, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "3979:12:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3997, + "id": 4117, "isConstant": false, "isLValue": false, "isPure": false, @@ -3047,24 +3047,24 @@ "typeString": "uint256" } }, - "id": 3999, + "id": 4119, "nodeType": "ExpressionStatement", "src": "3947:62:10" } ] }, - "id": 4001, + "id": 4121, "nodeType": "IfStatement", "src": "3852:164:10", "trueBody": { - "id": 3987, + "id": 4107, "nodeType": "Block", "src": "3885:48:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3985, + "id": 4105, "isConstant": false, "isLValue": false, "isPure": false, @@ -3075,34 +3075,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3978, + "id": 4098, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3893:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3982, + "id": 4102, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3979, + "id": 4099, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3901:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3980, + "id": 4100, "isConstant": false, "isLValue": false, "isPure": false, @@ -3127,14 +3127,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3983, + "id": 4103, "indexExpression": { "argumentTypes": null, - "id": 3981, + "id": 4101, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3913:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3157,7 +3157,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 3984, + "id": 4104, "isConstant": false, "isLValue": false, "isPure": true, @@ -3178,7 +3178,7 @@ "typeString": "uint256" } }, - "id": 3986, + "id": 4106, "nodeType": "ExpressionStatement", "src": "3893:33:10" } @@ -3193,18 +3193,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 4003, + "id": 4123, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "4035:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 4004, + "id": 4124, "isConstant": false, "isLValue": false, "isPure": false, @@ -3220,11 +3220,11 @@ }, { "argumentTypes": null, - "id": 4005, + "id": 4125, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "4047:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3237,34 +3237,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 4006, + "id": 4126, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "4057:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 4009, + "id": 4129, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 4007, + "id": 4127, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "4065:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 4008, + "id": 4128, "isConstant": false, "isLValue": false, "isPure": false, @@ -3289,14 +3289,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 4011, + "id": 4131, "indexExpression": { "argumentTypes": null, - "id": 4010, + "id": 4130, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "4077:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3330,18 +3330,18 @@ "typeString": "uint256" } ], - "id": 4002, + "id": 4122, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "4026:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4012, + "id": 4132, "isConstant": false, "isLValue": false, "isPure": false, @@ -3355,7 +3355,7 @@ "typeString": "tuple()" } }, - "id": 4013, + "id": 4133, "nodeType": "EmitStatement", "src": "4021:66:10" }, @@ -3363,7 +3363,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 4014, + "id": 4134, "isConstant": false, "isLValue": false, "isPure": true, @@ -3378,15 +3378,15 @@ }, "value": "true" }, - "functionReturnParameters": 3965, - "id": 4015, + "functionReturnParameters": 4085, + "id": 4135, "nodeType": "Return", "src": "4093:11:10" } ] }, "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.", - "id": 4017, + "id": 4137, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3394,15 +3394,15 @@ "name": "decreaseApproval", "nodeType": "FunctionDefinition", "parameters": { - "id": 3962, + "id": 4082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4079, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3709:16:10", "stateVariable": false, "storageLocation": "default", @@ -3411,7 +3411,7 @@ "typeString": "address" }, "typeName": { - "id": 3958, + "id": 4078, "name": "address", "nodeType": "ElementaryTypeName", "src": "3709:7:10", @@ -3425,10 +3425,10 @@ }, { "constant": false, - "id": 3961, + "id": 4081, "name": "_subtractedValue", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3731:24:10", "stateVariable": false, "storageLocation": "default", @@ -3437,7 +3437,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3960, + "id": 4080, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3731:7:10", @@ -3454,15 +3454,15 @@ }, "payable": false, "returnParameters": { - "id": 3965, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3964, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3784:4:10", "stateVariable": false, "storageLocation": "default", @@ -3471,7 +3471,7 @@ "typeString": "bool" }, "typeName": { - "id": 3963, + "id": 4083, "name": "bool", "nodeType": "ElementaryTypeName", "src": "3784:4:10", @@ -3486,31 +3486,31 @@ ], "src": "3783:6:10" }, - "scope": 4018, + "scope": 4138, "src": "3678:431:10", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4019, + "scope": 4139, "src": "333:3779:10" } ], "src": "0:4113:10" }, "legacyAST": { - "absolutePath": "/home/rob/Github/computable/contracts/StandardToken.sol", + "absolutePath": "/home/bharath/computable/contracts/StandardToken.sol", "exportedSymbols": { "StandardToken": [ - 4018 + 4138 ] }, - "id": 4019, + "id": 4139, "nodeType": "SourceUnit", "nodes": [ { - "id": 3773, + "id": 3893, "literals": [ "solidity", "0.4", @@ -3520,23 +3520,23 @@ "src": "0:23:10" }, { - "absolutePath": "/home/rob/Github/computable/contracts/BasicToken.sol", + "absolutePath": "/home/bharath/computable/contracts/BasicToken.sol", "file": "./BasicToken.sol", - "id": 3774, + "id": 3894, "nodeType": "ImportDirective", - "scope": 4019, - "sourceUnit": 155, + "scope": 4139, + "sourceUnit": 161, "src": "25:26:10", "symbolAliases": [], "unitAlias": "" }, { - "absolutePath": "/home/rob/Github/computable/contracts/ERC20.sol", + "absolutePath": "/home/bharath/computable/contracts/ERC20.sol", "file": "./ERC20.sol", - "id": 3775, + "id": 3895, "nodeType": "ImportDirective", - "scope": 4019, - "sourceUnit": 523, + "scope": 4139, + "sourceUnit": 529, "src": "52:21:10", "symbolAliases": [], "unitAlias": "" @@ -3547,17 +3547,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3776, + "id": 3896, "name": "ERC20", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 522, + "referencedDeclaration": 528, "src": "359:5:10", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20_$522", + "typeIdentifier": "t_contract$_ERC20_$528", "typeString": "contract ERC20" } }, - "id": 3777, + "id": 3897, "nodeType": "InheritanceSpecifier", "src": "359:5:10" }, @@ -3565,45 +3565,45 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3778, + "id": 3898, "name": "BasicToken", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 154, + "referencedDeclaration": 160, "src": "366:10:10", "typeDescriptions": { - "typeIdentifier": "t_contract$_BasicToken_$154", + "typeIdentifier": "t_contract$_BasicToken_$160", "typeString": "contract BasicToken" } }, - "id": 3779, + "id": 3899, "nodeType": "InheritanceSpecifier", "src": "366:10:10" } ], "contractDependencies": [ - 154, - 522, - 554 + 160, + 528, + 560 ], "contractKind": "contract", "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol", "fullyImplemented": true, - "id": 4018, + "id": 4138, "linearizedBaseContracts": [ - 4018, - 154, - 522, - 554 + 4138, + 160, + 528, + 560 ], "name": "StandardToken", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3785, + "id": 3905, "name": "allowed", "nodeType": "VariableDeclaration", - "scope": 4018, + "scope": 4138, "src": "382:66:10", "stateVariable": true, "storageLocation": "default", @@ -3612,9 +3612,9 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "typeName": { - "id": 3784, + "id": 3904, "keyType": { - "id": 3780, + "id": 3900, "name": "address", "nodeType": "ElementaryTypeName", "src": "391:7:10", @@ -3630,9 +3630,9 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "valueType": { - "id": 3783, + "id": 3903, "keyType": { - "id": 3781, + "id": 3901, "name": "address", "nodeType": "ElementaryTypeName", "src": "411:7:10", @@ -3648,7 +3648,7 @@ "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 3782, + "id": 3902, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "422:7:10", @@ -3664,7 +3664,7 @@ }, { "body": { - "id": 3870, + "id": 3990, "nodeType": "Block", "src": "839:356:10", "statements": [ @@ -3678,18 +3678,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3801, + "id": 3921, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3797, + "id": 3917, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "853:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3704,7 +3704,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3799, + "id": 3919, "isConstant": false, "isLValue": false, "isPure": true, @@ -3727,7 +3727,7 @@ "typeString": "int_const 0" } ], - "id": 3798, + "id": 3918, "isConstant": false, "isLValue": false, "isPure": true, @@ -3740,7 +3740,7 @@ }, "typeName": "address" }, - "id": 3800, + "id": 3920, "isConstant": false, "isLValue": false, "isPure": true, @@ -3768,21 +3768,21 @@ "typeString": "bool" } ], - "id": 3796, + "id": 3916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "845:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3802, + "id": 3922, "isConstant": false, "isLValue": false, "isPure": false, @@ -3796,7 +3796,7 @@ "typeString": "tuple()" } }, - "id": 3803, + "id": 3923, "nodeType": "ExpressionStatement", "src": "845:26:10" }, @@ -3810,18 +3810,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3809, + "id": 3929, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3805, + "id": 3925, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "885:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3834,25 +3834,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3806, + "id": 3926, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "895:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3808, + "id": 3928, "indexExpression": { "argumentTypes": null, - "id": 3807, + "id": 3927, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "904:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3884,21 +3884,21 @@ "typeString": "bool" } ], - "id": 3804, + "id": 3924, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "877:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3810, + "id": 3930, "isConstant": false, "isLValue": false, "isPure": false, @@ -3912,7 +3912,7 @@ "typeString": "tuple()" } }, - "id": 3811, + "id": 3931, "nodeType": "ExpressionStatement", "src": "877:34:10" }, @@ -3926,18 +3926,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3820, + "id": 3940, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3813, + "id": 3933, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "925:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3952,25 +3952,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3814, + "id": 3934, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "935:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3816, + "id": 3936, "indexExpression": { "argumentTypes": null, - "id": 3815, + "id": 3935, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "943:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3988,23 +3988,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3819, + "id": 3939, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3817, + "id": 3937, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "950:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3818, + "id": 3938, "isConstant": false, "isLValue": false, "isPure": false, @@ -4043,21 +4043,21 @@ "typeString": "bool" } ], - "id": 3812, + "id": 3932, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 4036, - 4037 + 4156, + 4157 ], - "referencedDeclaration": 4036, + "referencedDeclaration": 4156, "src": "917:7:10", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" } }, - "id": 3821, + "id": 3941, "isConstant": false, "isLValue": false, "isPure": false, @@ -4071,14 +4071,14 @@ "typeString": "tuple()" } }, - "id": 3822, + "id": 3942, "nodeType": "ExpressionStatement", "src": "917:45:10" }, { "expression": { "argumentTypes": null, - "id": 3832, + "id": 3952, "isConstant": false, "isLValue": false, "isPure": false, @@ -4087,25 +4087,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3823, + "id": 3943, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "969:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3825, + "id": 3945, "indexExpression": { "argumentTypes": null, - "id": 3824, + "id": 3944, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "978:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4130,11 +4130,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3830, + "id": 3950, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1007:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4153,25 +4153,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3826, + "id": 3946, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "987:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3828, + "id": 3948, "indexExpression": { "argumentTypes": null, - "id": 3827, + "id": 3947, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "996:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4189,21 +4189,21 @@ "typeString": "uint256" } }, - "id": 3829, + "id": 3949, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "987:19:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3831, + "id": 3951, "isConstant": false, "isLValue": false, "isPure": false, @@ -4223,14 +4223,14 @@ "typeString": "uint256" } }, - "id": 3833, + "id": 3953, "nodeType": "ExpressionStatement", "src": "969:45:10" }, { "expression": { "argumentTypes": null, - "id": 3843, + "id": 3963, "isConstant": false, "isLValue": false, "isPure": false, @@ -4239,25 +4239,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3834, + "id": 3954, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1020:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3836, + "id": 3956, "indexExpression": { "argumentTypes": null, - "id": 3835, + "id": 3955, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1029:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4282,11 +4282,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3841, + "id": 3961, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1054:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4305,25 +4305,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3837, + "id": 3957, "name": "balances", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, + "referencedDeclaration": 77, "src": "1036:8:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 3839, + "id": 3959, "indexExpression": { "argumentTypes": null, - "id": 3838, + "id": 3958, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1045:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4341,21 +4341,21 @@ "typeString": "uint256" } }, - "id": 3840, + "id": 3960, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "1036:17:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3842, + "id": 3962, "isConstant": false, "isLValue": false, "isPure": false, @@ -4375,14 +4375,14 @@ "typeString": "uint256" } }, - "id": 3844, + "id": 3964, "nodeType": "ExpressionStatement", "src": "1020:41:10" }, { "expression": { "argumentTypes": null, - "id": 3860, + "id": 3980, "isConstant": false, "isLValue": false, "isPure": false, @@ -4393,25 +4393,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3845, + "id": 3965, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1067:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3849, + "id": 3969, "indexExpression": { "argumentTypes": null, - "id": 3846, + "id": 3966, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1075:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4429,23 +4429,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3850, + "id": 3970, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3847, + "id": 3967, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1082:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3848, + "id": 3968, "isConstant": false, "isLValue": false, "isPure": false, @@ -4477,11 +4477,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3858, + "id": 3978, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1127:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4502,25 +4502,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3851, + "id": 3971, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1096:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3853, + "id": 3973, "indexExpression": { "argumentTypes": null, - "id": 3852, + "id": 3972, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1104:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4538,23 +4538,23 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3856, + "id": 3976, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3854, + "id": 3974, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1111:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3855, + "id": 3975, "isConstant": false, "isLValue": false, "isPure": false, @@ -4579,21 +4579,21 @@ "typeString": "uint256" } }, - "id": 3857, + "id": 3977, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "1096:30:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3859, + "id": 3979, "isConstant": false, "isLValue": false, "isPure": false, @@ -4613,7 +4613,7 @@ "typeString": "uint256" } }, - "id": 3861, + "id": 3981, "nodeType": "ExpressionStatement", "src": "1067:67:10" }, @@ -4623,11 +4623,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3863, + "id": 3983, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3787, + "referencedDeclaration": 3907, "src": "1154:5:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4636,11 +4636,11 @@ }, { "argumentTypes": null, - "id": 3864, + "id": 3984, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3789, + "referencedDeclaration": 3909, "src": "1161:3:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4649,11 +4649,11 @@ }, { "argumentTypes": null, - "id": 3865, + "id": 3985, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3791, + "referencedDeclaration": 3911, "src": "1166:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4676,18 +4676,18 @@ "typeString": "uint256" } ], - "id": 3862, + "id": 3982, "name": "Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 553, + "referencedDeclaration": 559, "src": "1145:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3866, + "id": 3986, "isConstant": false, "isLValue": false, "isPure": false, @@ -4701,7 +4701,7 @@ "typeString": "tuple()" } }, - "id": 3867, + "id": 3987, "nodeType": "EmitStatement", "src": "1140:33:10" }, @@ -4709,7 +4709,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3868, + "id": 3988, "isConstant": false, "isLValue": false, "isPure": true, @@ -4724,15 +4724,15 @@ }, "value": "true" }, - "functionReturnParameters": 3795, - "id": 3869, + "functionReturnParameters": 3915, + "id": 3989, "nodeType": "Return", "src": "1179:11:10" } ] }, "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred", - "id": 3871, + "id": 3991, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -4740,15 +4740,15 @@ "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3792, + "id": 3912, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3787, + "id": 3907, "name": "_from", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "752:13:10", "stateVariable": false, "storageLocation": "default", @@ -4757,7 +4757,7 @@ "typeString": "address" }, "typeName": { - "id": 3786, + "id": 3906, "name": "address", "nodeType": "ElementaryTypeName", "src": "752:7:10", @@ -4771,10 +4771,10 @@ }, { "constant": false, - "id": 3789, + "id": 3909, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "771:11:10", "stateVariable": false, "storageLocation": "default", @@ -4783,7 +4783,7 @@ "typeString": "address" }, "typeName": { - "id": 3788, + "id": 3908, "name": "address", "nodeType": "ElementaryTypeName", "src": "771:7:10", @@ -4797,10 +4797,10 @@ }, { "constant": false, - "id": 3791, + "id": 3911, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "788:14:10", "stateVariable": false, "storageLocation": "default", @@ -4809,7 +4809,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3790, + "id": 3910, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "788:7:10", @@ -4826,15 +4826,15 @@ }, "payable": false, "returnParameters": { - "id": 3795, + "id": 3915, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3794, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3871, + "scope": 3991, "src": "831:4:10", "stateVariable": false, "storageLocation": "default", @@ -4843,7 +4843,7 @@ "typeString": "bool" }, "typeName": { - "id": 3793, + "id": 3913, "name": "bool", "nodeType": "ElementaryTypeName", "src": "831:4:10", @@ -4858,22 +4858,22 @@ ], "src": "830:6:10" }, - "scope": 4018, + "scope": 4138, "src": "725:470:10", "stateMutability": "nonpayable", - "superFunction": 504, + "superFunction": 510, "visibility": "public" }, { "body": { - "id": 3898, + "id": 4018, "nodeType": "Block", "src": "1886:115:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3887, + "id": 4007, "isConstant": false, "isLValue": false, "isPure": false, @@ -4884,34 +4884,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3880, + "id": 4000, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "1892:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3884, + "id": 4004, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3881, + "id": 4001, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1900:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3882, + "id": 4002, "isConstant": false, "isLValue": false, "isPure": false, @@ -4936,14 +4936,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3885, + "id": 4005, "indexExpression": { "argumentTypes": null, - "id": 3883, + "id": 4003, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3873, + "referencedDeclaration": 3993, "src": "1912:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4965,11 +4965,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3886, + "id": 4006, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3875, + "referencedDeclaration": 3995, "src": "1924:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4982,7 +4982,7 @@ "typeString": "uint256" } }, - "id": 3888, + "id": 4008, "nodeType": "ExpressionStatement", "src": "1892:38:10" }, @@ -4994,18 +4994,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3890, + "id": 4010, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "1950:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3891, + "id": 4011, "isConstant": false, "isLValue": false, "isPure": false, @@ -5021,11 +5021,11 @@ }, { "argumentTypes": null, - "id": 3892, + "id": 4012, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3873, + "referencedDeclaration": 3993, "src": "1962:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5034,11 +5034,11 @@ }, { "argumentTypes": null, - "id": 3893, + "id": 4013, "name": "_value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3875, + "referencedDeclaration": 3995, "src": "1972:6:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5061,18 +5061,18 @@ "typeString": "uint256" } ], - "id": 3889, + "id": 4009, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "1941:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3894, + "id": 4014, "isConstant": false, "isLValue": false, "isPure": false, @@ -5086,7 +5086,7 @@ "typeString": "tuple()" } }, - "id": 3895, + "id": 4015, "nodeType": "EmitStatement", "src": "1936:43:10" }, @@ -5094,7 +5094,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3896, + "id": 4016, "isConstant": false, "isLValue": false, "isPure": true, @@ -5109,15 +5109,15 @@ }, "value": "true" }, - "functionReturnParameters": 3879, - "id": 3897, + "functionReturnParameters": 3999, + "id": 4017, "nodeType": "Return", "src": "1985:11:10" } ] }, "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.", - "id": 3899, + "id": 4019, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5125,15 +5125,15 @@ "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3876, + "id": 3996, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3873, + "id": 3993, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1830:16:10", "stateVariable": false, "storageLocation": "default", @@ -5142,7 +5142,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3992, "name": "address", "nodeType": "ElementaryTypeName", "src": "1830:7:10", @@ -5156,10 +5156,10 @@ }, { "constant": false, - "id": 3875, + "id": 3995, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1848:14:10", "stateVariable": false, "storageLocation": "default", @@ -5168,7 +5168,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3874, + "id": 3994, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1848:7:10", @@ -5185,15 +5185,15 @@ }, "payable": false, "returnParameters": { - "id": 3879, + "id": 3999, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3899, + "scope": 4019, "src": "1880:4:10", "stateVariable": false, "storageLocation": "default", @@ -5202,7 +5202,7 @@ "typeString": "bool" }, "typeName": { - "id": 3877, + "id": 3997, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1880:4:10", @@ -5217,15 +5217,15 @@ ], "src": "1879:6:10" }, - "scope": 4018, + "scope": 4138, "src": "1813:188:10", "stateMutability": "nonpayable", - "superFunction": 513, + "superFunction": 519, "visibility": "public" }, { "body": { - "id": 3914, + "id": 4034, "nodeType": "Block", "src": "2430:43:10", "statements": [ @@ -5236,25 +5236,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3908, + "id": 4028, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "2443:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3910, + "id": 4030, "indexExpression": { "argumentTypes": null, - "id": 3909, + "id": 4029, "name": "_owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3901, + "referencedDeclaration": 4021, "src": "2451:6:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5272,14 +5272,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3912, + "id": 4032, "indexExpression": { "argumentTypes": null, - "id": 3911, + "id": 4031, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3903, + "referencedDeclaration": 4023, "src": "2459:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5297,15 +5297,15 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3907, - "id": 3913, + "functionReturnParameters": 4027, + "id": 4033, "nodeType": "Return", "src": "2436:32:10" } ] }, "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.", - "id": 3915, + "id": 4035, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5313,15 +5313,15 @@ "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 3904, + "id": 4024, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3901, + "id": 4021, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2344:14:10", "stateVariable": false, "storageLocation": "default", @@ -5330,7 +5330,7 @@ "typeString": "address" }, "typeName": { - "id": 3900, + "id": 4020, "name": "address", "nodeType": "ElementaryTypeName", "src": "2344:7:10", @@ -5344,10 +5344,10 @@ }, { "constant": false, - "id": 3903, + "id": 4023, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2364:16:10", "stateVariable": false, "storageLocation": "default", @@ -5356,7 +5356,7 @@ "typeString": "address" }, "typeName": { - "id": 3902, + "id": 4022, "name": "address", "nodeType": "ElementaryTypeName", "src": "2364:7:10", @@ -5373,15 +5373,15 @@ }, "payable": false, "returnParameters": { - "id": 3907, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3906, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3915, + "scope": 4035, "src": "2419:7:10", "stateVariable": false, "storageLocation": "default", @@ -5390,7 +5390,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3905, + "id": 4025, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2419:7:10", @@ -5405,22 +5405,22 @@ ], "src": "2418:9:10" }, - "scope": 4018, + "scope": 4138, "src": "2320:153:10", "stateMutability": "view", - "superFunction": 493, + "superFunction": 499, "visibility": "public" }, { "body": { - "id": 3956, + "id": 4076, "nodeType": "Block", "src": "3034:187:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3940, + "id": 4060, "isConstant": false, "isLValue": false, "isPure": false, @@ -5431,34 +5431,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3924, + "id": 4044, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3040:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3928, + "id": 4048, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3925, + "id": 4045, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3048:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3926, + "id": 4046, "isConstant": false, "isLValue": false, "isPure": false, @@ -5483,14 +5483,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3929, + "id": 4049, "indexExpression": { "argumentTypes": null, - "id": 3927, + "id": 4047, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3060:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5518,11 +5518,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3937, + "id": 4057, "name": "_addedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3919, + "referencedDeclaration": 4039, "src": "3114:11:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5543,34 +5543,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3930, + "id": 4050, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3080:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3933, + "id": 4053, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3931, + "id": 4051, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3088:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3932, + "id": 4052, "isConstant": false, "isLValue": false, "isPure": false, @@ -5595,14 +5595,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3935, + "id": 4055, "indexExpression": { "argumentTypes": null, - "id": 3934, + "id": 4054, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3100:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5620,21 +5620,21 @@ "typeString": "uint256" } }, - "id": 3936, + "id": 4056, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 3770, + "referencedDeclaration": 3890, "src": "3080:33:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3938, + "id": 4058, "isConstant": false, "isLValue": false, "isPure": false, @@ -5649,7 +5649,7 @@ } } ], - "id": 3939, + "id": 4059, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5668,7 +5668,7 @@ "typeString": "uint256" } }, - "id": 3941, + "id": 4061, "nodeType": "ExpressionStatement", "src": "3040:87:10" }, @@ -5680,18 +5680,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3943, + "id": 4063, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3147:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3944, + "id": 4064, "isConstant": false, "isLValue": false, "isPure": false, @@ -5707,11 +5707,11 @@ }, { "argumentTypes": null, - "id": 3945, + "id": 4065, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3159:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5724,34 +5724,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3946, + "id": 4066, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3169:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3949, + "id": 4069, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3947, + "id": 4067, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3177:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3948, + "id": 4068, "isConstant": false, "isLValue": false, "isPure": false, @@ -5776,14 +5776,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3951, + "id": 4071, "indexExpression": { "argumentTypes": null, - "id": 3950, + "id": 4070, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3917, + "referencedDeclaration": 4037, "src": "3189:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5817,18 +5817,18 @@ "typeString": "uint256" } ], - "id": 3942, + "id": 4062, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "3138:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 3952, + "id": 4072, "isConstant": false, "isLValue": false, "isPure": false, @@ -5842,7 +5842,7 @@ "typeString": "tuple()" } }, - "id": 3953, + "id": 4073, "nodeType": "EmitStatement", "src": "3133:66:10" }, @@ -5850,7 +5850,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3954, + "id": 4074, "isConstant": false, "isLValue": false, "isPure": true, @@ -5865,15 +5865,15 @@ }, "value": "true" }, - "functionReturnParameters": 3923, - "id": 3955, + "functionReturnParameters": 4043, + "id": 4075, "nodeType": "Return", "src": "3205:11:10" } ] }, "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.", - "id": 3957, + "id": 4077, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5881,15 +5881,15 @@ "name": "increaseApproval", "nodeType": "FunctionDefinition", "parameters": { - "id": 3920, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3917, + "id": 4037, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "2956:16:10", "stateVariable": false, "storageLocation": "default", @@ -5898,7 +5898,7 @@ "typeString": "address" }, "typeName": { - "id": 3916, + "id": 4036, "name": "address", "nodeType": "ElementaryTypeName", "src": "2956:7:10", @@ -5912,10 +5912,10 @@ }, { "constant": false, - "id": 3919, + "id": 4039, "name": "_addedValue", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "2978:19:10", "stateVariable": false, "storageLocation": "default", @@ -5924,7 +5924,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3918, + "id": 4038, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2978:7:10", @@ -5941,15 +5941,15 @@ }, "payable": false, "returnParameters": { - "id": 3923, + "id": 4043, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3922, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3957, + "scope": 4077, "src": "3026:4:10", "stateVariable": false, "storageLocation": "default", @@ -5958,7 +5958,7 @@ "typeString": "bool" }, "typeName": { - "id": 3921, + "id": 4041, "name": "bool", "nodeType": "ElementaryTypeName", "src": "3026:4:10", @@ -5973,7 +5973,7 @@ ], "src": "3025:6:10" }, - "scope": 4018, + "scope": 4138, "src": "2925:296:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5981,21 +5981,21 @@ }, { "body": { - "id": 4016, + "id": 4136, "nodeType": "Block", "src": "3792:317:10", "statements": [ { "assignments": [ - 3967 + 4087 ], "declarations": [ { "constant": false, - "id": 3967, + "id": 4087, "name": "oldValue", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3798:16:10", "stateVariable": false, "storageLocation": "default", @@ -6004,7 +6004,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3966, + "id": 4086, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3798:7:10", @@ -6017,41 +6017,41 @@ "visibility": "internal" } ], - "id": 3974, + "id": 4094, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3968, + "id": 4088, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3817:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3971, + "id": 4091, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3969, + "id": 4089, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3825:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3970, + "id": 4090, "isConstant": false, "isLValue": false, "isPure": false, @@ -6076,14 +6076,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3973, + "id": 4093, "indexExpression": { "argumentTypes": null, - "id": 3972, + "id": 4092, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3837:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6111,18 +6111,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3977, + "id": 4097, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3975, + "id": 4095, "name": "_subtractedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3961, + "referencedDeclaration": 4081, "src": "3856:16:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6133,11 +6133,11 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 3976, + "id": 4096, "name": "oldValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3967, + "referencedDeclaration": 4087, "src": "3875:8:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6151,14 +6151,14 @@ } }, "falseBody": { - "id": 4000, + "id": 4120, "nodeType": "Block", "src": "3939:77:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3998, + "id": 4118, "isConstant": false, "isLValue": false, "isPure": false, @@ -6169,34 +6169,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3988, + "id": 4108, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3947:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3992, + "id": 4112, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3989, + "id": 4109, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3955:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3990, + "id": 4110, "isConstant": false, "isLValue": false, "isPure": false, @@ -6221,14 +6221,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3993, + "id": 4113, "indexExpression": { "argumentTypes": null, - "id": 3991, + "id": 4111, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3967:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6253,11 +6253,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3996, + "id": 4116, "name": "_subtractedValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3961, + "referencedDeclaration": 4081, "src": "3992:16:10", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6274,32 +6274,32 @@ ], "expression": { "argumentTypes": null, - "id": 3994, + "id": 4114, "name": "oldValue", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3967, + "referencedDeclaration": 4087, "src": "3979:8:10", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3995, + "id": 4115, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 3746, + "referencedDeclaration": 3866, "src": "3979:12:10", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3997, + "id": 4117, "isConstant": false, "isLValue": false, "isPure": false, @@ -6319,24 +6319,24 @@ "typeString": "uint256" } }, - "id": 3999, + "id": 4119, "nodeType": "ExpressionStatement", "src": "3947:62:10" } ] }, - "id": 4001, + "id": 4121, "nodeType": "IfStatement", "src": "3852:164:10", "trueBody": { - "id": 3987, + "id": 4107, "nodeType": "Block", "src": "3885:48:10", "statements": [ { "expression": { "argumentTypes": null, - "id": 3985, + "id": 4105, "isConstant": false, "isLValue": false, "isPure": false, @@ -6347,34 +6347,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3978, + "id": 4098, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "3893:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 3982, + "id": 4102, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3979, + "id": 4099, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "3901:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3980, + "id": 4100, "isConstant": false, "isLValue": false, "isPure": false, @@ -6399,14 +6399,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 3983, + "id": 4103, "indexExpression": { "argumentTypes": null, - "id": 3981, + "id": 4101, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "3913:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6429,7 +6429,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 3984, + "id": 4104, "isConstant": false, "isLValue": false, "isPure": true, @@ -6450,7 +6450,7 @@ "typeString": "uint256" } }, - "id": 3986, + "id": 4106, "nodeType": "ExpressionStatement", "src": "3893:33:10" } @@ -6465,18 +6465,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 4003, + "id": 4123, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "4035:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 4004, + "id": 4124, "isConstant": false, "isLValue": false, "isPure": false, @@ -6492,11 +6492,11 @@ }, { "argumentTypes": null, - "id": 4005, + "id": 4125, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "4047:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6509,34 +6509,34 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 4006, + "id": 4126, "name": "allowed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3785, + "referencedDeclaration": 3905, "src": "4057:7:10", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 4009, + "id": 4129, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 4007, + "id": 4127, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4033, + "referencedDeclaration": 4153, "src": "4065:3:10", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 4008, + "id": 4128, "isConstant": false, "isLValue": false, "isPure": false, @@ -6561,14 +6561,14 @@ "typeString": "mapping(address => uint256)" } }, - "id": 4011, + "id": 4131, "indexExpression": { "argumentTypes": null, - "id": 4010, + "id": 4130, "name": "_spender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3959, + "referencedDeclaration": 4079, "src": "4077:8:10", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6602,18 +6602,18 @@ "typeString": "uint256" } ], - "id": 4002, + "id": 4122, "name": "Approval", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 521, + "referencedDeclaration": 527, "src": "4026:8:10", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4012, + "id": 4132, "isConstant": false, "isLValue": false, "isPure": false, @@ -6627,7 +6627,7 @@ "typeString": "tuple()" } }, - "id": 4013, + "id": 4133, "nodeType": "EmitStatement", "src": "4021:66:10" }, @@ -6635,7 +6635,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 4014, + "id": 4134, "isConstant": false, "isLValue": false, "isPure": true, @@ -6650,15 +6650,15 @@ }, "value": "true" }, - "functionReturnParameters": 3965, - "id": 4015, + "functionReturnParameters": 4085, + "id": 4135, "nodeType": "Return", "src": "4093:11:10" } ] }, "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.", - "id": 4017, + "id": 4137, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -6666,15 +6666,15 @@ "name": "decreaseApproval", "nodeType": "FunctionDefinition", "parameters": { - "id": 3962, + "id": 4082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4079, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3709:16:10", "stateVariable": false, "storageLocation": "default", @@ -6683,7 +6683,7 @@ "typeString": "address" }, "typeName": { - "id": 3958, + "id": 4078, "name": "address", "nodeType": "ElementaryTypeName", "src": "3709:7:10", @@ -6697,10 +6697,10 @@ }, { "constant": false, - "id": 3961, + "id": 4081, "name": "_subtractedValue", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3731:24:10", "stateVariable": false, "storageLocation": "default", @@ -6709,7 +6709,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3960, + "id": 4080, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3731:7:10", @@ -6726,15 +6726,15 @@ }, "payable": false, "returnParameters": { - "id": 3965, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3964, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4017, + "scope": 4137, "src": "3784:4:10", "stateVariable": false, "storageLocation": "default", @@ -6743,7 +6743,7 @@ "typeString": "bool" }, "typeName": { - "id": 3963, + "id": 4083, "name": "bool", "nodeType": "ElementaryTypeName", "src": "3784:4:10", @@ -6758,14 +6758,14 @@ ], "src": "3783:6:10" }, - "scope": 4018, + "scope": 4138, "src": "3678:431:10", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4019, + "scope": 4139, "src": "333:3779:10" } ], @@ -6777,5 +6777,5 @@ }, "networks": {}, "schemaVersion": "2.0.1", - "updatedAt": "2018-06-21T22:21:14.792Z" + "updatedAt": "2018-06-26T02:58:22.320Z" } \ No newline at end of file diff --git a/contracts/PLCRVoting.sol b/contracts/PLCRVoting.sol index 6cf69be..1196d81 100644 --- a/contracts/PLCRVoting.sol +++ b/contracts/PLCRVoting.sol @@ -80,7 +80,7 @@ contract PLCRVoting { */ function requestVotingRights(uint _numTokens) external { require(token.balanceOf(msg.sender) >= _numTokens); - voteTokenBalance[msg.sender] += _numTokens; + voteTokenBalance[msg.sender] = voteTokenBalance[msg.sender].add(_numTokens); require(token.transferFrom(msg.sender, this, _numTokens)); emit _VotingRightsGranted(_numTokens, msg.sender); } @@ -92,7 +92,7 @@ contract PLCRVoting { function withdrawVotingRights(uint _numTokens) external { uint availableTokens = voteTokenBalance[msg.sender].sub(getLockedTokens(msg.sender)); require(availableTokens >= _numTokens); - voteTokenBalance[msg.sender] -= _numTokens; + voteTokenBalance[msg.sender] = voteTokenBalance[msg.sender].sub(_numTokens); require(token.transfer(msg.sender, _numTokens)); emit _VotingRightsWithdrawn(_numTokens, msg.sender); } @@ -196,9 +196,9 @@ contract PLCRVoting { uint numTokens = getNumTokens(msg.sender, _pollID); if (_voteOption == 1) {// apply numTokens to appropriate poll choice - pollMap[_pollID].votesFor += numTokens; + pollMap[_pollID].votesFor = pollMap[_pollID].votesFor.add(numTokens); } else { - pollMap[_pollID].votesAgainst += numTokens; + pollMap[_pollID].votesAgainst = pollMap[_pollID].votesAgainst.add(numTokens); } dllMap[msg.sender].remove(_pollID); // remove the node referring to this vote upon reveal @@ -242,7 +242,7 @@ contract PLCRVoting { @param _revealDuration Length of desired reveal period in seconds */ function startPoll(uint _voteQuorum, uint _commitDuration, uint _revealDuration) public returns (uint pollID) { - pollNonce = pollNonce + 1; + pollNonce = pollNonce.add(1); uint commitEndDate = block.timestamp.add(_commitDuration); uint revealEndDate = commitEndDate.add(_revealDuration); @@ -275,7 +275,7 @@ contract PLCRVoting { require(pollEnded(_pollID)); Poll memory poll = pollMap[_pollID]; - return (100 * poll.votesFor) > (poll.voteQuorum * (poll.votesFor + poll.votesAgainst)); + return (poll.votesFor.mul(100)) > (poll.voteQuorum.mul(poll.votesFor.add(poll.votesAgainst))); } // ---------------- diff --git a/contracts/Parameterizer.sol b/contracts/Parameterizer.sol index 9de191a..7a1f4f3 100644 --- a/contracts/Parameterizer.sol +++ b/contracts/Parameterizer.sol @@ -270,8 +270,8 @@ contract Parameterizer { // subtract voter's information to preserve the participation ratios of other voters // compared to the remaining pool of rewards - challenges[_challengeID].winningTokens -= voterTokens; - challenges[_challengeID].rewardPool -= reward; + challenges[_challengeID].winningTokens = challenges[_challengeID].winningTokens.sub(voterTokens); + challenges[_challengeID].rewardPool = challenges[_challengeID].rewardPool.sub(reward); // ensures a voter cannot claim tokens again challenges[_challengeID].tokenClaims[msg.sender] = true; @@ -297,7 +297,7 @@ contract Parameterizer { uint winningTokens = challenges[_challengeID].winningTokens; uint rewardPool = challenges[_challengeID].rewardPool; uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt); - return (voterTokens * rewardPool) / winningTokens; + return voterTokens.mul(rewardPool).div(winningTokens); } /** @@ -336,10 +336,10 @@ contract Parameterizer { function challengeWinnerReward(uint _challengeID) public view returns (uint) { if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) { // Edge case, nobody voted, give all tokens to the challenger. - return 2 * challenges[_challengeID].stake; + return challenges[_challengeID].stake.mul(2); } - return (2 * challenges[_challengeID].stake) - challenges[_challengeID].rewardPool; + return (challenges[_challengeID].stake.mul(2)).sub(challenges[_challengeID].rewardPool); } /** diff --git a/contracts/Registry.sol b/contracts/Registry.sol index 1a52826..d5e13a1 100644 --- a/contracts/Registry.sol +++ b/contracts/Registry.sol @@ -125,7 +125,7 @@ contract Registry { require(listing.owner == msg.sender); - listing.unstakedDeposit += _amount; + listing.unstakedDeposit = listing.unstakedDeposit.add(_amount); require(token.transferFrom(msg.sender, this, _amount)); emit _Deposit( @@ -146,9 +146,9 @@ contract Registry { require(listing.owner == msg.sender); require(_amount <= listing.unstakedDeposit); - require(listing.unstakedDeposit - _amount >= parameterizer.get("minDeposit")); + require(listing.unstakedDeposit.sub(_amount) >= parameterizer.get("minDeposit")); - listing.unstakedDeposit -= _amount; + listing.unstakedDeposit = listing.unstakedDeposit.sub(_amount); require(token.transfer(msg.sender, _amount)); emit _Withdrawal( @@ -214,7 +214,7 @@ contract Registry { challenges[pollID] = Challenge({ challenger: msg.sender, - rewardPool: ((100 - parameterizer.get("dispensationPct")) * minDeposit) / 100, + rewardPool: uint(100).sub(parameterizer.get("dispensationPct")).mul(minDeposit).div(100), stake: minDeposit, resolved: false, totalTokens: 0 @@ -224,7 +224,7 @@ contract Registry { listing.challengeID = pollID; // Locks tokens for listingHash during challenge - listing.unstakedDeposit -= minDeposit; + listing.unstakedDeposit = listing.unstakedDeposit.sub(minDeposit); // Takes tokens from challenger require(token.transferFrom(msg.sender, this, minDeposit)); @@ -280,8 +280,8 @@ contract Registry { // Subtracts the voter's information to preserve the participation ratios // of other voters compared to the remaining pool of rewards - challenges[_challengeID].totalTokens -= voterTokens; - challenges[_challengeID].rewardPool -= reward; + challenges[_challengeID].totalTokens = challenges[_challengeID].totalTokens.sub(voterTokens); + challenges[_challengeID].rewardPool = challenges[_challengeID].rewardPool.sub(reward); // Ensures a voter cannot claim tokens again challenges[_challengeID].tokenClaims[msg.sender] = true; @@ -308,7 +308,7 @@ contract Registry { uint totalTokens = challenges[_challengeID].totalTokens; uint rewardPool = challenges[_challengeID].rewardPool; uint voterTokens = voting.getNumPassingTokens(_voter, _challengeID, _salt); - return (voterTokens * rewardPool) / totalTokens; + return voterTokens.mul(rewardPool).div(totalTokens); } /** @@ -383,10 +383,10 @@ contract Registry { // Edge case, nobody voted, give all tokens to the challenger. if (voting.getTotalNumberOfTokensForWinningOption(_challengeID) == 0) { - return 2 * challenges[_challengeID].stake; + return uint(2).mul(challenges[_challengeID].stake); } - return (2 * challenges[_challengeID].stake) - challenges[_challengeID].rewardPool; + return uint(2).mul(challenges[_challengeID].stake).sub(challenges[_challengeID].rewardPool); } /** @@ -424,7 +424,7 @@ contract Registry { if (voting.isPassed(challengeID)) { whitelistApplication(_listingHash); // Unlock stake so that it can be retrieved by the applicant - listings[_listingHash].unstakedDeposit += reward; + listings[_listingHash].unstakedDeposit = listings[_listingHash].unstakedDeposit.add(reward); emit _ChallengeFailed( _listingHash,