From 3beccfd9072fa986320158dfd32fb7aa8bd85d49 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Wed, 5 Jul 2017 16:33:43 -0500 Subject: [PATCH 1/9] Created way to extract and inject network info for build artifacts --- build/contracts/Campaign.json | 316 --------- build/contracts/CampaignFactory.json | 94 --- build/contracts/CategoricalEvent.json | 281 -------- build/contracts/CentralizedOracle.json | 151 ----- build/contracts/CentralizedOracleFactory.json | 108 --- build/contracts/DifficultyOracle.json | 91 --- build/contracts/DifficultyOracleFactory.json | 49 -- build/contracts/EtherToken.json | 445 ------------ build/contracts/Event.json | 281 -------- build/contracts/EventFactory.json | 327 --------- build/contracts/FutarchyOracle.json | 227 ------- build/contracts/FutarchyOracleFactory.json | 131 ---- build/contracts/LMSRMarketMaker.json | 100 --- build/contracts/MajorityOracle.json | 80 --- build/contracts/MajorityOracleFactory.json | 49 -- build/contracts/Market.json | 359 ---------- build/contracts/MarketFactory.json | 67 -- build/contracts/MarketMaker.json | 83 --- build/contracts/Math.json | 397 ----------- build/contracts/Migrations.json | 79 --- build/contracts/Oracle.json | 35 - build/contracts/OutcomeToken.json | 262 ------- build/contracts/ScalarEvent.json | 350 ---------- build/contracts/SignedMessageOracle.json | 187 ----- .../contracts/SignedMessageOracleFactory.json | 61 -- build/contracts/StandardMarket.json | 394 ----------- build/contracts/StandardMarketFactory.json | 150 ---- build/contracts/StandardToken.json | 176 ----- build/contracts/Token.json | 176 ----- build/contracts/UltimateOracle.json | 406 ----------- build/contracts/UltimateOracleFactory.json | 207 ------ networks.json | 640 ++++++++++++++++++ package.json | 2 +- scripts/extract_network_info.js | 16 + scripts/inject_network_info.js | 16 + test_local.js => scripts/test_local.js | 0 36 files changed, 673 insertions(+), 6120 deletions(-) delete mode 100644 build/contracts/Campaign.json delete mode 100644 build/contracts/CampaignFactory.json delete mode 100644 build/contracts/CategoricalEvent.json delete mode 100644 build/contracts/CentralizedOracle.json delete mode 100644 build/contracts/CentralizedOracleFactory.json delete mode 100644 build/contracts/DifficultyOracle.json delete mode 100644 build/contracts/DifficultyOracleFactory.json delete mode 100644 build/contracts/EtherToken.json delete mode 100644 build/contracts/Event.json delete mode 100644 build/contracts/EventFactory.json delete mode 100644 build/contracts/FutarchyOracle.json delete mode 100644 build/contracts/FutarchyOracleFactory.json delete mode 100644 build/contracts/LMSRMarketMaker.json delete mode 100644 build/contracts/MajorityOracle.json delete mode 100644 build/contracts/MajorityOracleFactory.json delete mode 100644 build/contracts/Market.json delete mode 100644 build/contracts/MarketFactory.json delete mode 100644 build/contracts/MarketMaker.json delete mode 100644 build/contracts/Math.json delete mode 100644 build/contracts/Migrations.json delete mode 100644 build/contracts/Oracle.json delete mode 100644 build/contracts/OutcomeToken.json delete mode 100644 build/contracts/ScalarEvent.json delete mode 100644 build/contracts/SignedMessageOracle.json delete mode 100644 build/contracts/SignedMessageOracleFactory.json delete mode 100644 build/contracts/StandardMarket.json delete mode 100644 build/contracts/StandardMarketFactory.json delete mode 100644 build/contracts/StandardToken.json delete mode 100644 build/contracts/Token.json delete mode 100644 build/contracts/UltimateOracle.json delete mode 100644 build/contracts/UltimateOracleFactory.json create mode 100644 networks.json create mode 100644 scripts/extract_network_info.js create mode 100644 scripts/inject_network_info.js rename test_local.js => scripts/test_local.js (100%) diff --git a/build/contracts/Campaign.json b/build/contracts/Campaign.json deleted file mode 100644 index ace77e4..0000000 --- a/build/contracts/Campaign.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "contract_name": "Campaign", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "marketFactory", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "marketMaker", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "finalBalance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "deadline", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "contributions", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "withdrawFees", - "outputs": [ - { - "name": "fees", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "refund", - "outputs": [ - { - "name": "refundAmount", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "market", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "createMarket", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "stage", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "closeMarket", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "amount", - "type": "uint256" - } - ], - "name": "fund", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "funding", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "fee", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "eventContract", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "FEE_RANGE", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_eventContract", - "type": "address" - }, - { - "name": "_marketFactory", - "type": "address" - }, - { - "name": "_marketMaker", - "type": "address" - }, - { - "name": "_fee", - "type": "uint24" - }, - { - "name": "_funding", - "type": "uint256" - }, - { - "name": "_deadline", - "type": "uint256" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "funding", - "type": "uint256" - } - ], - "name": "CampaignFunding", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "refund", - "type": "uint256" - } - ], - "name": "CampaignRefund", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "market", - "type": "address" - } - ], - "name": "MarketCreation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [], - "name": "MarketClosing", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "fees", - "type": "uint256" - } - ], - "name": "FeeWithdrawal", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b60405160c08061121a83398101604090815281516020830151918301516060840151608085015160a090950151929491929091905b600160a060020a038616158015906100615750600160a060020a03851615155b80156100755750600160a060020a03841615155b80156100885750620f424062ffffff8416105b80156100945750600082115b801561009f57508042105b15156100ab5760006000fd5b60008054600160a060020a0319908116600160a060020a0389811691909117909255600180548216888416179055600280549091169186169190911790556003805460a060020a62ffffff0219167401000000000000000000000000000000000000000062ffffff861602179055600482905560058190555b5050505050505b6110e08061013a6000396000f300606060405236156100ca5763ffffffff60e060020a60003504166306ae709581146100cc5780631f21f9af146100f85780632129e25a1461012457806329dcb0cf1461014657806342e94c9014610168578063476343ee14610196578063590e1ae3146101b857806380f55605146101da578063aea0e35f14610206578063c040e6b814610232578063c511ed5e14610266578063ca1d209d14610278578063cb4c86b71461028d578063ddca3f43146102af578063e274fd24146102d7578063fbde47f614610303575bfe5b34156100d457fe5b6100dc61032b565b60408051600160a060020a039092168252519081900360200190f35b341561010057fe5b6100dc61033a565b60408051600160a060020a039092168252519081900360200190f35b341561012c57fe5b610134610349565b60408051918252519081900360200190f35b341561014e57fe5b61013461034f565b60408051918252519081900360200190f35b341561017057fe5b610134600160a060020a0360043516610355565b60408051918252519081900360200190f35b341561019e57fe5b610134610367565b60408051918252519081900360200190f35b34156101c057fe5b61013461057d565b60408051918252519081900360200190f35b34156101e257fe5b6100dc610724565b60408051600160a060020a039092168252519081900360200190f35b341561020e57fe5b6100dc610733565b60408051600160a060020a039092168252519081900360200190f35b341561023a57fe5b6102426109d7565b6040518082600481111561025257fe5b60ff16815260200191505060405180910390f35b341561026e57fe5b6102766109e0565b005b341561028057fe5b610276600435610cbc565b005b341561029557fe5b610134611086565b60408051918252519081900360200190f35b34156102b757fe5b6102bf61108c565b6040805162ffffff9092168252519081900360200190f35b34156102df57fe5b6100dc61109e565b60408051600160a060020a039092168252519081900360200190f35b341561030b57fe5b6102bf6110ad565b6040805162ffffff9092168252519081900360200190f35b600154600160a060020a031681565b600254600160a060020a031681565b60065481565b60055481565b60076020526000908152604090205481565b60006004805b60085460ff16600481111561037e57fe5b146103895760006000fd5b60045460065473__Math__________________________________63c8a4ac9c90916007600033600160a060020a0316600160a060020a03168152602001908152602001600020546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561041457fe5b6102c65a03f4151561042257fe5b505060405151905081151561043357fe5b600160a060020a033381166000908152600760209081526040808320839055825481518301849052815160e260020a632c805af50281529151969095049750939092169363b2016bd49360048082019493918390030190829087803b151561049757fe5b6102c65a03f115156104a557fe5b50505060405180519050600160a060020a031663a9059cbb33846000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561051657fe5b6102c65a03f1151561052457fe5b505060405151151590506105385760006000fd5b604080518381529051600160a060020a033316917fee33a3a9cb48e4ff209f8b1c67c4632f1dbbf55aeff8e6f17d957ade7a6fb17c919081900360200190a25b5b5090565b6000805b60085460ff16600481111561059257fe5b1480156105a0575042600554105b156105bb57600880546002919060ff19166001835b02179055505b6002805b60085460ff1660048111156105d057fe5b146105db5760006000fd5b600160a060020a033381166000908152600760209081526040808320805490849055835482518401859052825160e260020a632c805af502815292519197509094169363b2016bd493600480840194938390030190829087803b151561063d57fe5b6102c65a03f1151561064b57fe5b50505060405180519050600160a060020a031663a9059cbb33846000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b15156106bc57fe5b6102c65a03f115156106ca57fe5b505060405151151590506106de5760006000fd5b604080518381529051600160a060020a033316917fd53235e384e83b261994d71b101de6c22402415c0c0d313f064a90e91039e2a9919081900360200190a25b5b505b90565b600354600160a060020a031681565b6000805b60085460ff16600481111561074857fe5b148015610756575042600554105b1561077157600880546002919060ff19166001835b02179055505b6001805b60085460ff16600481111561078657fe5b146107915760006000fd5b60015460008054600254600354604080516020908101869052815160e560020a6303d5f5b5028152600160a060020a039586166004820152938516602485015260a060020a90920462ffffff166044840152519290941693637abeb6a09360648084019492938390030190829087803b151561080957fe5b6102c65a03f1151561081757fe5b505060408051805160038054600160a060020a031916600160a060020a03928316179055600080546020938401829052845160e260020a632c805af502815294519216945063b2016bd4936004808201949392918390030190829087803b151561087d57fe5b6102c65a03f1151561088b57fe5b50506040805180516003546004805460006020958601819052865160e060020a63095ea7b3028152600160a060020a03948516938101939093526024830191909152945191909216945063095ea7b393604480840194938390030190829087803b15156108f457fe5b6102c65a03f1151561090257fe5b505060405151151590506109165760006000fd5b600354600480546040805160e060020a63ca1d209d0281529283019190915251600160a060020a039092169163ca1d209d9160248082019260009290919082900301818387803b151561096557fe5b6102c65a03f1151561097357fe5b5050600880546003925060ff19166001835b0217905550600354604051600160a060020a03909116907fd50a500cb3b7c976a045df06de01ca42c942e1a2c43ac27d96bfa7ece3138a9990600090a2600354600160a060020a031691505b5b505b90565b60085460ff1681565b6003805b60085460ff1660048111156109f557fe5b14610a005760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610a5b57fe5b6102c65a03f11515610a6957fe5b50506040515115159050610a7d5760006000fd5b6003546040805160e160020a6321eb936b0281529051600160a060020a03909216916343d726d69160048082019260009290919082900301818387803b1515610ac257fe5b6102c65a03f11515610ad057fe5b505050600360009054906101000a9004600160a060020a0316600160a060020a031663476343ee6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610b2e57fe5b6102c65a03f11515610b3c57fe5b505060408051600080546020928301829052835160e260020a632b42cafb0281529351600160a060020a03909116945063ad0b2bec9360048082019493918390030190829087803b1515610b8c57fe5b6102c65a03f11515610b9a57fe5b505060408051600080546020928301829052835160e260020a632c805af50281529351600160a060020a03909116945063b2016bd49360048082019493918390030190829087803b1515610bea57fe5b6102c65a03f11515610bf857fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610c6157fe5b6102c65a03f11515610c6f57fe5b50506040515160065550600880546004919060ff19166001835b02179055506040517fe7d85885f81486e8f4c99e50e056745493861b8b5d4f973dcf0c3c0f74a25e0790600090a15b5b50565b600080805b60085460ff166004811115610cd257fe5b148015610ce0575042600554105b15610cfb57600880546002919060ff19166001835b02179055505b6000805b60085460ff166004811115610d1057fe5b14610d1b5760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610d7657fe5b6102c65a03f11515610d8457fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610ded57fe5b6102c65a03f11515610dfb57fe5b5050604080518051600480546000602094850152845160e060020a63b67d77c50281529182015260248101829052925190965073__Math__________________________________935063b67d77c5926044808201939291829003018186803b1515610e6357fe5b6102c65a03f41515610e7157fe5b50506040515192505083821015610e86578193505b600060009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610ee157fe5b6102c65a03f11515610eef57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018b905294519490921694506323b872dd93606480840194939192918390030190829087803b1515610f5957fe5b6102c65a03f11515610f6757fe5b50506040515115159050610f7b5760006000fd5b600160a060020a0333166000908152600760209081526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018790525173__Math__________________________________9263771602f7926044808301939192829003018186803b1515610ff257fe5b6102c65a03f4151561100057fe5b50506040805151600160a060020a033316600090815260076020529190912055508382141561103e57600880546001919060ff191682805b02179055505b604080518581529051600160a060020a033316917f9e85601c404591b54325b6512021f8145643571c59865b7ab29ed9e0664cb17f919081900360200190a25b5b505b505050565b60045481565b60035460a060020a900462ffffff1681565b600054600160a060020a031681565b620f4240815600a165627a7a72305820ef769afac81cb06aeec76949ce01afa6a75502de53ee0d250e394bcf81920a430029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373989 -} \ No newline at end of file diff --git a/build/contracts/CampaignFactory.json b/build/contracts/CampaignFactory.json deleted file mode 100644 index d785a9d..0000000 --- a/build/contracts/CampaignFactory.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "contract_name": "CampaignFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "eventContract", - "type": "address" - }, - { - "name": "marketFactory", - "type": "address" - }, - { - "name": "marketMaker", - "type": "address" - }, - { - "name": "fee", - "type": "uint24" - }, - { - "name": "funding", - "type": "uint256" - }, - { - "name": "deadline", - "type": "uint256" - } - ], - "name": "createCampaigns", - "outputs": [ - { - "name": "campaign", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "campaign", - "type": "address" - }, - { - "indexed": false, - "name": "eventContract", - "type": "address" - }, - { - "indexed": false, - "name": "marketFactory", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - }, - { - "indexed": false, - "name": "funding", - "type": "uint256" - }, - { - "indexed": false, - "name": "deadline", - "type": "uint256" - } - ], - "name": "CampaignCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6113ab8061001c6000396000f300606060405263ffffffff60e060020a600035041663080118228114610021575bfe5b341561002957fe5b610057600160a060020a036004358116906024358116906044351662ffffff6064351660843560a435610073565b60408051600160a060020a039092168252519081900360200190f35b6000868686868686610083610155565b600160a060020a03968716815294861660208601529290941660408085019190915262ffffff9091166060840152608083019390935260a082015290519081900360c001906000f08015156100d457fe5b60408051600160a060020a0380841682528a8116602083015289811682840152888116606083015262ffffff8816608083015260a0820187905260c0820186905291519293503391909116917f7a9fd19b658538a67209802dd9011d6e3ce04586fe93c87096d2bc40ed8508669181900360e00190a25b9695505050505050565b60405161121a806101668339019056006060604052341561000c57fe5b60405160c08061121a83398101604090815281516020830151918301516060840151608085015160a090950151929491929091905b600160a060020a038616158015906100615750600160a060020a03851615155b80156100755750600160a060020a03841615155b80156100885750620f424062ffffff8416105b80156100945750600082115b801561009f57508042105b15156100ab5760006000fd5b60008054600160a060020a0319908116600160a060020a0389811691909117909255600180548216888416179055600280549091169186169190911790556003805460a060020a62ffffff0219167401000000000000000000000000000000000000000062ffffff861602179055600482905560058190555b5050505050505b6110e08061013a6000396000f300606060405236156100ca5763ffffffff60e060020a60003504166306ae709581146100cc5780631f21f9af146100f85780632129e25a1461012457806329dcb0cf1461014657806342e94c9014610168578063476343ee14610196578063590e1ae3146101b857806380f55605146101da578063aea0e35f14610206578063c040e6b814610232578063c511ed5e14610266578063ca1d209d14610278578063cb4c86b71461028d578063ddca3f43146102af578063e274fd24146102d7578063fbde47f614610303575bfe5b34156100d457fe5b6100dc61032b565b60408051600160a060020a039092168252519081900360200190f35b341561010057fe5b6100dc61033a565b60408051600160a060020a039092168252519081900360200190f35b341561012c57fe5b610134610349565b60408051918252519081900360200190f35b341561014e57fe5b61013461034f565b60408051918252519081900360200190f35b341561017057fe5b610134600160a060020a0360043516610355565b60408051918252519081900360200190f35b341561019e57fe5b610134610367565b60408051918252519081900360200190f35b34156101c057fe5b61013461057d565b60408051918252519081900360200190f35b34156101e257fe5b6100dc610724565b60408051600160a060020a039092168252519081900360200190f35b341561020e57fe5b6100dc610733565b60408051600160a060020a039092168252519081900360200190f35b341561023a57fe5b6102426109d7565b6040518082600481111561025257fe5b60ff16815260200191505060405180910390f35b341561026e57fe5b6102766109e0565b005b341561028057fe5b610276600435610cbc565b005b341561029557fe5b610134611086565b60408051918252519081900360200190f35b34156102b757fe5b6102bf61108c565b6040805162ffffff9092168252519081900360200190f35b34156102df57fe5b6100dc61109e565b60408051600160a060020a039092168252519081900360200190f35b341561030b57fe5b6102bf6110ad565b6040805162ffffff9092168252519081900360200190f35b600154600160a060020a031681565b600254600160a060020a031681565b60065481565b60055481565b60076020526000908152604090205481565b60006004805b60085460ff16600481111561037e57fe5b146103895760006000fd5b60045460065473__Math__________________________________63c8a4ac9c90916007600033600160a060020a0316600160a060020a03168152602001908152602001600020546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561041457fe5b6102c65a03f4151561042257fe5b505060405151905081151561043357fe5b600160a060020a033381166000908152600760209081526040808320839055825481518301849052815160e260020a632c805af50281529151969095049750939092169363b2016bd49360048082019493918390030190829087803b151561049757fe5b6102c65a03f115156104a557fe5b50505060405180519050600160a060020a031663a9059cbb33846000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561051657fe5b6102c65a03f1151561052457fe5b505060405151151590506105385760006000fd5b604080518381529051600160a060020a033316917fee33a3a9cb48e4ff209f8b1c67c4632f1dbbf55aeff8e6f17d957ade7a6fb17c919081900360200190a25b5b5090565b6000805b60085460ff16600481111561059257fe5b1480156105a0575042600554105b156105bb57600880546002919060ff19166001835b02179055505b6002805b60085460ff1660048111156105d057fe5b146105db5760006000fd5b600160a060020a033381166000908152600760209081526040808320805490849055835482518401859052825160e260020a632c805af502815292519197509094169363b2016bd493600480840194938390030190829087803b151561063d57fe5b6102c65a03f1151561064b57fe5b50505060405180519050600160a060020a031663a9059cbb33846000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b15156106bc57fe5b6102c65a03f115156106ca57fe5b505060405151151590506106de5760006000fd5b604080518381529051600160a060020a033316917fd53235e384e83b261994d71b101de6c22402415c0c0d313f064a90e91039e2a9919081900360200190a25b5b505b90565b600354600160a060020a031681565b6000805b60085460ff16600481111561074857fe5b148015610756575042600554105b1561077157600880546002919060ff19166001835b02179055505b6001805b60085460ff16600481111561078657fe5b146107915760006000fd5b60015460008054600254600354604080516020908101869052815160e560020a6303d5f5b5028152600160a060020a039586166004820152938516602485015260a060020a90920462ffffff166044840152519290941693637abeb6a09360648084019492938390030190829087803b151561080957fe5b6102c65a03f1151561081757fe5b505060408051805160038054600160a060020a031916600160a060020a03928316179055600080546020938401829052845160e260020a632c805af502815294519216945063b2016bd4936004808201949392918390030190829087803b151561087d57fe5b6102c65a03f1151561088b57fe5b50506040805180516003546004805460006020958601819052865160e060020a63095ea7b3028152600160a060020a03948516938101939093526024830191909152945191909216945063095ea7b393604480840194938390030190829087803b15156108f457fe5b6102c65a03f1151561090257fe5b505060405151151590506109165760006000fd5b600354600480546040805160e060020a63ca1d209d0281529283019190915251600160a060020a039092169163ca1d209d9160248082019260009290919082900301818387803b151561096557fe5b6102c65a03f1151561097357fe5b5050600880546003925060ff19166001835b0217905550600354604051600160a060020a03909116907fd50a500cb3b7c976a045df06de01ca42c942e1a2c43ac27d96bfa7ece3138a9990600090a2600354600160a060020a031691505b5b505b90565b60085460ff1681565b6003805b60085460ff1660048111156109f557fe5b14610a005760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610a5b57fe5b6102c65a03f11515610a6957fe5b50506040515115159050610a7d5760006000fd5b6003546040805160e160020a6321eb936b0281529051600160a060020a03909216916343d726d69160048082019260009290919082900301818387803b1515610ac257fe5b6102c65a03f11515610ad057fe5b505050600360009054906101000a9004600160a060020a0316600160a060020a031663476343ee6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610b2e57fe5b6102c65a03f11515610b3c57fe5b505060408051600080546020928301829052835160e260020a632b42cafb0281529351600160a060020a03909116945063ad0b2bec9360048082019493918390030190829087803b1515610b8c57fe5b6102c65a03f11515610b9a57fe5b505060408051600080546020928301829052835160e260020a632c805af50281529351600160a060020a03909116945063b2016bd49360048082019493918390030190829087803b1515610bea57fe5b6102c65a03f11515610bf857fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610c6157fe5b6102c65a03f11515610c6f57fe5b50506040515160065550600880546004919060ff19166001835b02179055506040517fe7d85885f81486e8f4c99e50e056745493861b8b5d4f973dcf0c3c0f74a25e0790600090a15b5b50565b600080805b60085460ff166004811115610cd257fe5b148015610ce0575042600554105b15610cfb57600880546002919060ff19166001835b02179055505b6000805b60085460ff166004811115610d1057fe5b14610d1b5760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610d7657fe5b6102c65a03f11515610d8457fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610ded57fe5b6102c65a03f11515610dfb57fe5b5050604080518051600480546000602094850152845160e060020a63b67d77c50281529182015260248101829052925190965073__Math__________________________________935063b67d77c5926044808201939291829003018186803b1515610e6357fe5b6102c65a03f41515610e7157fe5b50506040515192505083821015610e86578193505b600060009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610ee157fe5b6102c65a03f11515610eef57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018b905294519490921694506323b872dd93606480840194939192918390030190829087803b1515610f5957fe5b6102c65a03f11515610f6757fe5b50506040515115159050610f7b5760006000fd5b600160a060020a0333166000908152600760209081526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018790525173__Math__________________________________9263771602f7926044808301939192829003018186803b1515610ff257fe5b6102c65a03f4151561100057fe5b50506040805151600160a060020a033316600090815260076020529190912055508382141561103e57600880546001919060ff191682805b02179055505b604080518581529051600160a060020a033316917f9e85601c404591b54325b6512021f8145643571c59865b7ab29ed9e0664cb17f919081900360200190a25b5b505b505050565b60045481565b60035460a060020a900462ffffff1681565b600054600160a060020a031681565b620f4240815600a165627a7a72305820ef769afac81cb06aeec76949ce01afa6a75502de53ee0d250e394bcf81920a430029a165627a7a723058208bcb6b6929432c5b6b1d807413370260b52c396d051a4160a8494462ca126d960029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373991 -} \ No newline at end of file diff --git a/build/contracts/CategoricalEvent.json b/build/contracts/CategoricalEvent.json deleted file mode 100644 index 91326f5..0000000 --- a/build/contracts/CategoricalEvent.json +++ /dev/null @@ -1,281 +0,0 @@ -{ - "contract_name": "CategoricalEvent", - "abi": [ - { - "constant": false, - "inputs": [], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "outcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "buyAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "getOutcomeTokenDistribution", - "outputs": [ - { - "name": "outcomeTokenDistribution", - "type": "uint256[]" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "sellAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "oracle", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeCount", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "outcomeTokens", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "redeemWinnings", - "outputs": [ - { - "name": "winnings", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "collateralToken", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getEventHash", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeTokens", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_collateralToken", - "type": "address" - }, - { - "name": "_oracle", - "type": "address" - }, - { - "name": "outcomeCount", - "type": "uint8" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcomeToken", - "type": "address" - }, - { - "indexed": false, - "name": "index", - "type": "uint8" - } - ], - "name": "OutcomeTokenCreation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetIssuance", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetRevocation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "winnings", - "type": "uint256" - } - ], - "name": "WinningsRedemption", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b6040516060806117bb8339810160409081528151602083015191909201515b8282825b600080600160a060020a038516158015906100525750600160a060020a03841615155b8015610062575060028360ff1610155b151561006e5760006000fd5b60008054600160a060020a03808816600160a060020a0319928316178355600180549188169190921617905591505b8260ff168260ff161015610154576100b3610163565b60405190819003906000f08015156100c757fe5b9050600380548060010182816100dd9190610173565b916000526020600020900160005b8154600160a060020a038086166101009390930a838102910219909116179091556040805191825260ff8516602083015280517fad24776dc347085865b6988e249c191fc22d9b31cf54cb62233c3c16be1736ee9350918290030190a15b60019091019061009d565b5b50505050505b5050506101be565b604051610a2280610d9983390190565b8154818355818115116101975760008381526020902061019791810190830161019d565b5b505050565b6101bb91905b808211156101b757600081556001016101a3565b5090565b90565b610bcc806101cd6000396000f300606060405236156100a95763ffffffff60e060020a6000350416630537665d81146100ab57806327793f87146100bd57806328da850b146100df57806369c19d4c146100f45780636fb1edcd1461016b5780637dc0d1d0146101805780637dc8f086146101ac5780638abe59ea146101d2578063ad0b2bec14610201578063b2016bd414610223578063ccdf68f31461024f578063e96e595014610273578063f21a146814610295575bfe5b34156100b357fe5b6100bb610300565b005b34156100c557fe5b6100cd61042c565b60408051918252519081900360200190f35b34156100e757fe5b6100bb600435610432565b005b34156100fc57fe5b610110600160a060020a03600435166105b5565b6040805160208082528351818301528351919283929083019185810191028083838215610158575b80518252602083111561015857601f199092019160209182019101610138565b5050509050019250505060405180910390f35b341561017357fe5b6100bb6004356106c8565b005b341561018857fe5b610190610844565b60408051600160a060020a039092168252519081900360200190f35b34156101b457fe5b6101bc610853565b6040805160ff9092168252519081900360200190f35b34156101da57fe5b61019060043561085a565b60408051600160a060020a039092168252519081900360200190f35b341561020957fe5b6100cd61088c565b60408051918252519081900360200190f35b341561022b57fe5b610190610ab3565b60408051600160a060020a039092168252519081900360200190f35b341561025757fe5b61025f610ac2565b604080519115158252519081900360200190f35b341561027b57fe5b6100cd610ad2565b60408051918252519081900360200190f35b341561029d57fe5b610110610b13565b6040805160208082528351818301528351919283929083019185810191028083838215610158575b80518252602083111561015857601f199092019160209182019101610138565b5050509050019250505060405180910390f35b60015460a060020a900460ff1615801561037a57506001546040805160006020918201819052825160e060020a63ccdf68f30281529251600160a060020a039094169363ccdf68f39360048082019493918390030190829087803b151561036357fe5b6102c65a03f1151561037157fe5b50506040515190505b15156103865760006000fd5b6001546040805160006020918201819052825160e060020a637e7e4b470281529251600160a060020a0390941693637e7e4b479360048082019493918390030190829087803b15156103d457fe5b6102c65a03f115156103e257fe5b505060405180516002556001805460a060020a60ff02191660a060020a1790557fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719150602090a15b565b60025481565b60008054604080516020908101849052815160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201879052925192909316926323b872dd926064808301939282900301818787803b151561049557fe5b6102c65a03f115156104a357fe5b505060405151151590506104b75760006000fd5b5060005b60035460ff82161015610571576003805460ff83169081106104d957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663867904b433846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561055757fe5b6102c65a03f1151561056557fe5b5050505b6001016104bb565b604080518381529051600160a060020a033316917fad2a02292986148558019ae4abf172732228e32e131a91d3fa7e0cada61932c0919081900360200190a25b5050565b6105bd610b7c565b600354604051600091908059106105d15750595b908082528060200260200182016040525b509150600090505b81518160ff1610156106c1576003805460ff831690811061060757fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231846000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561068657fe5b6102c65a03f1151561069457fe5b5050604051518351909150839060ff84169081106106ae57fe5b602090810290910101525b6001016105ea565b5b50919050565b60005b60035460ff82161015610781576003805460ff83169081106106e957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561076757fe5b6102c65a03f1151561077557fe5b5050505b6001016106cb565b60008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018890529251929093169363a9059cbb9360448082019492918390030190829087803b15156107de57fe5b6102c65a03f115156107ec57fe5b505060405151151590506108005760006000fd5b604080518381529051600160a060020a033316917f7ac9271efd660c24459c447459e46f7366d2b4a692e572f108619d0d7273fcc5919081900360200190a25b5050565b600154600160a060020a031681565b6003545b90565b600380548290811061086857fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60015460009060a060020a900460ff1615156108a85760006000fd5b60036002548154811015156108b957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561093857fe5b6102c65a03f1151561094657fe5b50506040515160025460038054929450925090811061096157fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933836040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b15156109df57fe5b6102c65a03f115156109ed57fe5b505060008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a03338116600483015260248201889052925192909316945063a9059cbb936044808501949293928390030190829087803b1515610a4e57fe5b6102c65a03f11515610a5c57fe5b50506040515115159050610a705760006000fd5b604080518281529051600160a060020a033316917f2fe921bb50a459800ae7eae7c0124e9e875094a539eb7dc5b3f728017347e0fb919081900360200190a25b90565b600054600160a060020a031681565b60015460a060020a900460ff1681565b60005460015460035460408051606060020a600160a060020a0395861681028252939094169290920260148401526028830152519081900360480190205b90565b610b1b610b7c565b6003805480602002602001604051908101604052809291908181526020018280548015610b7157602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b53575b505050505090505b90565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a72305820fc7f7e2192a7fae525c42137482c83d1d6d9234faf0abdc04af49230ac70fb6700296060604052341561000c57fe5b5b60038054600160a060020a03191633600160a060020a03161790555b5b6109e9806100396000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461007f57806318160ddd146100b257806323b872dd146100d457806370a082311461010d578063867904b41461013b578063a9059cbb1461015c578063dd62ed3e1461018f578063e274fd24146101c3578063eac449d9146101ef575bfe5b341561008757fe5b61009e600160a060020a0360043516602435610210565b604080519115158252519081900360200190f35b34156100ba57fe5b6100c261027b565b60408051918252519081900360200190f35b34156100dc57fe5b61009e600160a060020a0360043581169060243516604435610282565b604080519115158252519081900360200190f35b341561011557fe5b6100c2600160a060020a03600435166104c8565b60408051918252519081900360200190f35b341561014357fe5b61015a600160a060020a03600435166024356104e7565b005b341561016457fe5b61009e600160a060020a0360043516602435610660565b604080519115158252519081900360200190f35b341561019757fe5b6100c2600160a060020a03600435811690602435166107e8565b60408051918252519081900360200190f35b34156101cb57fe5b6101d3610815565b60408051600160a060020a039092168252519081900360200190f35b34156101f757fe5b61015a600160a060020a0360043516602435610824565b005b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156102f657fe5b6102c65a03f4151561030457fe5b505060405151159050806103af5750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561039757fe5b6102c65a03f415156103a557fe5b5050604051511590505b806104425750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561042a57fe5b6102c65a03f4151561043857fe5b5050604051511590505b1561044f575060006104c1565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b60035433600160a060020a039081169116146105035760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018490525173__Math__________________________________9263771602f7926044808301939192829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63771602f7028152600481019290925260248201859052915173__Math__________________________________935063771602f792604480840193919291829003018186803b151561060657fe5b6102c65a03f4151561061457fe5b50506040805180516002558381529051600160a060020a03851692507f9cb9c14f7bc76e3a89b796b091850526236115352a198b1e472f00e91376bbcb9181900360200190a25b5b5050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156106d457fe5b6102c65a03f415156106e257fe5b5050604051511590508061077e5750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561076657fe5b6102c65a03f4151561077457fe5b5050604051511590505b1561078b57506000610275565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b600354600160a060020a031681565b60035433600160a060020a039081169116146108405760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b15156108b557fe5b6102c65a03f415156108c357fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561094357fe5b6102c65a03f4151561095157fe5b50506040805180516002558381529051600160a060020a03851692507ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e99181900360200190a25b5b50505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820d202a0e0b7a9dd2ab5beebb024e1f21f8d24d697bcc5090a839f82426ae8aa680029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499198461048 -} \ No newline at end of file diff --git a/build/contracts/CentralizedOracle.json b/build/contracts/CentralizedOracle.json deleted file mode 100644 index e6d15bc..0000000 --- a/build/contracts/CentralizedOracle.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "contract_name": "CentralizedOracle", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "outcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_outcome", - "type": "int256" - } - ], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "owner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "newOwner", - "type": "address" - } - ], - "name": "replaceOwner", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "ipfsHash", - "outputs": [ - { - "name": "", - "type": "bytes" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_owner", - "type": "address" - }, - { - "name": "_ipfsHash", - "type": "bytes" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnerReplacement", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b6040516104e43803806104e483398101604052805160208201519091015b8051602e146100395760006000fd5b60008054600160a060020a031916600160a060020a0384161790558051610067906001906020840190610070565b505b5050610110565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100b157805160ff19168380011785556100de565b828001600101855582156100de579182015b828111156100de5782518255916020019190600101906100c3565b5b506100eb9291506100ef565b5090565b61010d91905b808211156100eb57600081556001016100f5565b5090565b90565b6103c58061011f6000396000f300606060405236156100725763ffffffff60e060020a60003504166327793f878114610074578063717a195a146100965780637e7e4b47146100ab5780638da5cb5b146100cd578063a39a45b7146100f9578063c623674f14610117578063c65fb380146101a7578063ccdf68f3146101cb575bfe5b341561007c57fe5b6100846101ef565b60408051918252519081900360200190f35b341561009e57fe5b6100a96004356101f5565b005b34156100b357fe5b61008461026c565b60408051918252519081900360200190f35b34156100d557fe5b6100dd610273565b60408051600160a060020a039092168252519081900360200190f35b341561010157fe5b6100a9600160a060020a0360043516610282565b005b341561011f57fe5b6101276102f9565b60408051602080825283518183015283519192839290830191850190808383821561016d575b80518252602083111561016d57601f19909201916020918201910161014d565b505050905090810190601f1680156101995780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57fe5b6101b7610386565b604080519115158252519081900360200190f35b34156101d357fe5b6101b761038f565b604080519115158252519081900360200190f35b60035481565b60005433600160a060020a039081169116146102115760006000fd5b60025460ff16156102225760006000fd5b6002805460ff1916600117905560038190556040805182815290517fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719181900360200190a15b5b50565b6003545b90565b600054600160a060020a031681565b60005433600160a060020a0390811691161461029e5760006000fd5b60025460ff16156102af5760006000fd5b60008054600160a060020a031916600160a060020a038316908117825560405190917f191a2405c52452c381a62f3b7480f9d3e77a76d7737659fc1030aff54b395dd591a25b5b50565b60018054604080516020600284861615610100026000190190941693909304601f8101849004840282018401909252818152929183018282801561037e5780601f106103535761010080835404028352916020019161037e565b820191906000526020600020905b81548152906001019060200180831161036157829003601f168201915b505050505081565b60025460ff1681565b60025460ff165b905600a165627a7a7230582061499041b69c90f563107a12e5d781174fb67d3cd4a3454608f930c1e392bff50029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373991 -} \ No newline at end of file diff --git a/build/contracts/CentralizedOracleFactory.json b/build/contracts/CentralizedOracleFactory.json deleted file mode 100644 index 93f31e3..0000000 --- a/build/contracts/CentralizedOracleFactory.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "contract_name": "CentralizedOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "ipfsHash", - "type": "bytes" - } - ], - "name": "createCentralizedOracle", - "outputs": [ - { - "name": "centralizedOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "centralizedOracle", - "type": "address" - }, - { - "indexed": false, - "name": "ipfsHash", - "type": "bytes" - } - ], - "name": "CentralizedOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6107298061001c6000396000f300606060405263ffffffff60e060020a6000350416634e2f220c8114610021575bfe5b341561002957fe5b610077600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061009395505050505050565b60408051600160a060020a039092168252519081900360200190f35b6000338261009f610209565b600160a060020a0383168152604060208083018281528451928401929092528351606084019185019080838382156100f2575b8051825260208311156100f257601f1990920191602091820191016100d2565b505050905090810190601f16801561011e5780820380516001836020036101000a031916815260200191505b509350505050604051809103906000f080151561013757fe5b905033600160a060020a03167f33a1926cf5c2f7306ac1685bf19260d678fea874f5f59c00b69fa5e2643ecfd282846040518083600160a060020a0316600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383600083146101c9575b8051825260208311156101c957601f1990920191602091820191016101a9565b505050905090810190601f1680156101f55780820380516001836020036101000a031916815260200191505b50935050505060405180910390a25b919050565b6040516104e48061021a8339019056006060604052341561000c57fe5b6040516104e43803806104e483398101604052805160208201519091015b8051602e146100395760006000fd5b60008054600160a060020a031916600160a060020a0384161790558051610067906001906020840190610070565b505b5050610110565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100b157805160ff19168380011785556100de565b828001600101855582156100de579182015b828111156100de5782518255916020019190600101906100c3565b5b506100eb9291506100ef565b5090565b61010d91905b808211156100eb57600081556001016100f5565b5090565b90565b6103c58061011f6000396000f300606060405236156100725763ffffffff60e060020a60003504166327793f878114610074578063717a195a146100965780637e7e4b47146100ab5780638da5cb5b146100cd578063a39a45b7146100f9578063c623674f14610117578063c65fb380146101a7578063ccdf68f3146101cb575bfe5b341561007c57fe5b6100846101ef565b60408051918252519081900360200190f35b341561009e57fe5b6100a96004356101f5565b005b34156100b357fe5b61008461026c565b60408051918252519081900360200190f35b34156100d557fe5b6100dd610273565b60408051600160a060020a039092168252519081900360200190f35b341561010157fe5b6100a9600160a060020a0360043516610282565b005b341561011f57fe5b6101276102f9565b60408051602080825283518183015283519192839290830191850190808383821561016d575b80518252602083111561016d57601f19909201916020918201910161014d565b505050905090810190601f1680156101995780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57fe5b6101b7610386565b604080519115158252519081900360200190f35b34156101d357fe5b6101b761038f565b604080519115158252519081900360200190f35b60035481565b60005433600160a060020a039081169116146102115760006000fd5b60025460ff16156102225760006000fd5b6002805460ff1916600117905560038190556040805182815290517fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719181900360200190a15b5b50565b6003545b90565b600054600160a060020a031681565b60005433600160a060020a0390811691161461029e5760006000fd5b60025460ff16156102af5760006000fd5b60008054600160a060020a031916600160a060020a038316908117825560405190917f191a2405c52452c381a62f3b7480f9d3e77a76d7737659fc1030aff54b395dd591a25b5b50565b60018054604080516020600284861615610100026000190190941693909304601f8101849004840282018401909252818152929183018282801561037e5780601f106103535761010080835404028352916020019161037e565b820191906000526020600020905b81548152906001019060200180831161036157829003601f168201915b505050505081565b60025460ff1681565b60025460ff165b905600a165627a7a7230582061499041b69c90f563107a12e5d781174fb67d3cd4a3454608f930c1e392bff50029a165627a7a7230582041ff2e079dc9cf981095af1bcbf3bd01d4c6cfa182ad3889099b14ce243584aa0029", - "networks": { - "4": { - "events": { - "0x33a1926cf5c2f7306ac1685bf19260d678fea874f5f59c00b69fa5e2643ecfd2": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "centralizedOracle", - "type": "address" - }, - { - "indexed": false, - "name": "ipfsHash", - "type": "bytes" - } - ], - "name": "CentralizedOracleCreation", - "type": "event" - } - }, - "links": {}, - "address": "0x1d8d6b851859e4ff5144ffd0c7f9a8951f42f18d", - "updated_at": 1499271142589 - }, - "42": { - "events": { - "0x33a1926cf5c2f7306ac1685bf19260d678fea874f5f59c00b69fa5e2643ecfd2": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "centralizedOracle", - "type": "address" - }, - { - "indexed": false, - "name": "ipfsHash", - "type": "bytes" - } - ], - "name": "CentralizedOracleCreation", - "type": "event" - } - }, - "links": {}, - "address": "0x81dcec0e6edb95e6633ffa06886a04d1e350d992", - "updated_at": 1499207793335 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142589 -} \ No newline at end of file diff --git a/build/contracts/DifficultyOracle.json b/build/contracts/DifficultyOracle.json deleted file mode 100644 index ae07a14..0000000 --- a/build/contracts/DifficultyOracle.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "contract_name": "DifficultyOracle", - "abi": [ - { - "constant": false, - "inputs": [], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "difficulty", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "blockNumber", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_blockNumber", - "type": "uint256" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "difficulty", - "type": "uint256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b6040516020806101ce83398101604052515b43811161002b5760006000fd5b60008190555b505b61018c806100426000396000f300606060405263ffffffff60e060020a6000350416630537665d811461004d57806319cae4621461005f57806357e871e7146100815780637e7e4b47146100a3578063ccdf68f3146100c5575bfe5b341561005557fe5b61005d6100e9565b005b341561006757fe5b61006f610142565b60408051918252519081900360200190f35b341561008957fe5b61006f610148565b60408051918252519081900360200190f35b34156100ab57fe5b61006f61014e565b60408051918252519081900360200190f35b34156100cd57fe5b6100d5610155565b604080519115158252519081900360200190f35b60005443101580156100fb5750600154155b15156101075760006000fd5b44600181905560408051918252517f39972cb21edd888c2061a2b4b37874524bbc055cfeaa3054682ba5369f5029aa9181900360200190a15b565b60015481565b60005481565b6001545b90565b600154600090115b905600a165627a7a72305820fd79647365dc15fa60bd670ead2540574e2c6380417ba9ce58d4fe7e46a4bfb90029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/DifficultyOracleFactory.json b/build/contracts/DifficultyOracleFactory.json deleted file mode 100644 index 06a5e6d..0000000 --- a/build/contracts/DifficultyOracleFactory.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "contract_name": "DifficultyOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "blockNumber", - "type": "uint256" - } - ], - "name": "createDifficultyOracle", - "outputs": [ - { - "name": "difficultyOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "difficultyOracle", - "type": "address" - }, - { - "indexed": false, - "name": "blockNumber", - "type": "uint256" - } - ], - "name": "DifficultyOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6102d08061001c6000396000f300606060405263ffffffff60e060020a6000350416639d5f24228114610021575bfe5b341561002957fe5b610034600435610050565b60408051600160a060020a039092168252519081900360200190f35b60008161005b6100c6565b90815260405190819003602001906000f080151561007557fe5b60408051600160a060020a0380841682526020820186905282519394503316927f83ecbb7b33dba848fcbd61d437ac02705db443e66f76ce6be0cf3415d07ab17f929181900390910190a25b919050565b6040516101ce806100d78339019056006060604052341561000c57fe5b6040516020806101ce83398101604052515b43811161002b5760006000fd5b60008190555b505b61018c806100426000396000f300606060405263ffffffff60e060020a6000350416630537665d811461004d57806319cae4621461005f57806357e871e7146100815780637e7e4b47146100a3578063ccdf68f3146100c5575bfe5b341561005557fe5b61005d6100e9565b005b341561006757fe5b61006f610142565b60408051918252519081900360200190f35b341561008957fe5b61006f610148565b60408051918252519081900360200190f35b34156100ab57fe5b61006f61014e565b60408051918252519081900360200190f35b34156100cd57fe5b6100d5610155565b604080519115158252519081900360200190f35b60005443101580156100fb5750600154155b15156101075760006000fd5b44600181905560408051918252517f39972cb21edd888c2061a2b4b37874524bbc055cfeaa3054682ba5369f5029aa9181900360200190a15b565b60015481565b60005481565b6001545b90565b600154600090115b905600a165627a7a72305820fd79647365dc15fa60bd670ead2540574e2c6380417ba9ce58d4fe7e46a4bfb90029a165627a7a723058201c5cd36b5e28ae5c7ccc8b9123a44722596764d77e65f1972c4940bd5ca5e7e30029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/EtherToken.json b/build/contracts/EtherToken.json deleted file mode 100644 index 9a452e6..0000000 --- a/build/contracts/EtherToken.json +++ /dev/null @@ -1,445 +0,0 @@ -{ - "contract_name": "EtherToken", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "name", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "spender", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "from", - "type": "address" - }, - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "value", - "type": "uint256" - } - ], - "name": "withdraw", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "decimals", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "symbol", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "deposit", - "outputs": [], - "payable": true, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - }, - { - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Deposit", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Withdrawal", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b610b238061001c6000396000f300606060405236156100935763ffffffff60e060020a60003504166306fdde038114610095578063095ea7b31461012557806318160ddd1461015857806323b872dd1461017a5780632e1a7d4d146101b3578063313ce567146101c857806370a08231146101ee57806395d89b411461021c578063a9059cbb146102ac578063d0e30db0146102df578063dd62ed3e146102e9575bfe5b341561009d57fe5b6100a561031d565b6040805160208082528351818301528351919283929083019185019080838382156100eb575b8051825260208311156100eb57601f1990920191602091820191016100cb565b505050905090810190601f1680156101175780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561012d57fe5b610144600160a060020a0360043516602435610345565b604080519115158252519081900360200190f35b341561016057fe5b6101686103b0565b60408051918252519081900360200190f35b341561018257fe5b610144600160a060020a03600435811690602435166044356103b7565b604080519115158252519081900360200190f35b34156101bb57fe5b6101c66004356105fd565b005b34156101d057fe5b6101d8610786565b6040805160ff9092168252519081900360200190f35b34156101f657fe5b610168600160a060020a036004351661078b565b60408051918252519081900360200190f35b341561022457fe5b6100a56107aa565b6040805160208082528351818301528351919283929083019185019080838382156100eb575b8051825260208311156100eb57601f1990920191602091820191016100cb565b505050905090810190601f1680156101175780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156102b457fe5b610144600160a060020a03600435166024356107ca565b604080519115158252519081900360200190f35b6101c6610952565b005b34156102f157fe5b610168600160a060020a0360043581169060243516610aaa565b60408051918252519081900360200190f35b60408051808201909152600b815260a960020a6a22ba3432b9102a37b5b2b702602082015281565b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561042b57fe5b6102c65a03f4151561043957fe5b505060405151159050806104e45750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156104cc57fe5b6102c65a03f415156104da57fe5b5050604051511590505b806105775750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561055f57fe5b6102c65a03f4151561056d57fe5b5050604051511590505b15610584575060006105f6565b600160a060020a038085166000818152602081815260408083208054889003905560018252808320338616845282528083208054889003905593871680835282825291849020805487019055835186815293519193600080516020610ad8833981519152929081900390910190a35060015b9392505050565b600160a060020a033316600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b151561067257fe5b6102c65a03f4151561068057fe5b5050604080518051600160a060020a033316600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561070057fe5b6102c65a03f4151561070e57fe5b50506040518051600255600160a060020a033316915082156108fc029083906000818181858888f19350505050151561074357fe5b604080518281529051600160a060020a033316917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a25b50565b601281565b600160a060020a0381166000908152602081905260409020545b919050565b604080518082019091526003815260eb60020a6208aa8902602082015281565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561083e57fe5b6102c65a03f4151561084c57fe5b505060405151159050806108e85750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b15156108d057fe5b6102c65a03f415156108de57fe5b5050604051511590505b156108f5575060006103aa565b600160a060020a033381166000818152602081815260408083208054889003905593871680835291849020805487019055835186815293519193600080516020610ad8833981519152929081900390910190a35060015b92915050565b600160a060020a033316600090815260208181526040808320548151830193909352805160e060020a63771602f702815260048101939093523460248401525173__Math__________________________________9263771602f7926044808301939192829003018186803b15156109c657fe5b6102c65a03f415156109d457fe5b5050604080518051600160a060020a033316600090815260208181528482209290925560025492820152825160e060020a63771602f70281526004810192909252346024830152915173__Math__________________________________935063771602f792604480840193919291829003018186803b1515610a5357fe5b6102c65a03f41515610a6157fe5b50506040805180516002553481529051600160a060020a03331692507fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9181900360200190a25b565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a723058207dc91413be17f76a501f288b0d63567cefc57b1fdeb0609c6117922243940cfb0029", - "networks": { - "4": { - "events": { - "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Deposit", - "type": "event" - }, - "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Withdrawal", - "type": "event" - }, - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - }, - "links": { - "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" - }, - "address": "0xb9518c7ff807b7b1b30ea05735237d739e27550d", - "updated_at": 1499271142591 - }, - "42": { - "events": { - "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Deposit", - "type": "event" - }, - "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Withdrawal", - "type": "event" - }, - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - }, - "links": { - "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" - }, - "address": "0x0a8c7932880b4d8d4c7e1b08f89ff34f42f5d34d", - "updated_at": 1499207793332 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142591 -} \ No newline at end of file diff --git a/build/contracts/Event.json b/build/contracts/Event.json deleted file mode 100644 index 70c1b59..0000000 --- a/build/contracts/Event.json +++ /dev/null @@ -1,281 +0,0 @@ -{ - "contract_name": "Event", - "abi": [ - { - "constant": false, - "inputs": [], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "outcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "buyAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "getOutcomeTokenDistribution", - "outputs": [ - { - "name": "outcomeTokenDistribution", - "type": "uint256[]" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "sellAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "oracle", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeCount", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "outcomeTokens", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "redeemWinnings", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "collateralToken", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getEventHash", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeTokens", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_collateralToken", - "type": "address" - }, - { - "name": "_oracle", - "type": "address" - }, - { - "name": "outcomeCount", - "type": "uint8" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcomeToken", - "type": "address" - }, - { - "indexed": false, - "name": "index", - "type": "uint8" - } - ], - "name": "OutcomeTokenCreation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetIssuance", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetRevocation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "winnings", - "type": "uint256" - } - ], - "name": "WinningsRedemption", - "type": "event" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851572 -} \ No newline at end of file diff --git a/build/contracts/EventFactory.json b/build/contracts/EventFactory.json deleted file mode 100644 index a153d04..0000000 --- a/build/contracts/EventFactory.json +++ /dev/null @@ -1,327 +0,0 @@ -{ - "contract_name": "EventFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "collateralToken", - "type": "address" - }, - { - "name": "oracle", - "type": "address" - }, - { - "name": "lowerBound", - "type": "int256" - }, - { - "name": "upperBound", - "type": "int256" - } - ], - "name": "createScalarEvent", - "outputs": [ - { - "name": "eventContract", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "name": "categoricalEvents", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "name": "scalarEvents", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "collateralToken", - "type": "address" - }, - { - "name": "oracle", - "type": "address" - }, - { - "name": "outcomeCount", - "type": "uint8" - } - ], - "name": "createCategoricalEvent", - "outputs": [ - { - "name": "eventContract", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "categoricalEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeCount", - "type": "uint8" - } - ], - "name": "CategoricalEventCreation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "scalarEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "lowerBound", - "type": "int256" - }, - { - "indexed": false, - "name": "upperBound", - "type": "int256" - } - ], - "name": "ScalarEventCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6137e38061001c6000396000f300606060405263ffffffff60e060020a6000350416635ea194a381146100425780638d1d2c21146100865780639897e8a5146100b55780639df0c176146100e4575bfe5b341561004a57fe5b61006a600160a060020a0360043581169060243516604435606435610128565b60408051600160a060020a039092168252519081900360200190f35b341561008e57fe5b61006a60043561025c565b60408051600160a060020a039092168252519081900360200190f35b34156100bd57fe5b61006a600435610277565b60408051600160a060020a039092168252519081900360200190f35b34156100ec57fe5b61006a600160a060020a036004358116906024351660ff60443516610292565b60408051600160a060020a039092168252519081900360200190f35b60408051606060020a600160a060020a0380881682028352808716909102601483015260288201859052604882018490528251918290036068019091206000818152600160205292832054909116156101815760006000fd5b8585858561018d6103ba565b600160a060020a0394851681529290931660208301526040808301919091526060820192909252905190819003608001906000f08015156101ca57fe5b6000828152600160209081526040918290208054600160a060020a03808616600160a060020a0319909216821790925583519081528a821692810192909252888116828401526060820188905260808201879052915192945033909116917fd613e63983a1538814e1b390fc232d0e20462cf7410924f6b6a5f29ea38e82ed9181900360a00190a25b50949350505050565b600060208190529081526040902054600160a060020a031681565b600160205260009081526040902054600160a060020a031681565b60408051606060020a600160a060020a0380871682028352808616909102601483015260f860020a60ff85160260288301528251918290036029019091206000818152602081905292832054909116156102ec5760006000fd5b8484846102f76103ca565b600160a060020a03938416815291909216602082015260ff9091166040808301919091525190819003606001906000f080151561033057fe5b600082815260208181526040918290208054600160a060020a03808616600160a060020a031990921682179092558351908152898216928101929092528781168284015260ff87166060830152915192945033909116917f9732758aee476f5125b50d29cc43e28422f12ec078ba9f5c712f9dbd52796f599181900360800190a25b509392505050565b604051611c22806103db83390190565b6040516117bb80611ffd833901905600606060405234156200000d57fe5b60405160808062001c2283398101604090815281516020830151918301516060909301519092905b838360025b600080600160a060020a038516158015906200005e5750600160a060020a03841615155b80156200006f575060028360ff1610155b15156200007c5760006000fd5b60008054600160a060020a03808816600160a060020a0319928316178355600180549188169190921617905591505b8260ff168260ff1610156200016957620000c462000194565b60405190819003906000f0801515620000d957fe5b905060038054806001018281620000f19190620001a5565b916000526020600020900160005b8154600160a060020a038086166101009390930a838102910219909116179091556040805191825260ff8516602083015280517fad24776dc347085865b6988e249c191fc22d9b31cf54cb62233c3c16be1736ee9350918290030190a15b600190910190620000ab565b5b505050505081811315156200017f5760006000fd5b600482905560058190555b50505050620001f6565b604051610a22806200120083390190565b815481835581811511620001cc57600083815260209020620001cc918101908301620001d2565b5b505050565b620001f391905b80821115620001ef5760008155600101620001d9565b5090565b90565b610ffa80620002066000396000f300606060405236156100e05763ffffffff60e060020a6000350416630537665d81146100e257806327793f87146100f457806328da850b14610116578063561cce0a1461012b57806369c19d4c146101515780636e5452fe146101c85780636fb1edcd146101f05780637dc0d1d0146102055780637dc8f086146102315780638abe59ea14610257578063a384d6ff14610286578063a871da91146102a8578063ad0b2bec146102ce578063b09ad8a0146102f0578063b2016bd414610312578063ccdf68f31461033e578063e96e595014610362578063f21a146814610384575bfe5b34156100ea57fe5b6100f26103ef565b005b34156100fc57fe5b61010461051b565b60408051918252519081900360200190f35b341561011e57fe5b6100f2600435610521565b005b341561013357fe5b61013b6106a4565b6040805160ff9092168252519081900360200190f35b341561015957fe5b61016d600160a060020a03600435166106a9565b60408051602080825283518183015283519192839290830191858101910280838382156101b5575b8051825260208311156101b557601f199092019160209182019101610195565b5050509050019250505060405180910390f35b34156101d057fe5b6101d86107bc565b6040805162ffffff9092168252519081900360200190f35b34156101f857fe5b6100f26004356107c3565b005b341561020d57fe5b61021561093f565b60408051600160a060020a039092168252519081900360200190f35b341561023957fe5b61013b61094e565b6040805160ff9092168252519081900360200190f35b341561025f57fe5b610215600435610955565b60408051600160a060020a039092168252519081900360200190f35b341561028e57fe5b610104610987565b60408051918252519081900360200190f35b34156102b057fe5b61013b61098d565b6040805160ff9092168252519081900360200190f35b34156102d657fe5b610104610992565b60408051918252519081900360200190f35b34156102f857fe5b610104610ed0565b60408051918252519081900360200190f35b341561031a57fe5b610215610ed6565b60408051600160a060020a039092168252519081900360200190f35b341561034657fe5b61034e610ee5565b604080519115158252519081900360200190f35b341561036a57fe5b610104610ef5565b60408051918252519081900360200190f35b341561038c57fe5b61016d610f41565b60408051602080825283518183015283519192839290830191858101910280838382156101b5575b8051825260208311156101b557601f199092019160209182019101610195565b5050509050019250505060405180910390f35b60015460a060020a900460ff1615801561046957506001546040805160006020918201819052825160e060020a63ccdf68f30281529251600160a060020a039094169363ccdf68f39360048082019493918390030190829087803b151561045257fe5b6102c65a03f1151561046057fe5b50506040515190505b15156104755760006000fd5b6001546040805160006020918201819052825160e060020a637e7e4b470281529251600160a060020a0390941693637e7e4b479360048082019493918390030190829087803b15156104c357fe5b6102c65a03f115156104d157fe5b505060405180516002556001805460a060020a60ff02191660a060020a1790557fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719150602090a15b565b60025481565b60008054604080516020908101849052815160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201879052925192909316926323b872dd926064808301939282900301818787803b151561058457fe5b6102c65a03f1151561059257fe5b505060405151151590506105a65760006000fd5b5060005b60035460ff82161015610660576003805460ff83169081106105c857fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663867904b433846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561064657fe5b6102c65a03f1151561065457fe5b5050505b6001016105aa565b604080518381529051600160a060020a033316917fad2a02292986148558019ae4abf172732228e32e131a91d3fa7e0cada61932c0919081900360200190a25b5050565b600181565b6106b1610faa565b600354604051600091908059106106c55750595b908082528060200260200182016040525b509150600090505b81518160ff1610156107b5576003805460ff83169081106106fb57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231846000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561077a57fe5b6102c65a03f1151561078857fe5b5050604051518351909150839060ff84169081106107a257fe5b602090810290910101525b6001016106de565b5b50919050565b620f424081565b60005b60035460ff8216101561087c576003805460ff83169081106107e457fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561086257fe5b6102c65a03f1151561087057fe5b5050505b6001016107c6565b60008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018890529251929093169363a9059cbb9360448082019492918390030190829087803b15156108d957fe5b6102c65a03f115156108e757fe5b505060405151151590506108fb5760006000fd5b604080518381529051600160a060020a033316917f7ac9271efd660c24459c447459e46f7366d2b4a692e572f108619d0d7273fcc5919081900360200190a25b5050565b600154600160a060020a031681565b6003545b90565b600380548290811061096357fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60045481565b600081565b600060006000600060006000600160149054906101000a900460ff1615156109ba5760006000fd5b60045460025412156109cf5760009450610a0b565b60055460025413156109e657620f42409450610a0b565b6004546005540360045460025403620f424062ffffff1602811515610a0757fe5b0594505b5b60038054620f424087810362ffffff16965086900394506000908110610a2e57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610aad57fe5b6102c65a03f11515610abb57fe5b5050604051516003805491945091506001908110610ad557fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610b5457fe5b6102c65a03f11515610b6257fe5b50506040805180516000602092830152825160e260020a6332292b2702815260048101879052602481018990529251909450620f4240935073__Math__________________________________9263c8a4ac9c926044808301939192829003018186803b1515610bce57fe5b6102c65a03f41515610bdc57fe5b50506040805180516000602092830152825160e260020a6332292b270281526004810187905260248101899052925173__Math__________________________________945063771602f7939192859263c8a4ac9c9260448083019392829003018186803b1515610c4957fe5b6102c65a03f41515610c5757fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610ca457fe5b6102c65a03f41515610cb257fe5b5050604051519050811515610cc357fe5b0495506003600060ff16815481101515610cd957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b1515610d5757fe5b6102c65a03f11515610d6557fe5b5050600380549091506001908110610d7957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933836040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b1515610df757fe5b6102c65a03f11515610e0557fe5b505060008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018d9052925192909316945063a9059cbb936044808501949293928390030190829087803b1515610e6657fe5b6102c65a03f11515610e7457fe5b50506040515115159050610e885760006000fd5b604080518781529051600160a060020a033316917f2fe921bb50a459800ae7eae7c0124e9e875094a539eb7dc5b3f728017347e0fb919081900360200190a25b505050505090565b60055481565b600054600160a060020a031681565b60015460a060020a900460ff1681565b60005460015460045460055460408051606060020a600160a060020a03968716810282529490951693909302601485015260288401919091526048830152519081900360680190205b90565b610f49610faa565b6003805480602002602001604051908101604052809291908181526020018280548015610f9f57602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610f81575b505050505090505b90565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a7230582092f3b42b7b4e7234f86f4c744862059c70adf0815a36f04206ffc29f373635af00296060604052341561000c57fe5b5b60038054600160a060020a03191633600160a060020a03161790555b5b6109e9806100396000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461007f57806318160ddd146100b257806323b872dd146100d457806370a082311461010d578063867904b41461013b578063a9059cbb1461015c578063dd62ed3e1461018f578063e274fd24146101c3578063eac449d9146101ef575bfe5b341561008757fe5b61009e600160a060020a0360043516602435610210565b604080519115158252519081900360200190f35b34156100ba57fe5b6100c261027b565b60408051918252519081900360200190f35b34156100dc57fe5b61009e600160a060020a0360043581169060243516604435610282565b604080519115158252519081900360200190f35b341561011557fe5b6100c2600160a060020a03600435166104c8565b60408051918252519081900360200190f35b341561014357fe5b61015a600160a060020a03600435166024356104e7565b005b341561016457fe5b61009e600160a060020a0360043516602435610660565b604080519115158252519081900360200190f35b341561019757fe5b6100c2600160a060020a03600435811690602435166107e8565b60408051918252519081900360200190f35b34156101cb57fe5b6101d3610815565b60408051600160a060020a039092168252519081900360200190f35b34156101f757fe5b61015a600160a060020a0360043516602435610824565b005b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156102f657fe5b6102c65a03f4151561030457fe5b505060405151159050806103af5750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561039757fe5b6102c65a03f415156103a557fe5b5050604051511590505b806104425750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561042a57fe5b6102c65a03f4151561043857fe5b5050604051511590505b1561044f575060006104c1565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b60035433600160a060020a039081169116146105035760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018490525173__Math__________________________________9263771602f7926044808301939192829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63771602f7028152600481019290925260248201859052915173__Math__________________________________935063771602f792604480840193919291829003018186803b151561060657fe5b6102c65a03f4151561061457fe5b50506040805180516002558381529051600160a060020a03851692507f9cb9c14f7bc76e3a89b796b091850526236115352a198b1e472f00e91376bbcb9181900360200190a25b5b5050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156106d457fe5b6102c65a03f415156106e257fe5b5050604051511590508061077e5750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561076657fe5b6102c65a03f4151561077457fe5b5050604051511590505b1561078b57506000610275565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b600354600160a060020a031681565b60035433600160a060020a039081169116146108405760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b15156108b557fe5b6102c65a03f415156108c357fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561094357fe5b6102c65a03f4151561095157fe5b50506040805180516002558381529051600160a060020a03851692507ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e99181900360200190a25b5b50505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820d202a0e0b7a9dd2ab5beebb024e1f21f8d24d697bcc5090a839f82426ae8aa6800296060604052341561000c57fe5b6040516060806117bb8339810160409081528151602083015191909201515b8282825b600080600160a060020a038516158015906100525750600160a060020a03841615155b8015610062575060028360ff1610155b151561006e5760006000fd5b60008054600160a060020a03808816600160a060020a0319928316178355600180549188169190921617905591505b8260ff168260ff161015610154576100b3610163565b60405190819003906000f08015156100c757fe5b9050600380548060010182816100dd9190610173565b916000526020600020900160005b8154600160a060020a038086166101009390930a838102910219909116179091556040805191825260ff8516602083015280517fad24776dc347085865b6988e249c191fc22d9b31cf54cb62233c3c16be1736ee9350918290030190a15b60019091019061009d565b5b50505050505b5050506101be565b604051610a2280610d9983390190565b8154818355818115116101975760008381526020902061019791810190830161019d565b5b505050565b6101bb91905b808211156101b757600081556001016101a3565b5090565b90565b610bcc806101cd6000396000f300606060405236156100a95763ffffffff60e060020a6000350416630537665d81146100ab57806327793f87146100bd57806328da850b146100df57806369c19d4c146100f45780636fb1edcd1461016b5780637dc0d1d0146101805780637dc8f086146101ac5780638abe59ea146101d2578063ad0b2bec14610201578063b2016bd414610223578063ccdf68f31461024f578063e96e595014610273578063f21a146814610295575bfe5b34156100b357fe5b6100bb610300565b005b34156100c557fe5b6100cd61042c565b60408051918252519081900360200190f35b34156100e757fe5b6100bb600435610432565b005b34156100fc57fe5b610110600160a060020a03600435166105b5565b6040805160208082528351818301528351919283929083019185810191028083838215610158575b80518252602083111561015857601f199092019160209182019101610138565b5050509050019250505060405180910390f35b341561017357fe5b6100bb6004356106c8565b005b341561018857fe5b610190610844565b60408051600160a060020a039092168252519081900360200190f35b34156101b457fe5b6101bc610853565b6040805160ff9092168252519081900360200190f35b34156101da57fe5b61019060043561085a565b60408051600160a060020a039092168252519081900360200190f35b341561020957fe5b6100cd61088c565b60408051918252519081900360200190f35b341561022b57fe5b610190610ab3565b60408051600160a060020a039092168252519081900360200190f35b341561025757fe5b61025f610ac2565b604080519115158252519081900360200190f35b341561027b57fe5b6100cd610ad2565b60408051918252519081900360200190f35b341561029d57fe5b610110610b13565b6040805160208082528351818301528351919283929083019185810191028083838215610158575b80518252602083111561015857601f199092019160209182019101610138565b5050509050019250505060405180910390f35b60015460a060020a900460ff1615801561037a57506001546040805160006020918201819052825160e060020a63ccdf68f30281529251600160a060020a039094169363ccdf68f39360048082019493918390030190829087803b151561036357fe5b6102c65a03f1151561037157fe5b50506040515190505b15156103865760006000fd5b6001546040805160006020918201819052825160e060020a637e7e4b470281529251600160a060020a0390941693637e7e4b479360048082019493918390030190829087803b15156103d457fe5b6102c65a03f115156103e257fe5b505060405180516002556001805460a060020a60ff02191660a060020a1790557fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719150602090a15b565b60025481565b60008054604080516020908101849052815160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201879052925192909316926323b872dd926064808301939282900301818787803b151561049557fe5b6102c65a03f115156104a357fe5b505060405151151590506104b75760006000fd5b5060005b60035460ff82161015610571576003805460ff83169081106104d957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663867904b433846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561055757fe5b6102c65a03f1151561056557fe5b5050505b6001016104bb565b604080518381529051600160a060020a033316917fad2a02292986148558019ae4abf172732228e32e131a91d3fa7e0cada61932c0919081900360200190a25b5050565b6105bd610b7c565b600354604051600091908059106105d15750595b908082528060200260200182016040525b509150600090505b81518160ff1610156106c1576003805460ff831690811061060757fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231846000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561068657fe5b6102c65a03f1151561069457fe5b5050604051518351909150839060ff84169081106106ae57fe5b602090810290910101525b6001016105ea565b5b50919050565b60005b60035460ff82161015610781576003805460ff83169081106106e957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561076757fe5b6102c65a03f1151561077557fe5b5050505b6001016106cb565b60008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018890529251929093169363a9059cbb9360448082019492918390030190829087803b15156107de57fe5b6102c65a03f115156107ec57fe5b505060405151151590506108005760006000fd5b604080518381529051600160a060020a033316917f7ac9271efd660c24459c447459e46f7366d2b4a692e572f108619d0d7273fcc5919081900360200190a25b5050565b600154600160a060020a031681565b6003545b90565b600380548290811061086857fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60015460009060a060020a900460ff1615156108a85760006000fd5b60036002548154811015156108b957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561093857fe5b6102c65a03f1151561094657fe5b50506040515160025460038054929450925090811061096157fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933836040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b15156109df57fe5b6102c65a03f115156109ed57fe5b505060008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a03338116600483015260248201889052925192909316945063a9059cbb936044808501949293928390030190829087803b1515610a4e57fe5b6102c65a03f11515610a5c57fe5b50506040515115159050610a705760006000fd5b604080518281529051600160a060020a033316917f2fe921bb50a459800ae7eae7c0124e9e875094a539eb7dc5b3f728017347e0fb919081900360200190a25b90565b600054600160a060020a031681565b60015460a060020a900460ff1681565b60005460015460035460408051606060020a600160a060020a0395861681028252939094169290920260148401526028830152519081900360480190205b90565b610b1b610b7c565b6003805480602002602001604051908101604052809291908181526020018280548015610b7157602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b53575b505050505090505b90565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a72305820fc7f7e2192a7fae525c42137482c83d1d6d9234faf0abdc04af49230ac70fb6700296060604052341561000c57fe5b5b60038054600160a060020a03191633600160a060020a03161790555b5b6109e9806100396000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461007f57806318160ddd146100b257806323b872dd146100d457806370a082311461010d578063867904b41461013b578063a9059cbb1461015c578063dd62ed3e1461018f578063e274fd24146101c3578063eac449d9146101ef575bfe5b341561008757fe5b61009e600160a060020a0360043516602435610210565b604080519115158252519081900360200190f35b34156100ba57fe5b6100c261027b565b60408051918252519081900360200190f35b34156100dc57fe5b61009e600160a060020a0360043581169060243516604435610282565b604080519115158252519081900360200190f35b341561011557fe5b6100c2600160a060020a03600435166104c8565b60408051918252519081900360200190f35b341561014357fe5b61015a600160a060020a03600435166024356104e7565b005b341561016457fe5b61009e600160a060020a0360043516602435610660565b604080519115158252519081900360200190f35b341561019757fe5b6100c2600160a060020a03600435811690602435166107e8565b60408051918252519081900360200190f35b34156101cb57fe5b6101d3610815565b60408051600160a060020a039092168252519081900360200190f35b34156101f757fe5b61015a600160a060020a0360043516602435610824565b005b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156102f657fe5b6102c65a03f4151561030457fe5b505060405151159050806103af5750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561039757fe5b6102c65a03f415156103a557fe5b5050604051511590505b806104425750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561042a57fe5b6102c65a03f4151561043857fe5b5050604051511590505b1561044f575060006104c1565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b60035433600160a060020a039081169116146105035760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018490525173__Math__________________________________9263771602f7926044808301939192829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63771602f7028152600481019290925260248201859052915173__Math__________________________________935063771602f792604480840193919291829003018186803b151561060657fe5b6102c65a03f4151561061457fe5b50506040805180516002558381529051600160a060020a03851692507f9cb9c14f7bc76e3a89b796b091850526236115352a198b1e472f00e91376bbcb9181900360200190a25b5b5050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156106d457fe5b6102c65a03f415156106e257fe5b5050604051511590508061077e5750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561076657fe5b6102c65a03f4151561077457fe5b5050604051511590505b1561078b57506000610275565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b600354600160a060020a031681565b60035433600160a060020a039081169116146108405760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b15156108b557fe5b6102c65a03f415156108c357fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561094357fe5b6102c65a03f4151561095157fe5b50506040805180516002558381529051600160a060020a03851692507ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e99181900360200190a25b5b50505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820d202a0e0b7a9dd2ab5beebb024e1f21f8d24d697bcc5090a839f82426ae8aa680029a165627a7a7230582091a95d16140fad920a1ac61f066869a1a7d3183583322abbf00d2c12f74da2340029", - "networks": { - "4": { - "events": { - "0x9732758aee476f5125b50d29cc43e28422f12ec078ba9f5c712f9dbd52796f59": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "categoricalEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeCount", - "type": "uint8" - } - ], - "name": "CategoricalEventCreation", - "type": "event" - }, - "0xd613e63983a1538814e1b390fc232d0e20462cf7410924f6b6a5f29ea38e82ed": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "scalarEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "lowerBound", - "type": "int256" - }, - { - "indexed": false, - "name": "upperBound", - "type": "int256" - } - ], - "name": "ScalarEventCreation", - "type": "event" - } - }, - "links": { - "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" - }, - "address": "0xaf895ec648b5572ac427268e6371654bc3689080", - "updated_at": 1499271142595 - }, - "42": { - "events": { - "0x9732758aee476f5125b50d29cc43e28422f12ec078ba9f5c712f9dbd52796f59": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "categoricalEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeCount", - "type": "uint8" - } - ], - "name": "CategoricalEventCreation", - "type": "event" - }, - "0xd613e63983a1538814e1b390fc232d0e20462cf7410924f6b6a5f29ea38e82ed": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "scalarEvent", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "lowerBound", - "type": "int256" - }, - { - "indexed": false, - "name": "upperBound", - "type": "int256" - } - ], - "name": "ScalarEventCreation", - "type": "event" - } - }, - "links": { - "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" - }, - "address": "0x4c2a3cec05ffd4c2a476bffd6c317bf497d43bc5", - "updated_at": 1499207793329 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142595 -} \ No newline at end of file diff --git a/build/contracts/FutarchyOracle.json b/build/contracts/FutarchyOracle.json deleted file mode 100644 index 8ada8e1..0000000 --- a/build/contracts/FutarchyOracle.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "contract_name": "FutarchyOracle", - "abi": [ - { - "constant": false, - "inputs": [], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "deadline", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "close", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "LONG", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "winningMarketIndex", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "markets", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "categoricalEvent", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "funding", - "type": "uint256" - } - ], - "name": "fund", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_creator", - "type": "address" - }, - { - "name": "eventFactory", - "type": "address" - }, - { - "name": "collateralToken", - "type": "address" - }, - { - "name": "oracle", - "type": "address" - }, - { - "name": "outcomeCount", - "type": "uint8" - }, - { - "name": "lowerBound", - "type": "int256" - }, - { - "name": "upperBound", - "type": "int256" - }, - { - "name": "marketFactory", - "type": "address" - }, - { - "name": "marketMaker", - "type": "address" - }, - { - "name": "fee", - "type": "uint24" - }, - { - "name": "_deadline", - "type": "uint256" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "funding", - "type": "uint256" - } - ], - "name": "FutarchyFunding", - "type": "event" - }, - { - "anonymous": false, - "inputs": [], - "name": "FutarchyClosing", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "winningMarketIndex", - "type": "uint256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - } - ], - "unlinked_binary": "0x606060405234156200000d57fe5b604051610160806200142383398101604090815281516020830151918301516060840151608085015160a086015160c087015160e08801516101008901516101208a0151610140909a0151979996979596949593949293919290915b6000804283116200007a5760006000fd5b8b600160a060020a0316639df0c1768c308c6000604051602001526040518463ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018084600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a031681526020018260ff1660ff1681526020019350505050602060405180830381600087803b15156200011c57fe5b6102c65a03f115156200012b57fe5b50506040515160028054600160a060020a031916600160a060020a0390921691909117905550600091505b600254604080516000602091820181905282517f7dc8f0860000000000000000000000000000000000000000000000000000000081529251600160a060020a0390941693637dc8f0869360048082019493918390030190829087803b1515620001bb57fe5b6102c65a03f11515620001ca57fe5b5050506040518051905060ff168260ff16101562000423578b600160a060020a0316635ea194a3600260009054906101000a9004600160a060020a0316600160a060020a0316638abe59ea856000604051602001526040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808260ff168152602001915050602060405180830381600087803b15156200027157fe5b6102c65a03f115156200028057fe5b505050604051805190508c8b8b6000604051602001526040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b15156200031e57fe5b6102c65a03f115156200032d57fe5b5050604051516001805491935091508082016200034b838262000457565b916000526020600020900160005b604080516000602091820181905282517f7abeb6a0000000000000000000000000000000000000000000000000000000008152600160a060020a0388811660048301528c8116602483015262ffffff8c1660448301529351938d1693637abeb6a09360648084019491938390030190829087803b1515620003d657fe5b6102c65a03f11515620003e557fe5b50505060405180519050909190916101000a815481600160a060020a030219169083600160a060020a03160217905550505b60019091019062000156565b60008054600160a060020a031916600160a060020a038f1617905560038390555b50505050505050505050505050620004a8565b8154818355818115116200047e576000838152602090206200047e91810190830162000484565b5b505050565b620004a591905b80821115620004a157600081556001016200048b565b5090565b90565b610f6b80620004b86000396000f300606060405236156100935763ffffffff60e060020a6000350416630537665d811461009557806329dcb0cf146100a757806343d726d6146100c9578063561cce0a146100db57806356cfb75f146101015780637e7e4b4714610123578063b1283e7714610145578063c3730d0314610174578063c65fb380146101a0578063ca1d209d146101c4578063ccdf68f3146101d9575bfe5b341561009d57fe5b6100a56101fd565b005b34156100af57fe5b6100b761052b565b60408051918252519081900360200190f35b34156100d157fe5b6100a5610531565b005b34156100e357fe5b6100eb610a74565b6040805160ff9092168252519081900360200190f35b341561010957fe5b6100b7610a79565b60408051918252519081900360200190f35b341561012b57fe5b6100b7610a7f565b60408051918252519081900360200190f35b341561014d57fe5b610158600435610a86565b60408051600160a060020a039092168252519081900360200190f35b341561017c57fe5b610158610ab8565b60408051600160a060020a039092168252519081900360200190f35b34156101a857fe5b6101b0610ac7565b604080519115158252519081900360200190f35b34156101cc57fe5b6100a5600435610ad0565b005b34156101e157fe5b6101b0610f35565b604080519115158252519081900360200190f35b60055460009081908190819060ff1615801561021b57504260035411155b15156102275760006000fd5b60018054600090811061023657fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316631f21f9af6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561029b57fe5b6102c65a03f115156102a957fe5b50505060405180519050600160a060020a031663d812d346600160008154811015156102d157fe5b906000526020600020900160005b9054906101000a9004600160a060020a031660016000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a031681526020018260ff1660ff16815260200192505050602060405180830381600087803b151561035057fe5b6102c65a03f1151561035e57fe5b50506040515194506000935060019250505b60015460ff831610156104df576001805460ff841690811061038e57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316631f21f9af6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156103f357fe5b6102c65a03f1151561040157fe5b50505060405180519050600160a060020a031663d812d34660018460ff1681548110151561042b57fe5b906000526020600020900160005b9054906101000a9004600160a060020a031660016000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a031681526020018260ff1660ff16815260200192505050602060405180830381600087803b15156104aa57fe5b6102c65a03f115156104b857fe5b505060405151915050838111156104d3578093508160ff1692505b5b600190910190610370565b60048390556005805460ff191660011790556040805184815290517f39972cb21edd888c2061a2b4b37874524bbc055cfeaa3054682ba5369f5029aa9181900360200190a15b50505050565b60035481565b6000805433600160a060020a0390811691161461054e5760006000fd5b6001610558610a7f565b8154811061056257fe5b906000526020600020900160005b9054906101000a9004600160a060020a03169050600260009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156105df57fe5b6102c65a03f115156105ed57fe5b505060405151905080156106b6575080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561064257fe5b6102c65a03f1151561065057fe5b50505060405180519050600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561069f57fe5b6102c65a03f115156106ad57fe5b50506040515190505b15156106c25760006000fd5b80600160a060020a03166343d726d66040518163ffffffff1660e060020a028152600401809050600060405180830381600087803b15156106ff57fe5b6102c65a03f1151561070d57fe5b50505080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561075657fe5b6102c65a03f1151561076457fe5b50505060405180519050600160a060020a031663ad0b2bec6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156107b357fe5b6102c65a03f115156107c157fe5b50506040805160006020918201819052825160e160020a6323b1a1f70281529251600160a060020a038616945063476343ee9360048082019493918390030190829087803b151561080e57fe5b6102c65a03f1151561081c57fe5b50506040805160025460006020928301819052835160e260020a632b42cafb0281529351600160a060020a03909216945063ad0b2bec936004808201949392918390030190829087803b151561086e57fe5b6102c65a03f1151561087c57fe5b50506040805160025460006020928301819052835160e260020a632c805af50281529351600160a060020a03909216945063b2016bd4936004808201949392918390030190829087803b15156108ce57fe5b6102c65a03f115156108dc57fe5b5050604080518051600080546002546020948501839052855160e260020a632c805af50281529551600160a060020a03948516975063a9059cbb9692851695919094169363b2016bd4936004808501948390030190829087803b151561093e57fe5b6102c65a03f1151561094c57fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b15156109b557fe5b6102c65a03f115156109c357fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610a2457fe5b6102c65a03f11515610a3257fe5b50506040515115159050610a465760006000fd5b6040517f5f5592c20f009bc231fd8491ce6ff3d11f2067fd2bd08c2a9999391a09b67dd490600090a15b5b50565b600181565b60045481565b6004545b90565b6001805482908110610a9457fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b600254600160a060020a031681565b60055460ff1681565b60008054819033600160a060020a03908116911614610aef5760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b1515610b3d57fe5b6102c65a03f11515610b4b57fe5b5050604080518051600080546020938401829052845160e060020a6323b872dd028152600160a060020a0391821660048201523082166024820152604481018a90529451921694506323b872dd936064808201949392918390030190829087803b1515610bb457fe5b6102c65a03f11515610bc257fe5b50506040515190508015610ca757506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b1515610c1f57fe5b6102c65a03f11515610c2d57fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018a9052945191909216945063095ea7b39360448082019493918390030190829087803b1515610c9057fe5b6102c65a03f11515610c9e57fe5b50506040515190505b1515610cb35760006000fd5b6002546040805160e060020a6328da850b028152600481018690529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b1515610cff57fe5b6102c65a03f11515610d0d57fe5b505050600091505b60015460ff83161015610efb576001805460ff8416908110610d3357fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316905080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610d9b57fe5b6102c65a03f11515610da957fe5b50505060405180519050600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610df857fe5b6102c65a03f11515610e0657fe5b50505060405180519050600160a060020a031663095ea7b382856000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610e7757fe5b6102c65a03f11515610e8557fe5b50506040515115159050610e995760006000fd5b80600160a060020a031663ca1d209d846040518263ffffffff1660e060020a02815260040180828152602001915050600060405180830381600087803b1515610ede57fe5b6102c65a03f11515610eec57fe5b5050505b600190910190610d15565b6040805184815290517f8b8d4001f25800969052b4c8925891e8acbe35d672701edb74e52265fed9786e9181900360200190a15b5b505050565b60055460ff165b905600a165627a7a72305820e82c39bbc3701a208dda3c76c6ece492fc143ae4c090b1077c1bf29f616fa2a10029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/FutarchyOracleFactory.json b/build/contracts/FutarchyOracleFactory.json deleted file mode 100644 index af71fe6..0000000 --- a/build/contracts/FutarchyOracleFactory.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "contract_name": "FutarchyOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "collateralToken", - "type": "address" - }, - { - "name": "oracle", - "type": "address" - }, - { - "name": "outcomeCount", - "type": "uint8" - }, - { - "name": "lowerBound", - "type": "int256" - }, - { - "name": "upperBound", - "type": "int256" - }, - { - "name": "marketFactory", - "type": "address" - }, - { - "name": "marketMaker", - "type": "address" - }, - { - "name": "fee", - "type": "uint24" - }, - { - "name": "deadline", - "type": "uint256" - } - ], - "name": "createFutarchyOracle", - "outputs": [ - { - "name": "futarchyOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_eventFactory", - "type": "address" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "futarchyOracle", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeCount", - "type": "uint8" - }, - { - "indexed": false, - "name": "lowerBound", - "type": "int256" - }, - { - "indexed": false, - "name": "upperBound", - "type": "int256" - }, - { - "indexed": false, - "name": "marketFactory", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - }, - { - "indexed": false, - "name": "deadline", - "type": "uint256" - } - ], - "name": "FutarchyOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b60405160208061168283398101604052515b600160a060020a03811615156100345760006000fd5b60008054600160a060020a031916600160a060020a0383161790555b505b611621806100616000396000f300606060405263ffffffff60e060020a6000350416630fb9713c8114610021575bfe5b341561002957fe5b61006a600160a060020a0360043581169060243581169060ff6044351690606435906084359060a43581169060c4351662ffffff60e4351661010435610086565b60408051600160a060020a039092168252519081900360200190f35b600080543390600160a060020a03168b8b8b8b8b8b8b8b8b6100a66101c2565b600160a060020a039b8c168152998b1660208b0152978a166040808b0191909152968a1660608a015260ff909516608089015260a088019390935260c0870191909152861660e086015290941661010084015262ffffff90931661012083015261014082015290519081900361016001906000f080151561012357fe5b60408051600160a060020a0380841682528d811660208301528c81168284015260ff8c166060830152608082018b905260a082018a905288811660c083015287811660e083015262ffffff8716610100830152610120820186905291519293503391909116917fb6cae7fe38a26a3ab1db425a9de717942f485b91c2b1cccc5349ecb94b992ecf918190036101400190a25b9998505050505050505050565b604051611423806101d3833901905600606060405234156200000d57fe5b604051610160806200142383398101604090815281516020830151918301516060840151608085015160a086015160c087015160e08801516101008901516101208a0151610140909a0151979996979596949593949293919290915b6000804283116200007a5760006000fd5b8b600160a060020a0316639df0c1768c308c6000604051602001526040518463ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018084600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a031681526020018260ff1660ff1681526020019350505050602060405180830381600087803b15156200011c57fe5b6102c65a03f115156200012b57fe5b50506040515160028054600160a060020a031916600160a060020a0390921691909117905550600091505b600254604080516000602091820181905282517f7dc8f0860000000000000000000000000000000000000000000000000000000081529251600160a060020a0390941693637dc8f0869360048082019493918390030190829087803b1515620001bb57fe5b6102c65a03f11515620001ca57fe5b5050506040518051905060ff168260ff16101562000423578b600160a060020a0316635ea194a3600260009054906101000a9004600160a060020a0316600160a060020a0316638abe59ea856000604051602001526040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808260ff168152602001915050602060405180830381600087803b15156200027157fe5b6102c65a03f115156200028057fe5b505050604051805190508c8b8b6000604051602001526040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b15156200031e57fe5b6102c65a03f115156200032d57fe5b5050604051516001805491935091508082016200034b838262000457565b916000526020600020900160005b604080516000602091820181905282517f7abeb6a0000000000000000000000000000000000000000000000000000000008152600160a060020a0388811660048301528c8116602483015262ffffff8c1660448301529351938d1693637abeb6a09360648084019491938390030190829087803b1515620003d657fe5b6102c65a03f11515620003e557fe5b50505060405180519050909190916101000a815481600160a060020a030219169083600160a060020a03160217905550505b60019091019062000156565b60008054600160a060020a031916600160a060020a038f1617905560038390555b50505050505050505050505050620004a8565b8154818355818115116200047e576000838152602090206200047e91810190830162000484565b5b505050565b620004a591905b80821115620004a157600081556001016200048b565b5090565b90565b610f6b80620004b86000396000f300606060405236156100935763ffffffff60e060020a6000350416630537665d811461009557806329dcb0cf146100a757806343d726d6146100c9578063561cce0a146100db57806356cfb75f146101015780637e7e4b4714610123578063b1283e7714610145578063c3730d0314610174578063c65fb380146101a0578063ca1d209d146101c4578063ccdf68f3146101d9575bfe5b341561009d57fe5b6100a56101fd565b005b34156100af57fe5b6100b761052b565b60408051918252519081900360200190f35b34156100d157fe5b6100a5610531565b005b34156100e357fe5b6100eb610a74565b6040805160ff9092168252519081900360200190f35b341561010957fe5b6100b7610a79565b60408051918252519081900360200190f35b341561012b57fe5b6100b7610a7f565b60408051918252519081900360200190f35b341561014d57fe5b610158600435610a86565b60408051600160a060020a039092168252519081900360200190f35b341561017c57fe5b610158610ab8565b60408051600160a060020a039092168252519081900360200190f35b34156101a857fe5b6101b0610ac7565b604080519115158252519081900360200190f35b34156101cc57fe5b6100a5600435610ad0565b005b34156101e157fe5b6101b0610f35565b604080519115158252519081900360200190f35b60055460009081908190819060ff1615801561021b57504260035411155b15156102275760006000fd5b60018054600090811061023657fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316631f21f9af6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561029b57fe5b6102c65a03f115156102a957fe5b50505060405180519050600160a060020a031663d812d346600160008154811015156102d157fe5b906000526020600020900160005b9054906101000a9004600160a060020a031660016000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a031681526020018260ff1660ff16815260200192505050602060405180830381600087803b151561035057fe5b6102c65a03f1151561035e57fe5b50506040515194506000935060019250505b60015460ff831610156104df576001805460ff841690811061038e57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316631f21f9af6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156103f357fe5b6102c65a03f1151561040157fe5b50505060405180519050600160a060020a031663d812d34660018460ff1681548110151561042b57fe5b906000526020600020900160005b9054906101000a9004600160a060020a031660016000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a031681526020018260ff1660ff16815260200192505050602060405180830381600087803b15156104aa57fe5b6102c65a03f115156104b857fe5b505060405151915050838111156104d3578093508160ff1692505b5b600190910190610370565b60048390556005805460ff191660011790556040805184815290517f39972cb21edd888c2061a2b4b37874524bbc055cfeaa3054682ba5369f5029aa9181900360200190a15b50505050565b60035481565b6000805433600160a060020a0390811691161461054e5760006000fd5b6001610558610a7f565b8154811061056257fe5b906000526020600020900160005b9054906101000a9004600160a060020a03169050600260009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156105df57fe5b6102c65a03f115156105ed57fe5b505060405151905080156106b6575080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561064257fe5b6102c65a03f1151561065057fe5b50505060405180519050600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561069f57fe5b6102c65a03f115156106ad57fe5b50506040515190505b15156106c25760006000fd5b80600160a060020a03166343d726d66040518163ffffffff1660e060020a028152600401809050600060405180830381600087803b15156106ff57fe5b6102c65a03f1151561070d57fe5b50505080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561075657fe5b6102c65a03f1151561076457fe5b50505060405180519050600160a060020a031663ad0b2bec6000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156107b357fe5b6102c65a03f115156107c157fe5b50506040805160006020918201819052825160e160020a6323b1a1f70281529251600160a060020a038616945063476343ee9360048082019493918390030190829087803b151561080e57fe5b6102c65a03f1151561081c57fe5b50506040805160025460006020928301819052835160e260020a632b42cafb0281529351600160a060020a03909216945063ad0b2bec936004808201949392918390030190829087803b151561086e57fe5b6102c65a03f1151561087c57fe5b50506040805160025460006020928301819052835160e260020a632c805af50281529351600160a060020a03909216945063b2016bd4936004808201949392918390030190829087803b15156108ce57fe5b6102c65a03f115156108dc57fe5b5050604080518051600080546002546020948501839052855160e260020a632c805af50281529551600160a060020a03948516975063a9059cbb9692851695919094169363b2016bd4936004808501948390030190829087803b151561093e57fe5b6102c65a03f1151561094c57fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b15156109b557fe5b6102c65a03f115156109c357fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610a2457fe5b6102c65a03f11515610a3257fe5b50506040515115159050610a465760006000fd5b6040517f5f5592c20f009bc231fd8491ce6ff3d11f2067fd2bd08c2a9999391a09b67dd490600090a15b5b50565b600181565b60045481565b6004545b90565b6001805482908110610a9457fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b600254600160a060020a031681565b60055460ff1681565b60008054819033600160a060020a03908116911614610aef5760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b1515610b3d57fe5b6102c65a03f11515610b4b57fe5b5050604080518051600080546020938401829052845160e060020a6323b872dd028152600160a060020a0391821660048201523082166024820152604481018a90529451921694506323b872dd936064808201949392918390030190829087803b1515610bb457fe5b6102c65a03f11515610bc257fe5b50506040515190508015610ca757506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b1515610c1f57fe5b6102c65a03f11515610c2d57fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018a9052945191909216945063095ea7b39360448082019493918390030190829087803b1515610c9057fe5b6102c65a03f11515610c9e57fe5b50506040515190505b1515610cb35760006000fd5b6002546040805160e060020a6328da850b028152600481018690529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b1515610cff57fe5b6102c65a03f11515610d0d57fe5b505050600091505b60015460ff83161015610efb576001805460ff8416908110610d3357fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316905080600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610d9b57fe5b6102c65a03f11515610da957fe5b50505060405180519050600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610df857fe5b6102c65a03f11515610e0657fe5b50505060405180519050600160a060020a031663095ea7b382856000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610e7757fe5b6102c65a03f11515610e8557fe5b50506040515115159050610e995760006000fd5b80600160a060020a031663ca1d209d846040518263ffffffff1660e060020a02815260040180828152602001915050600060405180830381600087803b1515610ede57fe5b6102c65a03f11515610eec57fe5b5050505b600190910190610d15565b6040805184815290517f8b8d4001f25800969052b4c8925891e8acbe35d672701edb74e52265fed9786e9181900360200190a15b5b505050565b60055460ff165b905600a165627a7a72305820e82c39bbc3701a208dda3c76c6ece492fc143ae4c090b1077c1bf29f616fa2a10029a165627a7a72305820fbc1778a68ae30000b5b029446fa9975ba0f410e25e31dcdec79f2b6c293c2c30029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/LMSRMarketMaker.json b/build/contracts/LMSRMarketMaker.json deleted file mode 100644 index 032226e..0000000 --- a/build/contracts/LMSRMarketMaker.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "contract_name": "LMSRMarketMaker", - "abi": [ - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "calcProfit", - "outputs": [ - { - "name": "profit", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "calcCost", - "outputs": [ - { - "name": "cost", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - } - ], - "name": "calcMarginalPrice", - "outputs": [ - { - "name": "price", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6110598061001c6000396000f300606060405263ffffffff60e060020a6000350416634091c6a98114610037578063bd8ff8171461006e578063d812d346146100a5575bfe5b341561003f57fe5b61005c600160a060020a036004351660ff602435166044356100d9565b60408051918252519081900360200190f35b341561007657fe5b61005c600160a060020a036004351660ff60243516604435610395565b60408051918252519081900360200190f35b34156100ad57fe5b61005c600160a060020a036004351660ff60243516610684565b60408051918252519081900360200190f35b60006100e361101b565b6000600060006000600189600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561013357fe5b6102c65a03f1151561014157fe5b50505060405180519050600160a060020a0316637dc8f0866000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561019057fe5b6102c65a03f1151561019e57fe5b50506040515160ff169190911190506101b75760006000fd5b6101c08961087d565b945073__Math__________________________________6324d4e90a604060020a8751026000604051602001526040518263ffffffff1660e060020a0281526004018082815260200191505060206040518083038186803b151561022057fe5b6102c65a03f4151561022e57fe5b50505060405180519050935088600160a060020a031663cb4c86b76000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561028057fe5b6102c65a03f1151561028e57fe5b50506040515193506102a39050848685610a06565b915060008712156102b45760006000fd5b848860ff168151811015156102c557fe5b9060200190602002015173__Math__________________________________63adefc37b9091896000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561032f57fe5b6102c65a03f4151561033d57fe5b5050604051518651909150869060ff8b1690811061035757fe5b6020908102909101015261036c848685610a06565b90508082121561037c5760006000fd5b604060020a8183035b0495505b50505050509392505050565b600061039f61101b565b6000600060006000600189600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156103ef57fe5b6102c65a03f115156103fd57fe5b50505060405180519050600160a060020a0316637dc8f0866000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561044c57fe5b6102c65a03f1151561045a57fe5b50506040515160ff169190911190506104735760006000fd5b61047c8961087d565b945073__Math__________________________________6324d4e90a604060020a8751026000604051602001526040518263ffffffff1660e060020a0281526004018082815260200191505060206040518083038186803b15156104dc57fe5b6102c65a03f415156104ea57fe5b50505060405180519050935088600160a060020a031663cb4c86b76000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561053c57fe5b6102c65a03f1151561054a57fe5b505060405151935061055f9050848685610a06565b915060008712156105705760006000fd5b848860ff1681518110151561058157fe5b9060200190602002015173__Math__________________________________63a5f3c23b9091896000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15156105eb57fe5b6102c65a03f415156105f957fe5b5050604051518651909150869060ff8b1690811061061357fe5b60209081029091010152610628848685610a06565b9050818112156106385760006000fd5b818103955085604060020a80825b0402141561065d57604060020a865b04955061066b565b604060020a865b0460010195505b86861115610389578695505b5b50505050509392505050565b600061068e61101b565b6000600060006000600188600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156106de57fe5b6102c65a03f115156106ec57fe5b50505060405180519050600160a060020a0316637dc8f0866000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561073b57fe5b6102c65a03f1151561074957fe5b50506040515160ff169190911190506107625760006000fd5b61076b8861087d565b945073__Math__________________________________6324d4e90a604060020a8751026000604051602001526040518263ffffffff1660e060020a0281526004018082815260200191505060206040518083038186803b15156107cb57fe5b6102c65a03f415156107d957fe5b50505060405180519050935087600160a060020a031663cb4c86b76000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561082b57fe5b6102c65a03f1151561083957fe5b505060405151935061084f90508486858a610c05565b9250509150604060020a8281151561086357fe5b048181151561086e57fe5b0495505b505050505092915050565b61088561101b565b600082600160a060020a031663e274fd246000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156108cd57fe5b6102c65a03f115156108db57fe5b50505060405180519050600160a060020a0316637dc8f0866000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561092a57fe5b6102c65a03f1151561093857fe5b5050604051805160ff16915080591061094e5750595b908082528060200260200182016040525b509150600090505b81518160ff1610156109ff5782600160a060020a031663a157979c826000604051602001526040518263ffffffff1660e060020a028152600401808260ff168152602001915050602060405180830381600087803b15156109c457fe5b6102c65a03f115156109d257fe5b5050604051518351909150839060ff84169081106109ec57fe5b602090810290910101525b600101610967565b5b50919050565b600060006000610a198686866000610c05565b509150915073__Math__________________________________6324d4e90a836000604051602001526040518263ffffffff1660e060020a0281526004018082815260200191505060206040518083038186803b1515610a7557fe5b6102c65a03f41515610a8357fe5b50506040805180516000602092830152825160e060020a63a5f3c23b0281526004810182905260248101869052925190965073__Math__________________________________935063a5f3c23b926044808201939291829003018186803b1515610aea57fe5b6102c65a03f41515610af857fe5b50506040805180516000602092830152825160e060020a63bbe93d9102815260048101829052604060020a6024820152925190965089935073__Math__________________________________9263bbe93d91926044808301939192829003018186803b1515610b6457fe5b6102c65a03f41515610b7257fe5b5050604051519050811515610b8357fe5b0573__Math__________________________________63bbe93d919091866000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610be457fe5b6102c65a03f41515610bf257fe5b5050604051519350505b50509392505050565b60006000600060006000600073__Math__________________________________63ccc138148a6000604051602001526040518263ffffffff1660e060020a0281526004018080602001828103825283818151815260200191508051906020019060200280838360008314610c95575b805182526020831115610c9557601f199092019160209182019101610c75565b5050509050019250505060206040518083038186803b1515610cb357fe5b6102c65a03f41515610cc157fe5b50506040515193505060008a12801590610cdc575060008812155b1515610ce85760006000fd5b604080516000602091820152815160e060020a63bbe93d9102815260048101869052602481018d905291518a9273__Math__________________________________9263bbe93d9192604480840193829003018186803b1515610d4757fe5b6102c65a03f41515610d5557fe5b5050604051519050811515610d6657fe5b0594508473__Math__________________________________63adefc37b9091687f8a013a1ecd1f73796000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610dd357fe5b6102c65a03f41515610de157fe5b505060405151955060009150505b88518160ff16101561100d5773__Math__________________________________63e46751e3898b8460ff16815181101515610e2757fe5b9060200190602002015173__Math__________________________________63bbe93d9190918f6000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610e9157fe5b6102c65a03f41515610e9f57fe5b5050604051519050811515610eb057fe5b0573__Math__________________________________63adefc37b9091896000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610f1157fe5b6102c65a03f41515610f1f57fe5b505050604051805190506000604051602001526040518263ffffffff1660e060020a0281526004018082815260200191505060206040518083038186803b1515610f6557fe5b6102c65a03f41515610f7357fe5b50506040515192505060ff8181169088161415610f8e578193505b604080516000602091820152815160e060020a63771602f70281526004810189905260248101859052915173__Math__________________________________9263771602f7926044808301939192829003018186803b1515610fed57fe5b6102c65a03f41515610ffb57fe5b5050604051519650505b600101610def565b5b5050509450945094915050565b604080516020810190915260008152905600a165627a7a7230582087c3b89f91930dfa5835a47f89f21fb720e7b68886ade5e77758ff2303052b950029", - "networks": { - "4": { - "events": {}, - "links": { - "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" - }, - "address": "0x7c2e1876b8bc73ad3571a9ae07e034cbbd8b4386", - "updated_at": 1499271142596 - }, - "42": { - "events": {}, - "links": { - "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" - }, - "address": "0x19f7eca6fad8fa20a3e21993346ba8997aee604e", - "updated_at": 1499207793336 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142596 -} \ No newline at end of file diff --git a/build/contracts/MajorityOracle.json b/build/contracts/MajorityOracle.json deleted file mode 100644 index af108ac..0000000 --- a/build/contracts/MajorityOracle.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "contract_name": "MajorityOracle", - "abi": [ - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "oracles", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "getStatusAndOutcome", - "outputs": [ - { - "name": "outcomeSet", - "type": "bool" - }, - { - "name": "outcome", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_oracles", - "type": "address[]" - } - ], - "payable": false, - "type": "constructor" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b6040516105b13803806105b1833981016040528051015b6000600282511115156100365760006000fd5b5060005b815181101561007957818181518110151561005157fe5b60209081029091010151600160a060020a031615156100705760006000fd5b5b60010161003a565b815161008c906000906020850190610095565b505b5050610126565b8280548282559060005260206000209081019282156100ea579160200282015b828111156100ea5782518254600160a060020a031916600160a060020a039091161782556020909201916001909101906100b5565b5b506100f79291506100fb565b5090565b61012391905b808211156100f7578054600160a060020a0319168155600101610101565b5090565b90565b61047c806101356000396000f300606060405263ffffffff60e060020a6000350416635b69a7d881146100425780636bcc035a146100715780637e7e4b471461009c578063ccdf68f3146100be575bfe5b341561004a57fe5b6100556004356100e2565b60408051600160a060020a039092168252519081900360200190f35b341561007957fe5b610081610114565b60408051921515835260208301919091528051918290030190f35b34156100a457fe5b6100ac6103fe565b60408051918252519081900360200190f35b34156100c657fe5b6100ce610415565b604080519115158252519081900360200190f35b60008054829081106100f057fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60006000600061012261042c565b61012a61042c565b60006000600060006000805490506040518059106101455750595b908082528060200260200182016040525b506000546040519197509080591061016b5750595b908082528060200260200182016040525b509450600096505b60005487101561036957600080548890811061019c57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561020157fe5b6102c65a03f1151561020f57fe5b50506040515115905061035c57600080548890811061022a57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316637e7e4b476000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561028f57fe5b6102c65a03f1151561029d57fe5b505060405151945060009350505b86831161035c5785838151811015156102c057fe5b906020019060200201518414156102f657600185848151811015156102e157fe5b6020908102909101018051909101905261035c565b848381518110151561030457fe5b906020019060200201516000141561034f5783868481518110151561032557fe5b60209081029091010152845160019086908590811061034057fe5b6020908102909101015261035c565b5b5b6001909201916102ab565b5b5b600190960195610184565b5060009550859050805b6000548710156103c65781858881518110151561038c57fe5b9060200190602002015111156103ba5784878151811015156103aa57fe5b9060200190602002015191508690505b5b600190960195610373565b6000546002830211156103f2576001985085818151811015156103e557fe5b9060200190602002015197505b5b505050505050509091565b6000600061040a610114565b9150508091505b5090565b60006000610421610114565b5090508091505b5090565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a72305820574d098a10d893d4ca74d61855dd9361f63c7f3fe72c5c2bbf20eb68bcce46eb0029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/MajorityOracleFactory.json b/build/contracts/MajorityOracleFactory.json deleted file mode 100644 index cadf790..0000000 --- a/build/contracts/MajorityOracleFactory.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "contract_name": "MajorityOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "oracles", - "type": "address[]" - } - ], - "name": "createMajorityOracle", - "outputs": [ - { - "name": "majorityOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "majorityOracle", - "type": "address" - }, - { - "indexed": false, - "name": "oracles", - "type": "address[]" - } - ], - "name": "MajorityOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6107968061001c6000396000f300606060405263ffffffff60e060020a600035041663e04c0c528114610021575bfe5b341561002957fe5b61007460048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375094965061009095505050505050565b60408051600160a060020a039092168252519081900360200190f35b60008161009b6101a9565b6020808252825181830152825182916040830191858201910280838382156100de575b8051825260208311156100de57601f1990920191602091820191016100be565b50505090500192505050604051809103906000f08015156100fb57fe5b905033600160a060020a03167fdf1eeefc4815bdd1bdf45905c4ce59f6ca50efb4148303c9bbda2bff40301d3d82846040518083600160a060020a0316600160a060020a0316815260200180602001828103825283818151815260200191508051906020019060200280838360008314610190575b80518252602083111561019057601f199092019160209182019101610170565b505050905001935050505060405180910390a25b919050565b6040516105b1806101ba8339019056006060604052341561000c57fe5b6040516105b13803806105b1833981016040528051015b6000600282511115156100365760006000fd5b5060005b815181101561007957818181518110151561005157fe5b60209081029091010151600160a060020a031615156100705760006000fd5b5b60010161003a565b815161008c906000906020850190610095565b505b5050610126565b8280548282559060005260206000209081019282156100ea579160200282015b828111156100ea5782518254600160a060020a031916600160a060020a039091161782556020909201916001909101906100b5565b5b506100f79291506100fb565b5090565b61012391905b808211156100f7578054600160a060020a0319168155600101610101565b5090565b90565b61047c806101356000396000f300606060405263ffffffff60e060020a6000350416635b69a7d881146100425780636bcc035a146100715780637e7e4b471461009c578063ccdf68f3146100be575bfe5b341561004a57fe5b6100556004356100e2565b60408051600160a060020a039092168252519081900360200190f35b341561007957fe5b610081610114565b60408051921515835260208301919091528051918290030190f35b34156100a457fe5b6100ac6103fe565b60408051918252519081900360200190f35b34156100c657fe5b6100ce610415565b604080519115158252519081900360200190f35b60008054829081106100f057fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60006000600061012261042c565b61012a61042c565b60006000600060006000805490506040518059106101455750595b908082528060200260200182016040525b506000546040519197509080591061016b5750595b908082528060200260200182016040525b509450600096505b60005487101561036957600080548890811061019c57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561020157fe5b6102c65a03f1151561020f57fe5b50506040515115905061035c57600080548890811061022a57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a0316637e7e4b476000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561028f57fe5b6102c65a03f1151561029d57fe5b505060405151945060009350505b86831161035c5785838151811015156102c057fe5b906020019060200201518414156102f657600185848151811015156102e157fe5b6020908102909101018051909101905261035c565b848381518110151561030457fe5b906020019060200201516000141561034f5783868481518110151561032557fe5b60209081029091010152845160019086908590811061034057fe5b6020908102909101015261035c565b5b5b6001909201916102ab565b5b5b600190960195610184565b5060009550859050805b6000548710156103c65781858881518110151561038c57fe5b9060200190602002015111156103ba5784878151811015156103aa57fe5b9060200190602002015191508690505b5b600190960195610373565b6000546002830211156103f2576001985085818151811015156103e557fe5b9060200190602002015197505b5b505050505050509091565b6000600061040a610114565b9150508091505b5090565b60006000610421610114565b5090508091505b5090565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a72305820574d098a10d893d4ca74d61855dd9361f63c7f3fe72c5c2bbf20eb68bcce46eb0029a165627a7a72305820fdd6a1d38054cc5154e7b969b09ebe15e84e9f12a02d3d3e720bef07d33c9d980029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/Market.json b/build/contracts/Market.json deleted file mode 100644 index f557be5..0000000 --- a/build/contracts/Market.json +++ /dev/null @@ -1,359 +0,0 @@ -{ - "contract_name": "Market", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "creator", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "marketMaker", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "minProfit", - "type": "uint256" - } - ], - "name": "shortSell", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "close", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "minProfit", - "type": "uint256" - } - ], - "name": "sell", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "withdrawFees", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "createdAtBlock", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "netOutcomeTokensSold", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "outcomeTokenCost", - "type": "uint256" - } - ], - "name": "calcMarketFee", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "stage", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_funding", - "type": "uint256" - } - ], - "name": "fund", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "funding", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "fee", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "eventContract", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "maxCost", - "type": "uint256" - } - ], - "name": "buy", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "funding", - "type": "uint256" - } - ], - "name": "MarketFunding", - "type": "event" - }, - { - "anonymous": false, - "inputs": [], - "name": "MarketClosing", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "fees", - "type": "uint256" - } - ], - "name": "FeeWithdrawal", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "cost", - "type": "uint256" - } - ], - "name": "OutcomeTokenPurchase", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "profit", - "type": "uint256" - } - ], - "name": "OutcomeTokenSale", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "cost", - "type": "uint256" - } - ], - "name": "OutcomeTokenShortSale", - "type": "event" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/MarketFactory.json b/build/contracts/MarketFactory.json deleted file mode 100644 index 3ad78fe..0000000 --- a/build/contracts/MarketFactory.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "contract_name": "MarketFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "eventContract", - "type": "address" - }, - { - "name": "marketMaker", - "type": "address" - }, - { - "name": "fee", - "type": "uint24" - } - ], - "name": "createMarket", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "market", - "type": "address" - }, - { - "indexed": false, - "name": "eventContract", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - } - ], - "name": "MarketCreation", - "type": "event" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/MarketMaker.json b/build/contracts/MarketMaker.json deleted file mode 100644 index 1020582..0000000 --- a/build/contracts/MarketMaker.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "contract_name": "MarketMaker", - "abi": [ - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "calcProfit", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "calcCost", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "market", - "type": "address" - }, - { - "name": "outcomeTokenIndex", - "type": "uint8" - } - ], - "name": "calcMarginalPrice", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/Math.json b/build/contracts/Math.json deleted file mode 100644 index fa7933c..0000000 --- a/build/contracts/Math.json +++ /dev/null @@ -1,397 +0,0 @@ -{ - "contract_name": "Math", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "LN2", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "safeToMul", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "LOG2_E", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "x", - "type": "uint256" - } - ], - "name": "ln", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "x", - "type": "uint256" - } - ], - "name": "floorLog2", - "outputs": [ - { - "name": "lo", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "safeToAdd", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "add", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "safeToSub", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "add", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "sub", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "sub", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "mul", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "ONE", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "mul", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "safeToMul", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "nums", - "type": "int256[]" - } - ], - "name": "max", - "outputs": [ - { - "name": "max", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "int256" - }, - { - "name": "b", - "type": "int256" - } - ], - "name": "safeToAdd", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "a", - "type": "uint256" - }, - { - "name": "b", - "type": "uint256" - } - ], - "name": "safeToSub", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "x", - "type": "int256" - } - ], - "name": "exp", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b610b3c8061001c6000396000f300606060405236156100eb5763ffffffff60e060020a6000350416630278067781146100ed5780631f47ba291461010757806324902e241461012957806324d4e90a1461014357806345b8bafc146101605780634e30a66c1461017d578063771602f71461019f57806390304341146101bf578063a5f3c23b146101e1578063adefc37b14610201578063b67d77c514610221578063bbe93d9114610241578063c2ee3a0814610261578063c8a4ac9c1461027b578063cb10fa761461029b578063ccc13814146102bd578063dc08a80b1461031a578063e31c71c41461033c578063e46751e31461035e575bfe5b6100f561037b565b60408051918252519081900360200190f35b610115600435602435610387565b604080519115158252519081900360200190f35b6100f56103ab565b60408051918252519081900360200190f35b6100f56004356103b8565b60408051918252519081900360200190f35b6100f56004356105e7565b60408051918252519081900360200190f35b61011560043560243561065c565b604080519115158252519081900360200190f35b6100f560043560243561066a565b60408051918252519081900360200190f35b61011560043560243561068d565b604080519115158252519081900360200190f35b6100f56004356024356106c3565b60408051918252519081900360200190f35b6100f56004356024356106e6565b60408051918252519081900360200190f35b6100f5600435602435610709565b60408051918252519081900360200190f35b6100f560043560243561072c565b60408051918252519081900360200190f35b6100f561074f565b60408051918252519081900360200190f35b6100f5600435602435610757565b60408051918252519081900360200190f35b61011560043560243561077a565b604080519115158252519081900360200190f35b6100f560048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375094965061079e95505050505050565b60408051918252519081900360200190f35b610115600435602435610811565b604080519115158252519081900360200190f35b610115600435602435610847565b604080519115158252519081900360200190f35b6100f5600435610852565b60408051918252519081900360200190f35b67b17217f7d1cf79ac81565b60008115806103a25750828283850281151561039f57fe5b05145b90505b92915050565b680171547652b82fe17781565b600080808080808087116103cc5760006000fd5b6103d5876105e7565b945060008512156103f15784600003879060020a0293506103fb565b600285900a870493505b604060020a8401604060020a604060020a86030281151561041857fe5b059250829150604060020a82818180025b050281151561043457fe5b0590506003815b059190910190604060020a83818382025b050281151561045757fe5b0590506005815b059190910190604060020a83818382025b050281151561047a57fe5b0590506007815b059190910190604060020a83818382025b050281151561049d57fe5b0590506009815b059190910190604060020a83818382025b05028115156104c057fe5b059050600b815b059190910190604060020a83818382025b05028115156104e357fe5b059050600d815b059190910190604060020a83818382025b050281151561050657fe5b059050600f815b059190910190604060020a83818382025b050281151561052957fe5b0590506011815b059190910190604060020a83818382025b050281151561054c57fe5b0590506013815b059190910190604060020a83818382025b050281151561056f57fe5b0590506015815b059190910190604060020a83818382025b050281151561059257fe5b0590506017815b059190910190604060020a83818382025b05028115156105b557fe5b0590506019815b05919091019060028202680171547652b82fe177608060020a87025b050195505b5050505050919050565b603f1960c160405b81836001011215610654576000811280156106165750604060020a81600003859060020a02105b806106365750600081121580156106365750604060020a600282900a8504105b5b1561064457809150610648565b8092505b506002818301056105ef565b5b5050919050565b808201829010155b92915050565b6000610676838361065c565b15156106825760006000fd5b508181015b92915050565b6000600082121580156106a257508282840313155b806103a257506000821280156103a2575082828403135b5b90505b92915050565b60006106768383610811565b15156106825760006000fd5b508181015b92915050565b60006106f2838361068d565b15156106fe5760006000fd5b508082035b92915050565b60006106f28383610847565b15156106fe5760006000fd5b508082035b92915050565b60006107388383610387565b15156107445760006000fd5b508181025b92915050565b604060020a81565b6000610738838361077a565b15156107445760006000fd5b508181025b92915050565b60008115806103a25750828283850281151561079257fe5b04145b90505b92915050565b60006000600083511115156107b35760006000fd5b5060ff60020a905060005b825181101561080a578183828151811015156107d657fe5b9060200190602002015113156108015782818151811015156107f457fe5b9060200190602002015191505b5b6001016107be565b5b50919050565b60006000821215801561082657508282840112155b806103a257506000821280156103a2575082828401125b5b90505b92915050565b808210155b92915050565b60008080808068851591f9dd5b9b40d786131561086f5760006000fd5b682c5c85fdf473de6af21986121561088a5760009450610b06565b67b17217f7d1cf79ac604060020a87025b059550600086126108bf57604060020a865b059350604060020a865b0792506108e1565b6001604060020a875b05039350604060020a60008790035b07604060020a0392505b50819050604060020a8067b17217f7d1cf79ab83025b0401604060020a8284025b049150604060020a673d7f7bff058b1d5083025b0401604060020a8284025b049150604060020a670e35846b82505fc583025b0401604060020a8284025b049150604060020a670276556df749cee583025b0401604060020a8284025b049150604060020a665761ff9e299cc483025b0401604060020a8284025b049150604060020a660a184897c363c383025b0401604060020a8284025b049150604060020a65ffe5fe2c458683025b0401604060020a8284025b049150604060020a65162c0223a5c883025b0401604060020a8284025b049150604060020a6501b5253d395e83025b0401604060020a8284025b049150604060020a641e4cf5158b83025b0401604060020a8284025b049150604060020a6401e8cac73583025b0401604060020a8284025b049150604060020a631c3bd65083025b0401604060020a8284025b049150604060020a630181619383025b0401604060020a8284025b049150604060020a6213149683025b0401604060020a8284025b049150604060020a61e1b783025b0401604060020a8284025b049150604060020a6109c783025b040160008412610aed5760008461010003826000821215610abe57fe5b9060020a90041115610ad4576000199450610b06565b83816000821215610ae157fe5b9060020a029450610b06565b83600003816000821215610afd57fe5b9060020a900494505b5b505050509190505600a165627a7a723058208a7e1871fd43757c24fadb2241953faf78281dc8e0f0446bb6bf21a6489289c00029", - "networks": { - "4": { - "events": {}, - "links": {}, - "address": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b", - "updated_at": 1499271142589 - }, - "42": { - "events": {}, - "links": {}, - "address": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc", - "updated_at": 1499207793335 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142589 -} \ No newline at end of file diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json deleted file mode 100644 index 6491b40..0000000 --- a/build/contracts/Migrations.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "contract_name": "Migrations", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "new_address", - "type": "address" - } - ], - "name": "upgrade", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "last_completed_migration", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "owner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "completed", - "type": "uint256" - } - ], - "name": "setCompleted", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "inputs": [], - "payable": false, - "type": "constructor" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b60008054600160a060020a03191633600160a060020a03161790555b5b6101a0806100396000396000f300606060405263ffffffff60e060020a6000350416630900f0108114610042578063445df0ac146100605780638da5cb5b14610082578063fdacd576146100ae575bfe5b341561004a57fe5b61005e600160a060020a03600435166100c3565b005b341561006857fe5b61007061013d565b60408051918252519081900360200190f35b341561008a57fe5b610092610143565b60408051600160a060020a039092168252519081900360200190f35b34156100b657fe5b61005e600435610152565b005b6000805433600160a060020a03908116911614156101375781905080600160a060020a031663fdacd5766001546040518263ffffffff1660e060020a02815260040180828152602001915050600060405180830381600087803b151561012557fe5b6102c65a03f1151561013357fe5b5050505b5b5b5050565b60015481565b600054600160a060020a031681565b60005433600160a060020a039081169116141561016f5760018190555b5b5b505600a165627a7a7230582037de5733e5535a3d57a1d512560353c07c08b88ae713ab7018396dc5b5f9b0950029", - "networks": { - "4": { - "events": {}, - "links": {}, - "address": "0x95d4bd23860a6217c4b4c17d81d8f089b2df8347", - "updated_at": 1499271142595 - }, - "42": { - "events": {}, - "links": {}, - "address": "0x67b102d3ab8d9d911e72415759ab493dda20d4d6", - "updated_at": 1499207793336 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142595 -} \ No newline at end of file diff --git a/build/contracts/Oracle.json b/build/contracts/Oracle.json deleted file mode 100644 index 9a0d459..0000000 --- a/build/contracts/Oracle.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "contract_name": "Oracle", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/OutcomeToken.json b/build/contracts/OutcomeToken.json deleted file mode 100644 index 0eb4c8c..0000000 --- a/build/contracts/OutcomeToken.json +++ /dev/null @@ -1,262 +0,0 @@ -{ - "contract_name": "OutcomeToken", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "spender", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "from", - "type": "address" - }, - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_for", - "type": "address" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "issue", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - }, - { - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "eventContract", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_for", - "type": "address" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "revoke", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "inputs": [], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Issuance", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Revocation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b60038054600160a060020a03191633600160a060020a03161790555b5b6109e9806100396000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461007f57806318160ddd146100b257806323b872dd146100d457806370a082311461010d578063867904b41461013b578063a9059cbb1461015c578063dd62ed3e1461018f578063e274fd24146101c3578063eac449d9146101ef575bfe5b341561008757fe5b61009e600160a060020a0360043516602435610210565b604080519115158252519081900360200190f35b34156100ba57fe5b6100c261027b565b60408051918252519081900360200190f35b34156100dc57fe5b61009e600160a060020a0360043581169060243516604435610282565b604080519115158252519081900360200190f35b341561011557fe5b6100c2600160a060020a03600435166104c8565b60408051918252519081900360200190f35b341561014357fe5b61015a600160a060020a03600435166024356104e7565b005b341561016457fe5b61009e600160a060020a0360043516602435610660565b604080519115158252519081900360200190f35b341561019757fe5b6100c2600160a060020a03600435811690602435166107e8565b60408051918252519081900360200190f35b34156101cb57fe5b6101d3610815565b60408051600160a060020a039092168252519081900360200190f35b34156101f757fe5b61015a600160a060020a0360043516602435610824565b005b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156102f657fe5b6102c65a03f4151561030457fe5b505060405151159050806103af5750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561039757fe5b6102c65a03f415156103a557fe5b5050604051511590505b806104425750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561042a57fe5b6102c65a03f4151561043857fe5b5050604051511590505b1561044f575060006104c1565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b60035433600160a060020a039081169116146105035760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018490525173__Math__________________________________9263771602f7926044808301939192829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63771602f7028152600481019290925260248201859052915173__Math__________________________________935063771602f792604480840193919291829003018186803b151561060657fe5b6102c65a03f4151561061457fe5b50506040805180516002558381529051600160a060020a03851692507f9cb9c14f7bc76e3a89b796b091850526236115352a198b1e472f00e91376bbcb9181900360200190a25b5b5050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156106d457fe5b6102c65a03f415156106e257fe5b5050604051511590508061077e5750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561076657fe5b6102c65a03f4151561077457fe5b5050604051511590505b1561078b57506000610275565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b600354600160a060020a031681565b60035433600160a060020a039081169116146108405760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b15156108b557fe5b6102c65a03f415156108c357fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561094357fe5b6102c65a03f4151561095157fe5b50506040805180516002558381529051600160a060020a03851692507ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e99181900360200190a25b5b50505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820c0b1f9fb410819bad58af9475f53f60b8e0f3efcdf0e69efca46981ed4dc98d40029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/ScalarEvent.json b/build/contracts/ScalarEvent.json deleted file mode 100644 index 16f5930..0000000 --- a/build/contracts/ScalarEvent.json +++ /dev/null @@ -1,350 +0,0 @@ -{ - "contract_name": "ScalarEvent", - "abi": [ - { - "constant": false, - "inputs": [], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "outcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "buyAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "LONG", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "getOutcomeTokenDistribution", - "outputs": [ - { - "name": "outcomeTokenDistribution", - "type": "uint256[]" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "OUTCOME_RANGE", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "sellAllOutcomes", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "oracle", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeCount", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "outcomeTokens", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "lowerBound", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "SHORT", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "redeemWinnings", - "outputs": [ - { - "name": "winnings", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "upperBound", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "collateralToken", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getEventHash", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcomeTokens", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_collateralToken", - "type": "address" - }, - { - "name": "_oracle", - "type": "address" - }, - { - "name": "_lowerBound", - "type": "int256" - }, - { - "name": "_upperBound", - "type": "int256" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcomeToken", - "type": "address" - }, - { - "indexed": false, - "name": "index", - "type": "uint8" - } - ], - "name": "OutcomeTokenCreation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "collateralTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetIssuance", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - } - ], - "name": "OutcomeTokenSetRevocation", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "name": "winnings", - "type": "uint256" - } - ], - "name": "WinningsRedemption", - "type": "event" - } - ], - "unlinked_binary": "0x606060405234156200000d57fe5b60405160808062001c2283398101604090815281516020830151918301516060909301519092905b838360025b600080600160a060020a038516158015906200005e5750600160a060020a03841615155b80156200006f575060028360ff1610155b15156200007c5760006000fd5b60008054600160a060020a03808816600160a060020a0319928316178355600180549188169190921617905591505b8260ff168260ff1610156200016957620000c462000194565b60405190819003906000f0801515620000d957fe5b905060038054806001018281620000f19190620001a5565b916000526020600020900160005b8154600160a060020a038086166101009390930a838102910219909116179091556040805191825260ff8516602083015280517fad24776dc347085865b6988e249c191fc22d9b31cf54cb62233c3c16be1736ee9350918290030190a15b600190910190620000ab565b5b505050505081811315156200017f5760006000fd5b600482905560058190555b50505050620001f6565b604051610a22806200120083390190565b815481835581811511620001cc57600083815260209020620001cc918101908301620001d2565b5b505050565b620001f391905b80821115620001ef5760008155600101620001d9565b5090565b90565b610ffa80620002066000396000f300606060405236156100e05763ffffffff60e060020a6000350416630537665d81146100e257806327793f87146100f457806328da850b14610116578063561cce0a1461012b57806369c19d4c146101515780636e5452fe146101c85780636fb1edcd146101f05780637dc0d1d0146102055780637dc8f086146102315780638abe59ea14610257578063a384d6ff14610286578063a871da91146102a8578063ad0b2bec146102ce578063b09ad8a0146102f0578063b2016bd414610312578063ccdf68f31461033e578063e96e595014610362578063f21a146814610384575bfe5b34156100ea57fe5b6100f26103ef565b005b34156100fc57fe5b61010461051b565b60408051918252519081900360200190f35b341561011e57fe5b6100f2600435610521565b005b341561013357fe5b61013b6106a4565b6040805160ff9092168252519081900360200190f35b341561015957fe5b61016d600160a060020a03600435166106a9565b60408051602080825283518183015283519192839290830191858101910280838382156101b5575b8051825260208311156101b557601f199092019160209182019101610195565b5050509050019250505060405180910390f35b34156101d057fe5b6101d86107bc565b6040805162ffffff9092168252519081900360200190f35b34156101f857fe5b6100f26004356107c3565b005b341561020d57fe5b61021561093f565b60408051600160a060020a039092168252519081900360200190f35b341561023957fe5b61013b61094e565b6040805160ff9092168252519081900360200190f35b341561025f57fe5b610215600435610955565b60408051600160a060020a039092168252519081900360200190f35b341561028e57fe5b610104610987565b60408051918252519081900360200190f35b34156102b057fe5b61013b61098d565b6040805160ff9092168252519081900360200190f35b34156102d657fe5b610104610992565b60408051918252519081900360200190f35b34156102f857fe5b610104610ed0565b60408051918252519081900360200190f35b341561031a57fe5b610215610ed6565b60408051600160a060020a039092168252519081900360200190f35b341561034657fe5b61034e610ee5565b604080519115158252519081900360200190f35b341561036a57fe5b610104610ef5565b60408051918252519081900360200190f35b341561038c57fe5b61016d610f41565b60408051602080825283518183015283519192839290830191858101910280838382156101b5575b8051825260208311156101b557601f199092019160209182019101610195565b5050509050019250505060405180910390f35b60015460a060020a900460ff1615801561046957506001546040805160006020918201819052825160e060020a63ccdf68f30281529251600160a060020a039094169363ccdf68f39360048082019493918390030190829087803b151561045257fe5b6102c65a03f1151561046057fe5b50506040515190505b15156104755760006000fd5b6001546040805160006020918201819052825160e060020a637e7e4b470281529251600160a060020a0390941693637e7e4b479360048082019493918390030190829087803b15156104c357fe5b6102c65a03f115156104d157fe5b505060405180516002556001805460a060020a60ff02191660a060020a1790557fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719150602090a15b565b60025481565b60008054604080516020908101849052815160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201879052925192909316926323b872dd926064808301939282900301818787803b151561058457fe5b6102c65a03f1151561059257fe5b505060405151151590506105a65760006000fd5b5060005b60035460ff82161015610660576003805460ff83169081106105c857fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663867904b433846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561064657fe5b6102c65a03f1151561065457fe5b5050505b6001016105aa565b604080518381529051600160a060020a033316917fad2a02292986148558019ae4abf172732228e32e131a91d3fa7e0cada61932c0919081900360200190a25b5050565b600181565b6106b1610faa565b600354604051600091908059106106c55750595b908082528060200260200182016040525b509150600090505b81518160ff1610156107b5576003805460ff83169081106106fb57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231846000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561077a57fe5b6102c65a03f1151561078857fe5b5050604051518351909150839060ff84169081106107a257fe5b602090810290910101525b6001016106de565b5b50919050565b620f424081565b60005b60035460ff8216101561087c576003805460ff83169081106107e457fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b151561086257fe5b6102c65a03f1151561087057fe5b5050505b6001016107c6565b60008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018890529251929093169363a9059cbb9360448082019492918390030190829087803b15156108d957fe5b6102c65a03f115156108e757fe5b505060405151151590506108fb5760006000fd5b604080518381529051600160a060020a033316917f7ac9271efd660c24459c447459e46f7366d2b4a692e572f108619d0d7273fcc5919081900360200190a25b5050565b600154600160a060020a031681565b6003545b90565b600380548290811061096357fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b60045481565b600081565b600060006000600060006000600160149054906101000a900460ff1615156109ba5760006000fd5b60045460025412156109cf5760009450610a0b565b60055460025413156109e657620f42409450610a0b565b6004546005540360045460025403620f424062ffffff1602811515610a0757fe5b0594505b5b60038054620f424087810362ffffff16965086900394506000908110610a2e57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610aad57fe5b6102c65a03f11515610abb57fe5b5050604051516003805491945091506001908110610ad557fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03166370a08231336000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610b5457fe5b6102c65a03f11515610b6257fe5b50506040805180516000602092830152825160e260020a6332292b2702815260048101879052602481018990529251909450620f4240935073__Math__________________________________9263c8a4ac9c926044808301939192829003018186803b1515610bce57fe5b6102c65a03f41515610bdc57fe5b50506040805180516000602092830152825160e260020a6332292b270281526004810187905260248101899052925173__Math__________________________________945063771602f7939192859263c8a4ac9c9260448083019392829003018186803b1515610c4957fe5b6102c65a03f41515610c5757fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610ca457fe5b6102c65a03f41515610cb257fe5b5050604051519050811515610cc357fe5b0495506003600060ff16815481101515610cd957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933846040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b1515610d5757fe5b6102c65a03f11515610d6557fe5b5050600380549091506001908110610d7957fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a031663eac449d933836040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050600060405180830381600087803b1515610df757fe5b6102c65a03f11515610e0557fe5b505060008054604080516020908101849052815160e060020a63a9059cbb028152600160a060020a033381166004830152602482018d9052925192909316945063a9059cbb936044808501949293928390030190829087803b1515610e6657fe5b6102c65a03f11515610e7457fe5b50506040515115159050610e885760006000fd5b604080518781529051600160a060020a033316917f2fe921bb50a459800ae7eae7c0124e9e875094a539eb7dc5b3f728017347e0fb919081900360200190a25b505050505090565b60055481565b600054600160a060020a031681565b60015460a060020a900460ff1681565b60005460015460045460055460408051606060020a600160a060020a03968716810282529490951693909302601485015260288401919091526048830152519081900360680190205b90565b610f49610faa565b6003805480602002602001604051908101604052809291908181526020018280548015610f9f57602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610f81575b505050505090505b90565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a7230582092f3b42b7b4e7234f86f4c744862059c70adf0815a36f04206ffc29f373635af00296060604052341561000c57fe5b5b60038054600160a060020a03191633600160a060020a03161790555b5b6109e9806100396000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461007f57806318160ddd146100b257806323b872dd146100d457806370a082311461010d578063867904b41461013b578063a9059cbb1461015c578063dd62ed3e1461018f578063e274fd24146101c3578063eac449d9146101ef575bfe5b341561008757fe5b61009e600160a060020a0360043516602435610210565b604080519115158252519081900360200190f35b34156100ba57fe5b6100c261027b565b60408051918252519081900360200190f35b34156100dc57fe5b61009e600160a060020a0360043581169060243516604435610282565b604080519115158252519081900360200190f35b341561011557fe5b6100c2600160a060020a03600435166104c8565b60408051918252519081900360200190f35b341561014357fe5b61015a600160a060020a03600435166024356104e7565b005b341561016457fe5b61009e600160a060020a0360043516602435610660565b604080519115158252519081900360200190f35b341561019757fe5b6100c2600160a060020a03600435811690602435166107e8565b60408051918252519081900360200190f35b34156101cb57fe5b6101d3610815565b60408051600160a060020a039092168252519081900360200190f35b34156101f757fe5b61015a600160a060020a0360043516602435610824565b005b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156102f657fe5b6102c65a03f4151561030457fe5b505060405151159050806103af5750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561039757fe5b6102c65a03f415156103a557fe5b5050604051511590505b806104425750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561042a57fe5b6102c65a03f4151561043857fe5b5050604051511590505b1561044f575060006104c1565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b60035433600160a060020a039081169116146105035760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63771602f70281526004810193909352602483018490525173__Math__________________________________9263771602f7926044808301939192829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63771602f7028152600481019290925260248201859052915173__Math__________________________________935063771602f792604480840193919291829003018186803b151561060657fe5b6102c65a03f4151561061457fe5b50506040805180516002558381529051600160a060020a03851692507f9cb9c14f7bc76e3a89b796b091850526236115352a198b1e472f00e91376bbcb9181900360200190a25b5b5050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156106d457fe5b6102c65a03f415156106e257fe5b5050604051511590508061077e5750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561076657fe5b6102c65a03f4151561077457fe5b5050604051511590505b1561078b57506000610275565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061099e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b600354600160a060020a031681565b60035433600160a060020a039081169116146108405760006000fd5b600160a060020a038216600090815260208181526040808320548151830193909352805160e060020a63b67d77c50281526004810193909352602483018490525173__Math__________________________________9263b67d77c5926044808301939192829003018186803b15156108b557fe5b6102c65a03f415156108c357fe5b5050604080518051600160a060020a038616600090815260208181528482209290925560025492820152825160e060020a63b67d77c5028152600481019290925260248201859052915173__Math__________________________________935063b67d77c592604480840193919291829003018186803b151561094357fe5b6102c65a03f4151561095157fe5b50506040805180516002558381529051600160a060020a03851692507ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e99181900360200190a25b5b50505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820d202a0e0b7a9dd2ab5beebb024e1f21f8d24d697bcc5090a839f82426ae8aa680029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499198461048 -} \ No newline at end of file diff --git a/build/contracts/SignedMessageOracle.json b/build/contracts/SignedMessageOracle.json deleted file mode 100644 index 5dc97cc..0000000 --- a/build/contracts/SignedMessageOracle.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "contract_name": "SignedMessageOracle", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "signer", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "outcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "newSigner", - "type": "address" - }, - { - "name": "_nonce", - "type": "uint256" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" - } - ], - "name": "replaceSigner", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "descriptionHash", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_outcome", - "type": "int256" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" - } - ], - "name": "setOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_descriptionHash", - "type": "bytes32" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "newSigner", - "type": "address" - } - ], - "name": "SignerReplacement", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeAssignment", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b6040516080806104f883398101604090815281516020830151918301516060909301519092905b60408051600081815260208083018452918301819052825187815260ff87168184015280840186905260608101859052925160019360808082019493601f198401939283900390910191908661646e5a03f1151561008d57fe5b5050604051601f19015160008054600160a060020a031916600160a060020a0390921691909117905560018490555b505050505b610428806100d06000396000f300606060405236156100725763ffffffff60e060020a600035041663238ac933811461007457806327793f87146100a05780635011e399146100c25780637e7e4b47146100ef57806385dcee9314610111578063c65fb38014610133578063ccdf68f314610157578063d9bf31871461017b575bfe5b341561007c57fe5b61008461019c565b60408051600160a060020a039092168252519081900360200190f35b34156100a857fe5b6100b06101ab565b60408051918252519081900360200190f35b34156100ca57fe5b6100ed600160a060020a036004351660243560ff604435166064356084356101b1565b005b34156100f757fe5b6100b06102eb565b60408051918252519081900360200190f35b341561011957fe5b6100b06102f2565b60408051918252519081900360200190f35b341561013b57fe5b6101436102f8565b604080519115158252519081900360200190f35b341561015f57fe5b610143610301565b604080519115158252519081900360200190f35b341561018357fe5b6100ed60043560ff6024351660443560643561030b565b005b600054600160a060020a031681565b60045481565b60005433600160a060020a039081169116146101cd5760006000fd5b60035460ff161580156101e1575060025484115b801561028c57506001805460408051918252606060020a600160a060020a0389160260208084019190915260348301889052815192839003605401832060008481528483018452938301849052825190815260ff8816818301528083018790526060810186905291516080808401949293601f198301939083900390910191908661646e5a03f1151561027057fe5b5050604051601f190151600054600160a060020a039081169116145b15156102985760006000fd5b600284905560008054600160a060020a031916600160a060020a038716908117825560405190917fdb3046afd053bee6427d6355ee95671fceb37ee6b944866f9ea86eaa213dac6891a25b5b5050505050565b6004545b90565b60015481565b60035460ff1681565b60035460ff165b90565b60035460ff161580156103a45750600180546040805191825260208083018890528151928390038201832060008481528483018452938301849052825190815260ff8816818301528083018790526060810186905291516080808401949293601f198301939083900390910191908661646e5a03f1151561038857fe5b5050604051601f190151600054600160a060020a039081169116145b15156103b05760006000fd5b6003805460ff1916600117905560048490556040805185815290517fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719181900360200190a15b505050505600a165627a7a72305820139539855178467c0247e6a8ed755dff022319ff038a1026c3839644b39660dc0029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/SignedMessageOracleFactory.json b/build/contracts/SignedMessageOracleFactory.json deleted file mode 100644 index 81f4de2..0000000 --- a/build/contracts/SignedMessageOracleFactory.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "contract_name": "SignedMessageOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "descriptionHash", - "type": "bytes32" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" - } - ], - "name": "createSignedMessageOracle", - "outputs": [ - { - "name": "signedMessageOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "signedMessageOracle", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - } - ], - "name": "SignedMessageOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b61068a8061001c6000396000f300606060405263ffffffff60e060020a600035041663655d08628114610021575bfe5b341561002957fe5b61004060043560ff6024351660443560643561005c565b60408051600160a060020a039092168252519081900360200190f35b600060008585858561006c610156565b93845260ff909216602084015260408084019190915260608301919091525190819003608001906000f080151561009f57fe5b6040805160008181526020808301845291830181905282518a815260ff8a1681840152808401899052606081018890529251939550600193608080850194601f198301939083900390910191908661646e5a03f115156100fb57fe5b505060408051601f19810151600160a060020a038581168352808216602084015283519194503316927f7be438e4a33b832fcd7adccf30167ee27bd3e693a5ff6daf7fcf98fb2163b7a2928290030190a25b50949350505050565b6040516104f8806101678339019056006060604052341561000c57fe5b6040516080806104f883398101604090815281516020830151918301516060909301519092905b60408051600081815260208083018452918301819052825187815260ff87168184015280840186905260608101859052925160019360808082019493601f198401939283900390910191908661646e5a03f1151561008d57fe5b5050604051601f19015160008054600160a060020a031916600160a060020a0390921691909117905560018490555b505050505b610428806100d06000396000f300606060405236156100725763ffffffff60e060020a600035041663238ac933811461007457806327793f87146100a05780635011e399146100c25780637e7e4b47146100ef57806385dcee9314610111578063c65fb38014610133578063ccdf68f314610157578063d9bf31871461017b575bfe5b341561007c57fe5b61008461019c565b60408051600160a060020a039092168252519081900360200190f35b34156100a857fe5b6100b06101ab565b60408051918252519081900360200190f35b34156100ca57fe5b6100ed600160a060020a036004351660243560ff604435166064356084356101b1565b005b34156100f757fe5b6100b06102eb565b60408051918252519081900360200190f35b341561011957fe5b6100b06102f2565b60408051918252519081900360200190f35b341561013b57fe5b6101436102f8565b604080519115158252519081900360200190f35b341561015f57fe5b610143610301565b604080519115158252519081900360200190f35b341561018357fe5b6100ed60043560ff6024351660443560643561030b565b005b600054600160a060020a031681565b60045481565b60005433600160a060020a039081169116146101cd5760006000fd5b60035460ff161580156101e1575060025484115b801561028c57506001805460408051918252606060020a600160a060020a0389160260208084019190915260348301889052815192839003605401832060008481528483018452938301849052825190815260ff8816818301528083018790526060810186905291516080808401949293601f198301939083900390910191908661646e5a03f1151561027057fe5b5050604051601f190151600054600160a060020a039081169116145b15156102985760006000fd5b600284905560008054600160a060020a031916600160a060020a038716908117825560405190917fdb3046afd053bee6427d6355ee95671fceb37ee6b944866f9ea86eaa213dac6891a25b5b5050505050565b6004545b90565b60015481565b60035460ff1681565b60035460ff165b90565b60035460ff161580156103a45750600180546040805191825260208083018890528151928390038201832060008481528483018452938301849052825190815260ff8816818301528083018790526060810186905291516080808401949293601f198301939083900390910191908661646e5a03f1151561038857fe5b5050604051601f190151600054600160a060020a039081169116145b15156103b05760006000fd5b6003805460ff1916600117905560048490556040805185815290517fb1aaa9f4484acc283375c8e495a44766e4026170797dc9280b4ae2ab5632fb719181900360200190a15b505050505600a165627a7a72305820139539855178467c0247e6a8ed755dff022319ff038a1026c3839644b39660dc0029a165627a7a72305820895c244b372aaf22ce8ee4a08a8aabe3a92d181ab134587808d09ae921011d400029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/StandardMarket.json b/build/contracts/StandardMarket.json deleted file mode 100644 index d00e82d..0000000 --- a/build/contracts/StandardMarket.json +++ /dev/null @@ -1,394 +0,0 @@ -{ - "contract_name": "StandardMarket", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "creator", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "marketMaker", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "minProfit", - "type": "uint256" - } - ], - "name": "shortSell", - "outputs": [ - { - "name": "cost", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "close", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "minProfit", - "type": "uint256" - } - ], - "name": "sell", - "outputs": [ - { - "name": "profit", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "withdrawFees", - "outputs": [ - { - "name": "fees", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "createdAtBlock", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "netOutcomeTokensSold", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "outcomeTokenCost", - "type": "uint256" - } - ], - "name": "calcMarketFee", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "stage", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_funding", - "type": "uint256" - } - ], - "name": "fund", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "funding", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "fee", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "eventContract", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "name": "maxCost", - "type": "uint256" - } - ], - "name": "buy", - "outputs": [ - { - "name": "cost", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "FEE_RANGE", - "outputs": [ - { - "name": "", - "type": "uint24" - } - ], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_creator", - "type": "address" - }, - { - "name": "_eventContract", - "type": "address" - }, - { - "name": "_marketMaker", - "type": "address" - }, - { - "name": "_fee", - "type": "uint24" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "funding", - "type": "uint256" - } - ], - "name": "MarketFunding", - "type": "event" - }, - { - "anonymous": false, - "inputs": [], - "name": "MarketClosing", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "fees", - "type": "uint256" - } - ], - "name": "FeeWithdrawal", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "cost", - "type": "uint256" - } - ], - "name": "OutcomeTokenPurchase", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "profit", - "type": "uint256" - } - ], - "name": "OutcomeTokenSale", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "buyer", - "type": "address" - }, - { - "indexed": false, - "name": "outcomeTokenIndex", - "type": "uint8" - }, - { - "indexed": false, - "name": "outcomeTokenCount", - "type": "uint256" - }, - { - "indexed": false, - "name": "cost", - "type": "uint256" - } - ], - "name": "OutcomeTokenShortSale", - "type": "event" - } - ], - "unlinked_binary": "0x606060405234156200000d57fe5b60405160808062001e8283398101604090815281516020830151918301516060909301519092905b600160a060020a03831615801590620000565750600160a060020a03821615155b80156200006a5750620f424062ffffff8216105b1515620000775760006000fd5b60008054600160a060020a03808716600160a060020a031992831617835543600155600280548783169316929092179182905560408051602090810185905281517f7dc8f08600000000000000000000000000000000000000000000000000000000815291519390921693637dc8f08693600480840194939192918390030190829087803b15156200010557fe5b6102c65a03f115156200011457fe5b5050604051805160ff1691508059106200012b5750595b908082528060200260200182016040525b5080516200015391600591602090910190620001b9565b506003805460a060020a62ffffff0219167401000000000000000000000000000000000000000062ffffff84160217600160a060020a031916600160a060020a038416179055600680546000919060ff19166001835b02179055505b505050506200022e565b828054828255906000526020600020908101928215620001f7579160200282015b82811115620001f7578251825591602001919060010190620001da565b5b50620002069291506200020a565b5090565b6200022b91905b8082111562000206576000815560010162000211565b5090565b90565b611c44806200023e6000396000f300606060405236156100ca5763ffffffff60e060020a60003504166302d05d3f81146100cc5780631f21f9af146100f857806328c05d321461012457806343d726d61461015257806346280a8014610164578063476343ee1461019257806359acb42c146101b4578063a157979c146101d6578063b0011509146101fb578063c040e6b814610220578063ca1d209d14610254578063cb4c86b714610269578063ddca3f431461028b578063e274fd24146102b3578063f6d956df146102df578063fbde47f61461030d575bfe5b34156100d457fe5b6100dc610335565b60408051600160a060020a039092168252519081900360200190f35b341561010057fe5b6100dc610344565b60408051600160a060020a039092168252519081900360200190f35b341561012c57fe5b61014060ff60043516602435604435610353565b60408051918252519081900360200190f35b341561015a57fe5b6101626109be565b005b341561016c57fe5b61014060ff60043516602435604435610c9f565b60408051918252519081900360200190f35b341561019a57fe5b610140611150565b60408051918252519081900360200190f35b34156101bc57fe5b610140611360565b60408051918252519081900360200190f35b34156101de57fe5b610140600435611366565b60408051918252519081900360200190f35b341561020357fe5b610140600435611389565b60408051918252519081900360200190f35b341561022857fe5b6102306113ac565b6040518082600281111561024057fe5b60ff16815260200191505060405180910390f35b341561025c57fe5b6101626004356113b5565b005b341561027157fe5b610140611668565b60408051918252519081900360200190f35b341561029357fe5b61029b61166e565b6040805162ffffff9092168252519081900360200190f35b34156102bb57fe5b6100dc611680565b60408051600160a060020a039092168252519081900360200190f35b34156102e757fe5b61014060ff6004351660243560443561168f565b60408051918252519081900360200190f35b341561031557fe5b61029b611c11565b6040805162ffffff9092168252519081900360200190f35b600054600160a060020a031681565b600354600160a060020a031681565b6000600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156103b657fe5b6102c65a03f115156103c457fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018d905294519490921694506323b872dd93606480840194939192918390030190829087803b151561042e57fe5b6102c65a03f1151561043c57fe5b5050604051519050801561052157506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561049957fe5b6102c65a03f115156104a757fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018d9052945191909216945063095ea7b39360448082019493918390030190829087803b151561050a57fe5b6102c65a03f1151561051857fe5b50506040515190505b151561052d5760006000fd5b6002546040805160e060020a6328da850b028152600481018990529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b151561057957fe5b6102c65a03f1151561058757fe5b50506002546040805160006020918201819052825160e160020a63455f2cf502815260ff8d1660048201529251600160a060020a039094169450638abe59ea936024808501949192918390030190829087803b15156105e257fe5b6102c65a03f115156105f057fe5b50505060405180519050600160a060020a031663095ea7b330886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561066157fe5b6102c65a03f1151561066f57fe5b50506040805160006020918201819052825160e760020a628c501502815260ff8c166004820152602481018b9052604481018a90529251600160a060020a03301694506346280a809360648082019493918390030190829087803b15156106d257fe5b6102c65a03f115156106e057fe5b505060408051805160025460006020938401819052845160e160020a633ee478430281529451838d039a50929850600160a060020a039091169450637dc8f086936004808201949392918390030190829087803b151561073c57fe5b6102c65a03f1151561074a57fe5b505060405151925060009150505b8160ff168160ff1610156108755760ff8181169088161461086b576002546040805160006020918201819052825160e160020a63455f2cf502815260ff861660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b15156107ca57fe5b6102c65a03f115156107d857fe5b50505060405180519050600160a060020a031663a9059cbb33886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561084957fe5b6102c65a03f1151561085757fe5b5050604051511515905061086b5760006000fd5b5b5b600101610758565b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b15156108c357fe5b6102c65a03f115156108d157fe5b50505060405180519050600160a060020a031663a9059cbb33856000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561094257fe5b6102c65a03f1151561095057fe5b505060405151151590506109645760006000fd5b6040805160ff89168152602081018890528082018690529051600160a060020a033316917f1dbdc4ff4d51949738d56e120b2be4edecc55d8d2150f1616ec5802abaae3f88919081900360600190a25b5050509392505050565b60008054819033600160a060020a039081169116146109dd5760006000fd5b6001805b60065460ff1660028111156109f257fe5b146109fd5760006000fd5b6002546040805160006020918201819052825160e160020a633ee478430281529251600160a060020a0390941693637dc8f0869360048082019493918390030190829087803b1515610a4b57fe5b6102c65a03f11515610a5957fe5b505060405151935060009250505b8260ff168260ff161015610c59576002546040805160006020918201819052825160e160020a63455f2cf502815260ff871660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b1515610acc57fe5b6102c65a03f11515610ada57fe5b5050604080518051600080546002546020948501839052855160e160020a63455f2cf502815260ff8a1660048201529551600160a060020a03948516975063a9059cbb96928516959190941693638abe59ea936024808501948390030190829087803b1515610b4557fe5b6102c65a03f11515610b5357fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610bbc57fe5b6102c65a03f11515610bca57fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610c2b57fe5b6102c65a03f11515610c3957fe5b50506040515115159050610c4d5760006000fd5b5b600190910190610a67565b600680546002919060ff19166001835b02179055506040517fe7d85885f81486e8f4c99e50e056745493861b8b5d4f973dcf0c3c0f74a25e0790600090a15b5b505b5050565b600080806001805b60065460ff166002811115610cb857fe5b14610cc35760006000fd5b6003546040805160006020918201819052825160e060020a634091c6a9028152600160a060020a03308116600483015260ff8d166024830152604482018c905293519390941693634091c6a9936064808301949391928390030190829087803b1515610d2b57fe5b6102c65a03f11515610d3957fe5b5050604051519350610d4c905083611389565b91508273__Math__________________________________63b67d77c59091846000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610daf57fe5b6102c65a03f41515610dbd57fe5b505060405151945050600084118015610dd65750848410155b1515610de25760006000fd5b6002546040805160006020918201819052825160e160020a63455f2cf502815260ff8c1660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b1515610e3957fe5b6102c65a03f11515610e4757fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018d905294519490921694506323b872dd93606480840194939192918390030190829087803b1515610eb157fe5b6102c65a03f11515610ebf57fe5b50506040515115159050610ed35760006000fd5b6002546040805160e060020a636fb1edcd028152600481018690529051600160a060020a0390921691636fb1edcd9160248082019260009290919082900301818387803b1515610f1f57fe5b6102c65a03f11515610f2d57fe5b505050600260009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610f8b57fe5b6102c65a03f11515610f9957fe5b50505060405180519050600160a060020a031663a9059cbb33866000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561100a57fe5b6102c65a03f1151561101857fe5b5050604051511515905061102c5760006000fd5b600086121561103b5760006000fd5b6005805460ff891690811061104c57fe5b906000526020600020900160005b505473__Math__________________________________63adefc37b9091886000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15156110bc57fe5b6102c65a03f415156110ca57fe5b505060405151600580549192509060ff8a169081106110e557fe5b906000526020600020900160005b50556040805160ff89168152602081018890528082018690529051600160a060020a033316917fa1bdc4100ecd2a15e29762da89ed368fe21718fbaf0256ff5c6e81b203aca644919081900360600190a25b5b5050509392505050565b6000805433600160a060020a0390811691161461116d5760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b15156111bb57fe5b6102c65a03f115156111c957fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561123257fe5b6102c65a03f1151561124057fe5b505060408051805160025460006020938401819052845160e260020a632c805af50281529451929650600160a060020a03909116945063b2016bd4936004808201949392918390030190829087803b151561129757fe5b6102c65a03f115156112a557fe5b5050604080518051600080546020938401829052845160e060020a63a9059cbb028152600160a060020a0391821660048201526024810188905294519216945063a9059cbb936044808201949392918390030190829087803b151561130657fe5b6102c65a03f1151561131457fe5b505060405151151590506113285760006000fd5b6040805182815290517f706d7f48c702007c2fb0881cea5759732e64f52faee427d5ab030787cfb7d7879181900360200190a15b5b90565b60015481565b600580548290811061137457fe5b906000526020600020900160005b5054905081565b600354600090620f42409060a060020a900462ffffff1683025b0490505b919050565b60065460ff1681565b60005433600160a060020a039081169116146113d15760006000fd5b6000805b60065460ff1660028111156113e657fe5b146113f15760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561143f57fe5b6102c65a03f1151561144d57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a03338116600483015230811660248301526044820189905294519490921694506323b872dd93606480840194939192918390030190829087803b15156114b757fe5b6102c65a03f115156114c557fe5b505060405151905080156115aa57506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561152257fe5b6102c65a03f1151561153057fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a03928316600482015260248101899052945191909216945063095ea7b39360448082019493918390030190829087803b151561159357fe5b6102c65a03f115156115a157fe5b50506040515190505b15156115b65760006000fd5b6002546040805160e060020a6328da850b028152600481018590529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b151561160257fe5b6102c65a03f1151561161057fe5b5050506004829055600680546001919060ff191682805b021790555060045460408051918252517f8a2fe22ce705a4ac9c189969cef327affbdc477afdae4ae274c2f8ad021f91639181900360200190a15b5b505b50565b60045481565b60035460a060020a900462ffffff1681565b600254600160a060020a031681565b600080806001805b60065460ff1660028111156116a857fe5b146116b35760006000fd5b6003546040805160006020918201819052825160e060020a63bd8ff817028152600160a060020a03308116600483015260ff8d166024830152604482018c90529351939094169363bd8ff817936064808301949391928390030190829087803b151561171b57fe5b6102c65a03f1151561172957fe5b505060405151935061173c905083611389565b91508273__Math__________________________________63771602f79091846000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561179f57fe5b6102c65a03f415156117ad57fe5b5050604051519450506000841180156117c65750848411155b15156117d25760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561182057fe5b6102c65a03f1151561182e57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018b905294519490921694506323b872dd93606480840194939192918390030190829087803b151561189857fe5b6102c65a03f115156118a657fe5b5050604051519050801561198b57506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561190357fe5b6102c65a03f1151561191157fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018a9052945191909216945063095ea7b39360448082019493918390030190829087803b151561197457fe5b6102c65a03f1151561198257fe5b50506040515190505b15156119975760006000fd5b6002546040805160e060020a6328da850b028152600481018690529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b15156119e357fe5b6102c65a03f115156119f157fe5b50506002546040805160006020918201819052825160e160020a63455f2cf502815260ff8d1660048201529251600160a060020a039094169450638abe59ea936024808501949192918390030190829087803b1515611a4c57fe5b6102c65a03f11515611a5a57fe5b50505060405180519050600160a060020a031663a9059cbb33886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515611acb57fe5b6102c65a03f11515611ad957fe5b50506040515115159050611aed5760006000fd5b6000861215611afc5760006000fd5b6005805460ff8916908110611b0d57fe5b906000526020600020900160005b505473__Math__________________________________63a5f3c23b9091886000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515611b7d57fe5b6102c65a03f41515611b8b57fe5b505060405151600580549192509060ff8a16908110611ba657fe5b906000526020600020900160005b50556040805160ff89168152602081018890528082018690529051600160a060020a033316917ff6f5e7e0f5d8ae3d5137e61e002f8f51821b64edaaadee43208156cbd5a2f163919081900360600190a25b5b5050509392505050565b620f4240815600a165627a7a723058209f35c152d419ac7a955ffc3e3ad007fbe824c7efa8c144c42b323a7007f7bdac0029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373991 -} \ No newline at end of file diff --git a/build/contracts/StandardMarketFactory.json b/build/contracts/StandardMarketFactory.json deleted file mode 100644 index f3554f8..0000000 --- a/build/contracts/StandardMarketFactory.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "contract_name": "StandardMarketFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "eventContract", - "type": "address" - }, - { - "name": "marketMaker", - "type": "address" - }, - { - "name": "fee", - "type": "uint24" - } - ], - "name": "createMarket", - "outputs": [ - { - "name": "market", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "market", - "type": "address" - }, - { - "indexed": false, - "name": "eventContract", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - } - ], - "name": "MarketCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b611fdd8061001c6000396000f300606060405263ffffffff60e060020a6000350416637abeb6a08114610021575bfe5b341561002957fe5b61004b600160a060020a036004358116906024351662ffffff60443516610067565b60408051600160a060020a039092168252519081900360200190f35b60003384848461007561011f565b600160a060020a0394851681529284166020840152921660408083019190915262ffffff9092166060820152905190819003608001906000f08015156100b757fe5b60408051600160a060020a03808416825287811660208301528681168284015262ffffff8616606083015291519293503391909116917fc9a97f5cb9f16e2d0431bd2aba96bf6fd6169026a7c7172865e5db48de5fb7739181900360800190a25b9392505050565b604051611e8280610130833901905600606060405234156200000d57fe5b60405160808062001e8283398101604090815281516020830151918301516060909301519092905b600160a060020a03831615801590620000565750600160a060020a03821615155b80156200006a5750620f424062ffffff8216105b1515620000775760006000fd5b60008054600160a060020a03808716600160a060020a031992831617835543600155600280548783169316929092179182905560408051602090810185905281517f7dc8f08600000000000000000000000000000000000000000000000000000000815291519390921693637dc8f08693600480840194939192918390030190829087803b15156200010557fe5b6102c65a03f115156200011457fe5b5050604051805160ff1691508059106200012b5750595b908082528060200260200182016040525b5080516200015391600591602090910190620001b9565b506003805460a060020a62ffffff0219167401000000000000000000000000000000000000000062ffffff84160217600160a060020a031916600160a060020a038416179055600680546000919060ff19166001835b02179055505b505050506200022e565b828054828255906000526020600020908101928215620001f7579160200282015b82811115620001f7578251825591602001919060010190620001da565b5b50620002069291506200020a565b5090565b6200022b91905b8082111562000206576000815560010162000211565b5090565b90565b611c44806200023e6000396000f300606060405236156100ca5763ffffffff60e060020a60003504166302d05d3f81146100cc5780631f21f9af146100f857806328c05d321461012457806343d726d61461015257806346280a8014610164578063476343ee1461019257806359acb42c146101b4578063a157979c146101d6578063b0011509146101fb578063c040e6b814610220578063ca1d209d14610254578063cb4c86b714610269578063ddca3f431461028b578063e274fd24146102b3578063f6d956df146102df578063fbde47f61461030d575bfe5b34156100d457fe5b6100dc610335565b60408051600160a060020a039092168252519081900360200190f35b341561010057fe5b6100dc610344565b60408051600160a060020a039092168252519081900360200190f35b341561012c57fe5b61014060ff60043516602435604435610353565b60408051918252519081900360200190f35b341561015a57fe5b6101626109be565b005b341561016c57fe5b61014060ff60043516602435604435610c9f565b60408051918252519081900360200190f35b341561019a57fe5b610140611150565b60408051918252519081900360200190f35b34156101bc57fe5b610140611360565b60408051918252519081900360200190f35b34156101de57fe5b610140600435611366565b60408051918252519081900360200190f35b341561020357fe5b610140600435611389565b60408051918252519081900360200190f35b341561022857fe5b6102306113ac565b6040518082600281111561024057fe5b60ff16815260200191505060405180910390f35b341561025c57fe5b6101626004356113b5565b005b341561027157fe5b610140611668565b60408051918252519081900360200190f35b341561029357fe5b61029b61166e565b6040805162ffffff9092168252519081900360200190f35b34156102bb57fe5b6100dc611680565b60408051600160a060020a039092168252519081900360200190f35b34156102e757fe5b61014060ff6004351660243560443561168f565b60408051918252519081900360200190f35b341561031557fe5b61029b611c11565b6040805162ffffff9092168252519081900360200190f35b600054600160a060020a031681565b600354600160a060020a031681565b6000600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b15156103b657fe5b6102c65a03f115156103c457fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018d905294519490921694506323b872dd93606480840194939192918390030190829087803b151561042e57fe5b6102c65a03f1151561043c57fe5b5050604051519050801561052157506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561049957fe5b6102c65a03f115156104a757fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018d9052945191909216945063095ea7b39360448082019493918390030190829087803b151561050a57fe5b6102c65a03f1151561051857fe5b50506040515190505b151561052d5760006000fd5b6002546040805160e060020a6328da850b028152600481018990529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b151561057957fe5b6102c65a03f1151561058757fe5b50506002546040805160006020918201819052825160e160020a63455f2cf502815260ff8d1660048201529251600160a060020a039094169450638abe59ea936024808501949192918390030190829087803b15156105e257fe5b6102c65a03f115156105f057fe5b50505060405180519050600160a060020a031663095ea7b330886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561066157fe5b6102c65a03f1151561066f57fe5b50506040805160006020918201819052825160e760020a628c501502815260ff8c166004820152602481018b9052604481018a90529251600160a060020a03301694506346280a809360648082019493918390030190829087803b15156106d257fe5b6102c65a03f115156106e057fe5b505060408051805160025460006020938401819052845160e160020a633ee478430281529451838d039a50929850600160a060020a039091169450637dc8f086936004808201949392918390030190829087803b151561073c57fe5b6102c65a03f1151561074a57fe5b505060405151925060009150505b8160ff168160ff1610156108755760ff8181169088161461086b576002546040805160006020918201819052825160e160020a63455f2cf502815260ff861660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b15156107ca57fe5b6102c65a03f115156107d857fe5b50505060405180519050600160a060020a031663a9059cbb33886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561084957fe5b6102c65a03f1151561085757fe5b5050604051511515905061086b5760006000fd5b5b5b600101610758565b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b15156108c357fe5b6102c65a03f115156108d157fe5b50505060405180519050600160a060020a031663a9059cbb33856000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561094257fe5b6102c65a03f1151561095057fe5b505060405151151590506109645760006000fd5b6040805160ff89168152602081018890528082018690529051600160a060020a033316917f1dbdc4ff4d51949738d56e120b2be4edecc55d8d2150f1616ec5802abaae3f88919081900360600190a25b5050509392505050565b60008054819033600160a060020a039081169116146109dd5760006000fd5b6001805b60065460ff1660028111156109f257fe5b146109fd5760006000fd5b6002546040805160006020918201819052825160e160020a633ee478430281529251600160a060020a0390941693637dc8f0869360048082019493918390030190829087803b1515610a4b57fe5b6102c65a03f11515610a5957fe5b505060405151935060009250505b8260ff168260ff161015610c59576002546040805160006020918201819052825160e160020a63455f2cf502815260ff871660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b1515610acc57fe5b6102c65a03f11515610ada57fe5b5050604080518051600080546002546020948501839052855160e160020a63455f2cf502815260ff8a1660048201529551600160a060020a03948516975063a9059cbb96928516959190941693638abe59ea936024808501948390030190829087803b1515610b4557fe5b6102c65a03f11515610b5357fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515610bbc57fe5b6102c65a03f11515610bca57fe5b505050604051805190506000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515610c2b57fe5b6102c65a03f11515610c3957fe5b50506040515115159050610c4d5760006000fd5b5b600190910190610a67565b600680546002919060ff19166001835b02179055506040517fe7d85885f81486e8f4c99e50e056745493861b8b5d4f973dcf0c3c0f74a25e0790600090a15b5b505b5050565b600080806001805b60065460ff166002811115610cb857fe5b14610cc35760006000fd5b6003546040805160006020918201819052825160e060020a634091c6a9028152600160a060020a03308116600483015260ff8d166024830152604482018c905293519390941693634091c6a9936064808301949391928390030190829087803b1515610d2b57fe5b6102c65a03f11515610d3957fe5b5050604051519350610d4c905083611389565b91508273__Math__________________________________63b67d77c59091846000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515610daf57fe5b6102c65a03f41515610dbd57fe5b505060405151945050600084118015610dd65750848410155b1515610de25760006000fd5b6002546040805160006020918201819052825160e160020a63455f2cf502815260ff8c1660048201529251600160a060020a0390941693638abe59ea9360248082019493918390030190829087803b1515610e3957fe5b6102c65a03f11515610e4757fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018d905294519490921694506323b872dd93606480840194939192918390030190829087803b1515610eb157fe5b6102c65a03f11515610ebf57fe5b50506040515115159050610ed35760006000fd5b6002546040805160e060020a636fb1edcd028152600481018690529051600160a060020a0390921691636fb1edcd9160248082019260009290919082900301818387803b1515610f1f57fe5b6102c65a03f11515610f2d57fe5b505050600260009054906101000a9004600160a060020a0316600160a060020a031663b2016bd46000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b1515610f8b57fe5b6102c65a03f11515610f9957fe5b50505060405180519050600160a060020a031663a9059cbb33866000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b151561100a57fe5b6102c65a03f1151561101857fe5b5050604051511515905061102c5760006000fd5b600086121561103b5760006000fd5b6005805460ff891690811061104c57fe5b906000526020600020900160005b505473__Math__________________________________63adefc37b9091886000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15156110bc57fe5b6102c65a03f415156110ca57fe5b505060405151600580549192509060ff8a169081106110e557fe5b906000526020600020900160005b50556040805160ff89168152602081018890528082018690529051600160a060020a033316917fa1bdc4100ecd2a15e29762da89ed368fe21718fbaf0256ff5c6e81b203aca644919081900360600190a25b5b5050509392505050565b6000805433600160a060020a0390811691161461116d5760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b15156111bb57fe5b6102c65a03f115156111c957fe5b50505060405180519050600160a060020a03166370a08231306000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b151561123257fe5b6102c65a03f1151561124057fe5b505060408051805160025460006020938401819052845160e260020a632c805af50281529451929650600160a060020a03909116945063b2016bd4936004808201949392918390030190829087803b151561129757fe5b6102c65a03f115156112a557fe5b5050604080518051600080546020938401829052845160e060020a63a9059cbb028152600160a060020a0391821660048201526024810188905294519216945063a9059cbb936044808201949392918390030190829087803b151561130657fe5b6102c65a03f1151561131457fe5b505060405151151590506113285760006000fd5b6040805182815290517f706d7f48c702007c2fb0881cea5759732e64f52faee427d5ab030787cfb7d7879181900360200190a15b5b90565b60015481565b600580548290811061137457fe5b906000526020600020900160005b5054905081565b600354600090620f42409060a060020a900462ffffff1683025b0490505b919050565b60065460ff1681565b60005433600160a060020a039081169116146113d15760006000fd5b6000805b60065460ff1660028111156113e657fe5b146113f15760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561143f57fe5b6102c65a03f1151561144d57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a03338116600483015230811660248301526044820189905294519490921694506323b872dd93606480840194939192918390030190829087803b15156114b757fe5b6102c65a03f115156114c557fe5b505060405151905080156115aa57506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561152257fe5b6102c65a03f1151561153057fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a03928316600482015260248101899052945191909216945063095ea7b39360448082019493918390030190829087803b151561159357fe5b6102c65a03f115156115a157fe5b50506040515190505b15156115b65760006000fd5b6002546040805160e060020a6328da850b028152600481018590529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b151561160257fe5b6102c65a03f1151561161057fe5b5050506004829055600680546001919060ff191682805b021790555060045460408051918252517f8a2fe22ce705a4ac9c189969cef327affbdc477afdae4ae274c2f8ad021f91639181900360200190a15b5b505b50565b60045481565b60035460a060020a900462ffffff1681565b600254600160a060020a031681565b600080806001805b60065460ff1660028111156116a857fe5b146116b35760006000fd5b6003546040805160006020918201819052825160e060020a63bd8ff817028152600160a060020a03308116600483015260ff8d166024830152604482018c90529351939094169363bd8ff817936064808301949391928390030190829087803b151561171b57fe5b6102c65a03f1151561172957fe5b505060405151935061173c905083611389565b91508273__Math__________________________________63771602f79091846000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561179f57fe5b6102c65a03f415156117ad57fe5b5050604051519450506000841180156117c65750848411155b15156117d25760006000fd5b6002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561182057fe5b6102c65a03f1151561182e57fe5b505060408051805160006020928301819052835160e060020a6323b872dd028152600160a060020a0333811660048301523081166024830152604482018b905294519490921694506323b872dd93606480840194939192918390030190829087803b151561189857fe5b6102c65a03f115156118a657fe5b5050604051519050801561198b57506002546040805160006020918201819052825160e260020a632c805af50281529251600160a060020a039094169363b2016bd49360048082019493918390030190829087803b151561190357fe5b6102c65a03f1151561191157fe5b505060408051805160025460006020938401819052845160e060020a63095ea7b3028152600160a060020a039283166004820152602481018a9052945191909216945063095ea7b39360448082019493918390030190829087803b151561197457fe5b6102c65a03f1151561198257fe5b50506040515190505b15156119975760006000fd5b6002546040805160e060020a6328da850b028152600481018690529051600160a060020a03909216916328da850b9160248082019260009290919082900301818387803b15156119e357fe5b6102c65a03f115156119f157fe5b50506002546040805160006020918201819052825160e160020a63455f2cf502815260ff8d1660048201529251600160a060020a039094169450638abe59ea936024808501949192918390030190829087803b1515611a4c57fe5b6102c65a03f11515611a5a57fe5b50505060405180519050600160a060020a031663a9059cbb33886000604051602001526040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1515611acb57fe5b6102c65a03f11515611ad957fe5b50506040515115159050611aed5760006000fd5b6000861215611afc5760006000fd5b6005805460ff8916908110611b0d57fe5b906000526020600020900160005b505473__Math__________________________________63a5f3c23b9091886000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b1515611b7d57fe5b6102c65a03f41515611b8b57fe5b505060405151600580549192509060ff8a16908110611ba657fe5b906000526020600020900160005b50556040805160ff89168152602081018890528082018690529051600160a060020a033316917ff6f5e7e0f5d8ae3d5137e61e002f8f51821b64edaaadee43208156cbd5a2f163919081900360600190a25b5b5050509392505050565b620f4240815600a165627a7a723058209f35c152d419ac7a955ffc3e3ad007fbe824c7efa8c144c42b323a7007f7bdac0029a165627a7a723058202030510319882a70fcb1c9fb97c6f158f0976e69b32e72f13c0d8457ba411e2a0029", - "networks": { - "4": { - "events": { - "0xc9a97f5cb9f16e2d0431bd2aba96bf6fd6169026a7c7172865e5db48de5fb773": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "market", - "type": "address" - }, - { - "indexed": false, - "name": "eventContract", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - } - ], - "name": "MarketCreation", - "type": "event" - } - }, - "links": { - "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" - }, - "address": "0xd1acd0a2c697950085ed1c6b3d56d9bdd169b4db", - "updated_at": 1499271142596 - }, - "42": { - "events": { - "0xc9a97f5cb9f16e2d0431bd2aba96bf6fd6169026a7c7172865e5db48de5fb773": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "market", - "type": "address" - }, - { - "indexed": false, - "name": "eventContract", - "type": "address" - }, - { - "indexed": false, - "name": "marketMaker", - "type": "address" - }, - { - "indexed": false, - "name": "fee", - "type": "uint24" - } - ], - "name": "MarketCreation", - "type": "event" - } - }, - "links": { - "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" - }, - "address": "0x6855c73f9ff338afcbc9aec03a2ede77ced4832c", - "updated_at": 1499207793336 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142596 -} \ No newline at end of file diff --git a/build/contracts/StandardToken.json b/build/contracts/StandardToken.json deleted file mode 100644 index 8ac6e6e..0000000 --- a/build/contracts/StandardToken.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "contract_name": "StandardToken", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "spender", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "from", - "type": "address" - }, - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - }, - { - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6106598061001c6000396000f3006060604052361561005c5763ffffffff60e060020a600035041663095ea7b3811461005e57806318160ddd1461009157806323b872dd146100b357806370a08231146100ec578063a9059cbb1461011a578063dd62ed3e1461014d575bfe5b341561006657fe5b61007d600160a060020a0360043516602435610181565b604080519115158252519081900360200190f35b341561009957fe5b6100a16101ec565b60408051918252519081900360200190f35b34156100bb57fe5b61007d600160a060020a03600435811690602435166044356101f3565b604080519115158252519081900360200190f35b34156100f457fe5b6100a1600160a060020a0360043516610439565b60408051918252519081900360200190f35b341561012257fe5b61007d600160a060020a0360043516602435610458565b604080519115158252519081900360200190f35b341561015557fe5b6100a1600160a060020a03600435811690602435166105e0565b60408051918252519081900360200190f35b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6002545b90565b600160a060020a0383166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561026757fe5b6102c65a03f4151561027557fe5b505060405151159050806103205750600160a060020a038085166000908152600160209081526040808320339094168352928152828220548351820192909252825160e260020a6338c71c71028152600481019290925260248201859052915173__Math__________________________________9263e31c71c49260448082019391829003018186803b151561030857fe5b6102c65a03f4151561031657fe5b5050604051511590505b806103b35750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561039b57fe5b6102c65a03f415156103a957fe5b5050604051511590505b156103c057506000610432565b600160a060020a03808516600081815260208181526040808320805488900390556001825280832033861684528252808320805488900390559387168083528282529184902080548701905583518681529351919360008051602061060e833981519152929081900390910190a35060015b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b600160a060020a0333166000908152602081815260408083205481518301849052815160e260020a6338c71c71028152600481019190915260248101859052905173__Math__________________________________9263e31c71c49260448082019391829003018186803b15156104cc57fe5b6102c65a03f415156104da57fe5b505060405151159050806105765750600160a060020a038316600090815260208181526040808320548151830193909352805160e260020a63138c299b0281526004810193909352602483018590525173__Math__________________________________92634e30a66c926044808301939192829003018186803b151561055e57fe5b6102c65a03f4151561056c57fe5b5050604051511590505b15610583575060006101e6565b600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061060e833981519152929081900390910190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820152964418bdbd439518552faeb0f8a6a713a5340245f33b4667d13c35026c2050029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/Token.json b/build/contracts/Token.json deleted file mode 100644 index 65652c0..0000000 --- a/build/contracts/Token.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "contract_name": "Token", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "spender", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "from", - "type": "address" - }, - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "to", - "type": "address" - }, - { - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "owner", - "type": "address" - }, - { - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - ], - "unlinked_binary": "0x", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499270851573 -} \ No newline at end of file diff --git a/build/contracts/UltimateOracle.json b/build/contracts/UltimateOracle.json deleted file mode 100644 index e6a91e3..0000000 --- a/build/contracts/UltimateOracle.json +++ /dev/null @@ -1,406 +0,0 @@ -{ - "contract_name": "UltimateOracle", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "forwardedOracle", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "frontRunnerPeriod", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "frontRunner", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalAmount", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "isFrontRunnerPeriodOver", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "int256" - } - ], - "name": "totalOutcomeAmounts", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "withdraw", - "outputs": [ - { - "name": "amount", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "forwardedOutcomeSetTimestamp", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "isChallengePeriodOver", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "setForwardedOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "frontRunnerSetTimestamp", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "forwardedOutcome", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "challengeAmount", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "isChallenged", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_outcome", - "type": "int256" - } - ], - "name": "challengeOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "collateralToken", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "int256" - } - ], - "name": "outcomeAmounts", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "isOutcomeSet", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "spreadMultiplier", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "challengePeriod", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_outcome", - "type": "int256" - }, - { - "name": "amount", - "type": "uint256" - } - ], - "name": "voteForOutcome", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "inputs": [ - { - "name": "_forwardedOracle", - "type": "address" - }, - { - "name": "_collateralToken", - "type": "address" - }, - { - "name": "_spreadMultiplier", - "type": "uint8" - }, - { - "name": "_challengePeriod", - "type": "uint256" - }, - { - "name": "_challengeAmount", - "type": "uint256" - }, - { - "name": "_frontRunnerPeriod", - "type": "uint256" - } - ], - "payable": false, - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "ForwardedOracleOutcomeAssignment", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "outcome", - "type": "int256" - } - ], - "name": "OutcomeChallenge", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "outcome", - "type": "int256" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "OutcomeVote", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Withdrawal", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b60405160c080610ef583398101604090815281516020830151918301516060840151608085015160a090950151929491929091905b600160a060020a038616158015906100615750600160a060020a03851615155b8015610071575060028460ff1610155b801561007d5750600083115b80156100895750600082115b80156100955750600081115b15156100a15760006000fd5b60008054600160a060020a03808916600160a060020a0319928316179092556001805460ff8816740100000000000000000000000000000000000000000260a060020a60ff0219948a169190931617929092161790556002839055600382905560048190555b5050505050505b610dd88061011d6000396000f3006060604052361561010c5763ffffffff60e060020a600035041663061a85c7811461010e5780630853f7eb1461013a5780630f3e94381461015c5780631a39d8ef1461017e5780631a4f5b67146101a05780631ff14311146101c45780633ccfd60b146101e9578063466ae3141461020b57806372b8de141461022d578063739b8c48146102515780637e7e4b47146102635780638ef8125e14610285578063984a470a146102a75780639d89e7d4146102c95780639df4d0fe146102eb5780639f0de4901461030f578063b2016bd414610324578063c427af9b14610350578063ccdf68f314610381578063d84d2a47146103a5578063f3f480d9146103cb578063f7553098146103ed575bfe5b341561011657fe5b61011e610405565b60408051600160a060020a039092168252519081900360200190f35b341561014257fe5b61014a610414565b60408051918252519081900360200190f35b341561016457fe5b61014a61041a565b60408051918252519081900360200190f35b341561018657fe5b61014a610420565b60408051918252519081900360200190f35b34156101a857fe5b6101b0610426565b604080519115158252519081900360200190f35b34156101cc57fe5b61014a6004356104bc565b60408051918252519081900360200190f35b34156101f157fe5b61014a6104ce565b60408051918252519081900360200190f35b341561021357fe5b61014a61067e565b60408051918252519081900360200190f35b341561023557fe5b6101b0610684565b604080519115158252519081900360200190f35b341561025957fe5b61026161071a565b005b341561026b57fe5b61014a610855565b60408051918252519081900360200190f35b341561028d57fe5b61014a610875565b60408051918252519081900360200190f35b34156102af57fe5b61014a61087b565b60408051918252519081900360200190f35b34156102d157fe5b61014a610881565b60408051918252519081900360200190f35b34156102f357fe5b6101b0610887565b604080519115158252519081900360200190f35b341561031757fe5b610261600435610890565b005b341561032c57fe5b61011e6109b8565b60408051600160a060020a039092168252519081900360200190f35b341561035857fe5b61014a600160a060020a03600435166024356109c7565b60408051918252519081900360200190f35b341561038957fe5b6101b06109e4565b604080519115158252519081900360200190f35b34156103ad57fe5b6103b5610a14565b6040805160ff9092168252519081900360200190f35b34156103d357fe5b61014a610a24565b60408051918252519081900360200190f35b34156103f557fe5b610261600435602435610a2a565b005b600054600160a060020a031681565b60045481565b60075481565b60095481565b60006008546000141580156104b657506004544273__Math__________________________________63b67d77c590916008546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561049c57fe5b6102c65a03f415156104aa57fe5b50505060405180519050115b90505b90565b600a6020526000908152604090205481565b60006104d8610426565b15156104e45760006000fd5b6007546000818152600a6020908152604080832054600954600160a060020a0333168552600b8452828520958552948352818420548251840194909452815160e260020a6332292b270281526004810195909552602485019390935251919273__Math__________________________________9263c8a4ac9c92604480840193919291829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b505060405151905081151561059757fe5b600160a060020a033381166000818152600b602090815260408083206007548452825280832083905560015481518301849052815160e060020a63a9059cbb028152600481019590955296909504602484018190529451949650949092169363a9059cbb9360448084019492939192918390030190829087803b151561061957fe5b6102c65a03f1151561062757fe5b5050604051511515905061063b5760006000fd5b604080518281529051600160a060020a033316917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a25b90565b60065481565b60006006546000141580156104b657506002544273__Math__________________________________63b67d77c590916006546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561049c57fe5b6102c65a03f415156104aa57fe5b50505060405180519050115b90505b90565b610722610887565b15801561072f5750600654155b80156107a85750600060009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561079157fe5b6102c65a03f1151561079f57fe5b50506040515190505b15156107b45760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a0316637e7e4b476000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561080f57fe5b6102c65a03f1151561081d57fe5b50506040518051600555426006557f6eab3db94ac766c1ac203bcd9c9636476993422eaa067ad449e20ce8501b2a8f9150602090a15b565b600061085f610426565b1561086d57506007546104b9565b506005545b90565b60085481565b60055481565b60035481565b60085415155b90565b610898610887565b1580156108aa57506108a8610684565b155b801561093357506001546003546040805160006020918201819052825160e060020a6323b872dd028152600160a060020a03338116600483015230811660248301526044820195909552925193909416936323b872dd936064808501949192918390030190829087803b151561091c57fe5b6102c65a03f1151561092a57fe5b50506040515190505b151561093f5760006000fd5b600354600160a060020a0333166000818152600b602090815260408083208684528252808320859055600a8252918290208490556009939093556007849055426008558051848152905191927fd0fdeb84e66d569a89718f40a99496b38d6c13249a9c9f623fbaa3d8ef343a9d92918290030190a25b50565b600154600160a060020a031681565b600b60209081526000928352604080842090915290825290205481565b60006109ee610684565b80156109ff57506109fd610887565b155b806104b657506104b6610426565b5b90505b90565b60015460a060020a900460ff1681565b60025481565b6000828152600a602090815260408083205460095460015483518501869052835160e260020a6332292b2702815292909103600483015260a060020a900460ff166024820152905173__Math__________________________________9263c8a4ac9c9260448082019391829003018186803b1515610aa557fe5b6102c65a03f41515610ab357fe5b50506040515191505080821115610ac8578091505b610ad0610887565b8015610ae15750610adf610426565b155b8015610b6657506001546040805160006020918201819052825160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201889052935193909416936323b872dd936064808301949391928390030190829087803b1515610b4f57fe5b6102c65a03f11515610b5d57fe5b50506040515190505b1515610b725760006000fd5b600160a060020a0333166000908152600b602090815260408083208684528252808320548151830193909352805160e060020a63771602f70281526004810193909352602483018590525173__Math__________________________________9263771602f7926044808301939192829003018186803b1515610bf157fe5b6102c65a03f41515610bff57fe5b5050604080518051600160a060020a0333166000908152600b6020908152848220898352815284822092909255600a82528381205492820152825160e060020a63771602f7028152600481019290925260248201869052915173__Math__________________________________935063771602f792604480840193919291829003018186803b1515610c8e57fe5b6102c65a03f41515610c9c57fe5b50506040805180516000878152600a60209081528482209290925560095492820152825160e060020a63771602f7028152600481019290925260248201869052915173__Math__________________________________935063771602f792604480840193919291829003018186803b1515610d1457fe5b6102c65a03f41515610d2257fe5b505060405151600955506007548314801590610d5457506007546000908152600a602052604080822054858352912054115b15610d63576007839055426008555b60408051848152602081018490528151600160a060020a033316927f86fa706979a07f1dd01a49718016881d95ada425549c353ec9e55a627b98a93b928290030190a25b5050505600a165627a7a7230582011f3e74052ddfd7e264c958010854dd14936f1ef259041ed6a1eca3947aec2fb0029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499102373992 -} \ No newline at end of file diff --git a/build/contracts/UltimateOracleFactory.json b/build/contracts/UltimateOracleFactory.json deleted file mode 100644 index 54415e3..0000000 --- a/build/contracts/UltimateOracleFactory.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "contract_name": "UltimateOracleFactory", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "oracle", - "type": "address" - }, - { - "name": "collateralToken", - "type": "address" - }, - { - "name": "spreadMultiplier", - "type": "uint8" - }, - { - "name": "challengePeriod", - "type": "uint256" - }, - { - "name": "challengeAmount", - "type": "uint256" - }, - { - "name": "frontRunnerPeriod", - "type": "uint256" - } - ], - "name": "createUltimateOracle", - "outputs": [ - { - "name": "ultimateOracle", - "type": "address" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "ultimateOracle", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "spreadMultiplier", - "type": "uint8" - }, - { - "indexed": false, - "name": "challengePeriod", - "type": "uint256" - }, - { - "indexed": false, - "name": "challengeAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "frontRunnerPeriod", - "type": "uint256" - } - ], - "name": "UltimateOracleCreation", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b61107f8061001c6000396000f300606060405263ffffffff60e060020a600035041663ce70faec8114610021575bfe5b341561002957fe5b610052600160a060020a036004358116906024351660ff6044351660643560843560a43561006e565b60408051600160a060020a039092168252519081900360200190f35b600086868686868661007e61014e565b600160a060020a03968716815294909516602085015260ff9092166040808501919091526060840191909152608083019190915260a082019290925290519081900360c001906000f08015156100d057fe5b60408051600160a060020a0380841682528a811660208301528981168284015260ff891660608301526080820188905260a0820187905260c0820186905291519293503391909116917fe6ae2b8211e9721c5dae1d93f70be0ba07bd111608ba4db4317742e1a87fff409181900360e00190a25b9695505050505050565b604051610ef58061015f8339019056006060604052341561000c57fe5b60405160c080610ef583398101604090815281516020830151918301516060840151608085015160a090950151929491929091905b600160a060020a038616158015906100615750600160a060020a03851615155b8015610071575060028460ff1610155b801561007d5750600083115b80156100895750600082115b80156100955750600081115b15156100a15760006000fd5b60008054600160a060020a03808916600160a060020a0319928316179092556001805460ff8816740100000000000000000000000000000000000000000260a060020a60ff0219948a169190931617929092161790556002839055600382905560048190555b5050505050505b610dd88061011d6000396000f3006060604052361561010c5763ffffffff60e060020a600035041663061a85c7811461010e5780630853f7eb1461013a5780630f3e94381461015c5780631a39d8ef1461017e5780631a4f5b67146101a05780631ff14311146101c45780633ccfd60b146101e9578063466ae3141461020b57806372b8de141461022d578063739b8c48146102515780637e7e4b47146102635780638ef8125e14610285578063984a470a146102a75780639d89e7d4146102c95780639df4d0fe146102eb5780639f0de4901461030f578063b2016bd414610324578063c427af9b14610350578063ccdf68f314610381578063d84d2a47146103a5578063f3f480d9146103cb578063f7553098146103ed575bfe5b341561011657fe5b61011e610405565b60408051600160a060020a039092168252519081900360200190f35b341561014257fe5b61014a610414565b60408051918252519081900360200190f35b341561016457fe5b61014a61041a565b60408051918252519081900360200190f35b341561018657fe5b61014a610420565b60408051918252519081900360200190f35b34156101a857fe5b6101b0610426565b604080519115158252519081900360200190f35b34156101cc57fe5b61014a6004356104bc565b60408051918252519081900360200190f35b34156101f157fe5b61014a6104ce565b60408051918252519081900360200190f35b341561021357fe5b61014a61067e565b60408051918252519081900360200190f35b341561023557fe5b6101b0610684565b604080519115158252519081900360200190f35b341561025957fe5b61026161071a565b005b341561026b57fe5b61014a610855565b60408051918252519081900360200190f35b341561028d57fe5b61014a610875565b60408051918252519081900360200190f35b34156102af57fe5b61014a61087b565b60408051918252519081900360200190f35b34156102d157fe5b61014a610881565b60408051918252519081900360200190f35b34156102f357fe5b6101b0610887565b604080519115158252519081900360200190f35b341561031757fe5b610261600435610890565b005b341561032c57fe5b61011e6109b8565b60408051600160a060020a039092168252519081900360200190f35b341561035857fe5b61014a600160a060020a03600435166024356109c7565b60408051918252519081900360200190f35b341561038957fe5b6101b06109e4565b604080519115158252519081900360200190f35b34156103ad57fe5b6103b5610a14565b6040805160ff9092168252519081900360200190f35b34156103d357fe5b61014a610a24565b60408051918252519081900360200190f35b34156103f557fe5b610261600435602435610a2a565b005b600054600160a060020a031681565b60045481565b60075481565b60095481565b60006008546000141580156104b657506004544273__Math__________________________________63b67d77c590916008546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561049c57fe5b6102c65a03f415156104aa57fe5b50505060405180519050115b90505b90565b600a6020526000908152604090205481565b60006104d8610426565b15156104e45760006000fd5b6007546000818152600a6020908152604080832054600954600160a060020a0333168552600b8452828520958552948352818420548251840194909452815160e260020a6332292b270281526004810195909552602485019390935251919273__Math__________________________________9263c8a4ac9c92604480840193919291829003018186803b151561057857fe5b6102c65a03f4151561058657fe5b505060405151905081151561059757fe5b600160a060020a033381166000818152600b602090815260408083206007548452825280832083905560015481518301849052815160e060020a63a9059cbb028152600481019590955296909504602484018190529451949650949092169363a9059cbb9360448084019492939192918390030190829087803b151561061957fe5b6102c65a03f1151561062757fe5b5050604051511515905061063b5760006000fd5b604080518281529051600160a060020a033316917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a25b90565b60065481565b60006006546000141580156104b657506002544273__Math__________________________________63b67d77c590916006546000604051602001526040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b151561049c57fe5b6102c65a03f415156104aa57fe5b50505060405180519050115b90505b90565b610722610887565b15801561072f5750600654155b80156107a85750600060009054906101000a9004600160a060020a0316600160a060020a031663ccdf68f36000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561079157fe5b6102c65a03f1151561079f57fe5b50506040515190505b15156107b45760006000fd5b600060009054906101000a9004600160a060020a0316600160a060020a0316637e7e4b476000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561080f57fe5b6102c65a03f1151561081d57fe5b50506040518051600555426006557f6eab3db94ac766c1ac203bcd9c9636476993422eaa067ad449e20ce8501b2a8f9150602090a15b565b600061085f610426565b1561086d57506007546104b9565b506005545b90565b60085481565b60055481565b60035481565b60085415155b90565b610898610887565b1580156108aa57506108a8610684565b155b801561093357506001546003546040805160006020918201819052825160e060020a6323b872dd028152600160a060020a03338116600483015230811660248301526044820195909552925193909416936323b872dd936064808501949192918390030190829087803b151561091c57fe5b6102c65a03f1151561092a57fe5b50506040515190505b151561093f5760006000fd5b600354600160a060020a0333166000818152600b602090815260408083208684528252808320859055600a8252918290208490556009939093556007849055426008558051848152905191927fd0fdeb84e66d569a89718f40a99496b38d6c13249a9c9f623fbaa3d8ef343a9d92918290030190a25b50565b600154600160a060020a031681565b600b60209081526000928352604080842090915290825290205481565b60006109ee610684565b80156109ff57506109fd610887565b155b806104b657506104b6610426565b5b90505b90565b60015460a060020a900460ff1681565b60025481565b6000828152600a602090815260408083205460095460015483518501869052835160e260020a6332292b2702815292909103600483015260a060020a900460ff166024820152905173__Math__________________________________9263c8a4ac9c9260448082019391829003018186803b1515610aa557fe5b6102c65a03f41515610ab357fe5b50506040515191505080821115610ac8578091505b610ad0610887565b8015610ae15750610adf610426565b155b8015610b6657506001546040805160006020918201819052825160e060020a6323b872dd028152600160a060020a033381166004830152308116602483015260448201889052935193909416936323b872dd936064808301949391928390030190829087803b1515610b4f57fe5b6102c65a03f11515610b5d57fe5b50506040515190505b1515610b725760006000fd5b600160a060020a0333166000908152600b602090815260408083208684528252808320548151830193909352805160e060020a63771602f70281526004810193909352602483018590525173__Math__________________________________9263771602f7926044808301939192829003018186803b1515610bf157fe5b6102c65a03f41515610bff57fe5b5050604080518051600160a060020a0333166000908152600b6020908152848220898352815284822092909255600a82528381205492820152825160e060020a63771602f7028152600481019290925260248201869052915173__Math__________________________________935063771602f792604480840193919291829003018186803b1515610c8e57fe5b6102c65a03f41515610c9c57fe5b50506040805180516000878152600a60209081528482209290925560095492820152825160e060020a63771602f7028152600481019290925260248201869052915173__Math__________________________________935063771602f792604480840193919291829003018186803b1515610d1457fe5b6102c65a03f41515610d2257fe5b505060405151600955506007548314801590610d5457506007546000908152600a602052604080822054858352912054115b15610d63576007839055426008555b60408051848152602081018490528151600160a060020a033316927f86fa706979a07f1dd01a49718016881d95ada425549c353ec9e55a627b98a93b928290030190a25b5050505600a165627a7a7230582011f3e74052ddfd7e264c958010854dd14936f1ef259041ed6a1eca3947aec2fb0029a165627a7a723058209cd8385c2da67bc430b672d980b0dda394ec7abf55a89b61f6f528df318452580029", - "networks": { - "4": { - "events": { - "0xe6ae2b8211e9721c5dae1d93f70be0ba07bd111608ba4db4317742e1a87fff40": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "ultimateOracle", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "spreadMultiplier", - "type": "uint8" - }, - { - "indexed": false, - "name": "challengePeriod", - "type": "uint256" - }, - { - "indexed": false, - "name": "challengeAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "frontRunnerPeriod", - "type": "uint256" - } - ], - "name": "UltimateOracleCreation", - "type": "event" - } - }, - "links": { - "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" - }, - "address": "0x8b88b48f99388af5b4c69e661d7554fb6c8b092f", - "updated_at": 1499271142596 - }, - "42": { - "events": { - "0xe6ae2b8211e9721c5dae1d93f70be0ba07bd111608ba4db4317742e1a87fff40": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "creator", - "type": "address" - }, - { - "indexed": false, - "name": "ultimateOracle", - "type": "address" - }, - { - "indexed": false, - "name": "oracle", - "type": "address" - }, - { - "indexed": false, - "name": "collateralToken", - "type": "address" - }, - { - "indexed": false, - "name": "spreadMultiplier", - "type": "uint8" - }, - { - "indexed": false, - "name": "challengePeriod", - "type": "uint256" - }, - { - "indexed": false, - "name": "challengeAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "frontRunnerPeriod", - "type": "uint256" - } - ], - "name": "UltimateOracleCreation", - "type": "event" - } - }, - "links": { - "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" - }, - "address": "0x900b923d8afb3cb45072940742f5010ec5a85a68", - "updated_at": 1499207793336 - } - }, - "schema_version": "0.0.5", - "updated_at": 1499271142596 -} \ No newline at end of file diff --git a/networks.json b/networks.json new file mode 100644 index 0000000..7e8ba07 --- /dev/null +++ b/networks.json @@ -0,0 +1,640 @@ +{ + "CentralizedOracleFactory": { + "4": { + "events": { + "0x33a1926cf5c2f7306ac1685bf19260d678fea874f5f59c00b69fa5e2643ecfd2": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "centralizedOracle", + "type": "address" + }, + { + "indexed": false, + "name": "ipfsHash", + "type": "bytes" + } + ], + "name": "CentralizedOracleCreation", + "type": "event" + } + }, + "links": {}, + "address": "0x1d8d6b851859e4ff5144ffd0c7f9a8951f42f18d", + "updated_at": 1499271142589 + }, + "42": { + "events": { + "0x33a1926cf5c2f7306ac1685bf19260d678fea874f5f59c00b69fa5e2643ecfd2": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "centralizedOracle", + "type": "address" + }, + { + "indexed": false, + "name": "ipfsHash", + "type": "bytes" + } + ], + "name": "CentralizedOracleCreation", + "type": "event" + } + }, + "links": {}, + "address": "0x81dcec0e6edb95e6633ffa06886a04d1e350d992", + "updated_at": 1499207793335 + } + }, + "EtherToken": { + "4": { + "events": { + "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "sender", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Deposit", + "type": "event" + }, + "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "receiver", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Withdrawal", + "type": "event" + }, + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "from", + "type": "address" + }, + { + "indexed": true, + "name": "to", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + } + }, + "links": { + "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" + }, + "address": "0xb9518c7ff807b7b1b30ea05735237d739e27550d", + "updated_at": 1499271142591 + }, + "42": { + "events": { + "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "sender", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Deposit", + "type": "event" + }, + "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "receiver", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Withdrawal", + "type": "event" + }, + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "from", + "type": "address" + }, + { + "indexed": true, + "name": "to", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "name": "value", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + } + }, + "links": { + "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" + }, + "address": "0x0a8c7932880b4d8d4c7e1b08f89ff34f42f5d34d", + "updated_at": 1499207793332 + } + }, + "EventFactory": { + "4": { + "events": { + "0x9732758aee476f5125b50d29cc43e28422f12ec078ba9f5c712f9dbd52796f59": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "categoricalEvent", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "outcomeCount", + "type": "uint8" + } + ], + "name": "CategoricalEventCreation", + "type": "event" + }, + "0xd613e63983a1538814e1b390fc232d0e20462cf7410924f6b6a5f29ea38e82ed": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "scalarEvent", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "lowerBound", + "type": "int256" + }, + { + "indexed": false, + "name": "upperBound", + "type": "int256" + } + ], + "name": "ScalarEventCreation", + "type": "event" + } + }, + "links": { + "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" + }, + "address": "0xaf895ec648b5572ac427268e6371654bc3689080", + "updated_at": 1499271142595 + }, + "42": { + "events": { + "0x9732758aee476f5125b50d29cc43e28422f12ec078ba9f5c712f9dbd52796f59": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "categoricalEvent", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "outcomeCount", + "type": "uint8" + } + ], + "name": "CategoricalEventCreation", + "type": "event" + }, + "0xd613e63983a1538814e1b390fc232d0e20462cf7410924f6b6a5f29ea38e82ed": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "scalarEvent", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "lowerBound", + "type": "int256" + }, + { + "indexed": false, + "name": "upperBound", + "type": "int256" + } + ], + "name": "ScalarEventCreation", + "type": "event" + } + }, + "links": { + "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" + }, + "address": "0x4c2a3cec05ffd4c2a476bffd6c317bf497d43bc5", + "updated_at": 1499207793329 + } + }, + "LMSRMarketMaker": { + "4": { + "events": {}, + "links": { + "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" + }, + "address": "0x7c2e1876b8bc73ad3571a9ae07e034cbbd8b4386", + "updated_at": 1499271142596 + }, + "42": { + "events": {}, + "links": { + "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" + }, + "address": "0x19f7eca6fad8fa20a3e21993346ba8997aee604e", + "updated_at": 1499207793336 + } + }, + "Math": { + "4": { + "events": {}, + "links": {}, + "address": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b", + "updated_at": 1499271142589 + }, + "42": { + "events": {}, + "links": {}, + "address": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc", + "updated_at": 1499207793335 + } + }, + "Migrations": { + "4": { + "events": {}, + "links": {}, + "address": "0x95d4bd23860a6217c4b4c17d81d8f089b2df8347", + "updated_at": 1499271142595 + }, + "42": { + "events": {}, + "links": {}, + "address": "0x67b102d3ab8d9d911e72415759ab493dda20d4d6", + "updated_at": 1499207793336 + } + }, + "StandardMarketFactory": { + "4": { + "events": { + "0xc9a97f5cb9f16e2d0431bd2aba96bf6fd6169026a7c7172865e5db48de5fb773": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "market", + "type": "address" + }, + { + "indexed": false, + "name": "eventContract", + "type": "address" + }, + { + "indexed": false, + "name": "marketMaker", + "type": "address" + }, + { + "indexed": false, + "name": "fee", + "type": "uint24" + } + ], + "name": "MarketCreation", + "type": "event" + } + }, + "links": { + "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" + }, + "address": "0xd1acd0a2c697950085ed1c6b3d56d9bdd169b4db", + "updated_at": 1499271142596 + }, + "42": { + "events": { + "0xc9a97f5cb9f16e2d0431bd2aba96bf6fd6169026a7c7172865e5db48de5fb773": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "market", + "type": "address" + }, + { + "indexed": false, + "name": "eventContract", + "type": "address" + }, + { + "indexed": false, + "name": "marketMaker", + "type": "address" + }, + { + "indexed": false, + "name": "fee", + "type": "uint24" + } + ], + "name": "MarketCreation", + "type": "event" + } + }, + "links": { + "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" + }, + "address": "0x6855c73f9ff338afcbc9aec03a2ede77ced4832c", + "updated_at": 1499207793336 + } + }, + "UltimateOracleFactory": { + "4": { + "events": { + "0xe6ae2b8211e9721c5dae1d93f70be0ba07bd111608ba4db4317742e1a87fff40": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "ultimateOracle", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "spreadMultiplier", + "type": "uint8" + }, + { + "indexed": false, + "name": "challengePeriod", + "type": "uint256" + }, + { + "indexed": false, + "name": "challengeAmount", + "type": "uint256" + }, + { + "indexed": false, + "name": "frontRunnerPeriod", + "type": "uint256" + } + ], + "name": "UltimateOracleCreation", + "type": "event" + } + }, + "links": { + "Math": "0xbb14515de6c9e26c82c5067d02eaa82231029f2b" + }, + "address": "0x8b88b48f99388af5b4c69e661d7554fb6c8b092f", + "updated_at": 1499271142596 + }, + "42": { + "events": { + "0xe6ae2b8211e9721c5dae1d93f70be0ba07bd111608ba4db4317742e1a87fff40": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "creator", + "type": "address" + }, + { + "indexed": false, + "name": "ultimateOracle", + "type": "address" + }, + { + "indexed": false, + "name": "oracle", + "type": "address" + }, + { + "indexed": false, + "name": "collateralToken", + "type": "address" + }, + { + "indexed": false, + "name": "spreadMultiplier", + "type": "uint8" + }, + { + "indexed": false, + "name": "challengePeriod", + "type": "uint256" + }, + { + "indexed": false, + "name": "challengeAmount", + "type": "uint256" + }, + { + "indexed": false, + "name": "frontRunnerPeriod", + "type": "uint256" + } + ], + "name": "UltimateOracleCreation", + "type": "event" + } + }, + "links": { + "Math": "0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc" + }, + "address": "0x900b923d8afb3cb45072940742f5010ec5a85a68", + "updated_at": 1499207793336 + } + } +} \ No newline at end of file diff --git a/package.json b/package.json index 0f6884c..db4c2e5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "compile": "truffle compile", "migrate": "truffle migrate", "networks": "truffle networks", - "test": "node test_local.js", + "test": "node scripts/test_local.js", "prepublish": "truffle compile && truffle networks --clean" }, "keywords": [ diff --git a/scripts/extract_network_info.js b/scripts/extract_network_info.js new file mode 100644 index 0000000..ad615e3 --- /dev/null +++ b/scripts/extract_network_info.js @@ -0,0 +1,16 @@ +const fs = require('fs') +const path = require('path') +const _ = require('lodash') + +const dir = path.join('build', 'contracts') +const dirFiles = fs.readdirSync(dir) + +Promise.all(dirFiles.filter((fname) => fname.endsWith('.json')).map((fname) => new Promise((resolve, reject) => { + fs.readFile(path.join(dir, fname), (err, data) => { + if(err) throw err; + resolve([fname.slice(0, -5), JSON.parse(data)['networks']]) + }) + +}))).then((nameNetworkPairs) => { + fs.writeFileSync('networks.json', JSON.stringify(_.fromPairs(nameNetworkPairs.filter(([name, nets]) => !_.isEmpty(nets))), null, 2)) +}) diff --git a/scripts/inject_network_info.js b/scripts/inject_network_info.js new file mode 100644 index 0000000..473639d --- /dev/null +++ b/scripts/inject_network_info.js @@ -0,0 +1,16 @@ +const fs = require('fs') +const path = require('path') +const _ = require('lodash') + +const dir = path.join('build', 'contracts') + +const contractNetworksMap = JSON.parse(fs.readFileSync('networks.json')) + +_.toPairs(contractNetworksMap) + .map(([name, networks]) => [path.join(dir, name + '.json'), networks]) + .filter(([file, networks]) => fs.existsSync(file)) + .forEach(([file, networks]) => { + const artifactData = JSON.parse(fs.readFileSync(file)) + _.merge(artifactData.networks, networks) + fs.writeFileSync(file, JSON.stringify(artifactData, null, 2)) + }) diff --git a/test_local.js b/scripts/test_local.js similarity index 100% rename from test_local.js rename to scripts/test_local.js From 0a8be42910829f128320bc06980389784583ef41 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Thu, 6 Jul 2017 12:41:46 -0500 Subject: [PATCH 2/9] Documented scripts and added them to package.json --- README.md | 15 +++++++++++++++ package.json | 4 +++- scripts/inject_network_info.js | 6 +++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f1c40bc..54ee2b0 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,9 @@ npm run compile npm run migrate ``` +Network Artifacts +----------------- + ### Show the deployed addresses of all contracts on all networks: ```bash npm run networks @@ -50,6 +53,18 @@ Command line options for `truffle` can be passed down through NPM by preceding t npm run networks -- --clean ``` +Network artifacts from running migrations will contain addresses of deployed contracts on the Kovan and Rinkeby testnets. + +### Extract all network information into `networks.json` +```bash +npm run extractnetinfo +``` + +### Take network info from `networks.json` and inject it into contract build artifacts. This is done prepublish as well. +```bash +npm run injectnetinfo +``` + Security and Liability ------------- All contracts are WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/package.json b/package.json index db4c2e5..28f76f2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ "migrate": "truffle migrate", "networks": "truffle networks", "test": "node scripts/test_local.js", - "prepublish": "truffle compile && truffle networks --clean" + "injectnetinfo": "node scripts/inject_network_info.js", + "extractnetinfo": "node scripts/extract_network_info.js", + "prepublish": "truffle compile && truffle networks --clean && node scripts/inject_network_info.js" }, "keywords": [ "Ethereum", diff --git a/scripts/inject_network_info.js b/scripts/inject_network_info.js index 473639d..d8114ad 100644 --- a/scripts/inject_network_info.js +++ b/scripts/inject_network_info.js @@ -8,7 +8,11 @@ const contractNetworksMap = JSON.parse(fs.readFileSync('networks.json')) _.toPairs(contractNetworksMap) .map(([name, networks]) => [path.join(dir, name + '.json'), networks]) - .filter(([file, networks]) => fs.existsSync(file)) + .filter(([file, networks]) => { + if(!fs.existsSync(file)) + throw new Error(`missing build artifact ${file}; make sure contracts are compiled`) + return true + }) .forEach(([file, networks]) => { const artifactData = JSON.parse(fs.readFileSync(file)) _.merge(artifactData.networks, networks) From 99dfbe51ea526aa3b7fe0120e371bfcd63d87b8a Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 07:42:31 -0500 Subject: [PATCH 3/9] npm script 'networks' displays this info already --- CONTRACTADDRESSES.md | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 CONTRACTADDRESSES.md diff --git a/CONTRACTADDRESSES.md b/CONTRACTADDRESSES.md deleted file mode 100644 index ebacc0c..0000000 --- a/CONTRACTADDRESSES.md +++ /dev/null @@ -1,19 +0,0 @@ -# KOVAN - * Migrations: 0x67b102d3ab8d9d911e72415759ab493dda20d4d6 - * Math: 0x7db54f831aaa06bdf5a9e437cfed1d4ad2cee2cc - * EventFactory: 0x4c2a3cec05ffd4c2a476bffd6c317bf497d43bc5 - * CentralizedOracleFactory: 0x81dcec0e6edb95e6633ffa06886a04d1e350d992 - * UltimateOracleFactory: 0x900b923d8afb3cb45072940742f5010ec5a85a68 - * LMSRMarketMaker: 0x19f7eca6fad8fa20a3e21993346ba8997aee604e - * StandardMarketFactory: 0x6855c73f9ff338afcbc9aec03a2ede77ced4832c - * EtherToken: 0x0a8c7932880b4d8d4c7e1b08f89ff34f42f5d34d - -# RINKEBY - * Migrations: 0x95d4bd23860a6217c4b4c17d81d8f089b2df8347 - * Math: 0xbb14515de6c9e26c82c5067d02eaa82231029f2b - * EventFactory: 0xaf895ec648b5572ac427268e6371654bc3689080 - * CentralizedOracleFactory: 0x1d8d6b851859e4ff5144ffd0c7f9a8951f42f18d - * UltimateOracleFactory: 0x8b88b48f99388af5b4c69e661d7554fb6c8b092f - * LMSRMarketMaker: 0x7c2e1876b8bc73ad3571a9ae07e034cbbd8b4386 - * StandardMarketFactory: 0xd1acd0a2c697950085ed1c6b3d56d9bdd169b4db - * EtherToken: 0xb9518c7ff807b7b1b30ea05735237d739e27550d From 4cc16d0ec35f3d432a834e94581d16660163f501 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 07:44:39 -0500 Subject: [PATCH 4/9] Added packages which do not get included by new NPM (revert this when fix lands) --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 28f76f2..fcd61db 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,10 @@ "lodash": "^4.17.4", "npm-prepublish": "^1.2.2", "truffle": "^3.3.0", - "truffle-hdwallet-provider": "0.0.3" + "truffle-config": "^1.0.0", + "truffle-expect": "0.0.3", + "truffle-hdwallet-provider": "0.0.3", + "xhr2": "^0.1.4" }, "repository": { "type": "git", From e51f02882250f48658ac83b5d2298989326152ac Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 07:51:10 -0500 Subject: [PATCH 5/9] Ignore other non-node items for NPM publishing --- .npmignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.npmignore b/.npmignore index 846ed6c..4596d83 100644 --- a/.npmignore +++ b/.npmignore @@ -1 +1,3 @@ test/python/ +requirements.txt +.travis.yml From 1a84a4b436620d4e5761fa2d1fbdf754d1ba876e Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 07:53:10 -0500 Subject: [PATCH 6/9] Bump version to 0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fcd61db..86e391a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gnosis.pm/gnosis-core-contracts", - "version": "0.1.0", + "version": "0.2.0", "description": "Collection of smart contracts for the Gnosis prediction market platform", "scripts": { "lint": "eslint .", From 9e6e88a25830de87c2f699f17aa4279d06014d84 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 08:27:42 -0500 Subject: [PATCH 7/9] Touch up and document linting stuff --- .eslintrc.js | 3 +++ README.md | 7 ++++++- package.json | 10 ++-------- scripts/extract_network_info.js | 4 ++-- scripts/inject_network_info.js | 2 +- truffle.js | 1 - 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 6295f8c..649940c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -4,6 +4,9 @@ module.exports = { "parserOptions": { "sourceType": "script" }, + "rules": { + "no-unused-vars": ["error", { "argsIgnorePattern": "^_" }] + }, "env": { "node": true, "mocha": true, diff --git a/README.md b/README.md index 54ee2b0..01ee80b 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,18 @@ Install npm install ``` -Test +Testing and Linting ------------- ### Run all tests (requires Node version >=7 for `async/await`, and will automatically run TestRPC in the background): ```bash npm test ``` +### Lint the JS +```bash +npm run lint +``` + Compile and Deploy ------------------ These commands apply to the RPC provider running on port 8545. You may want to have TestRPC running in the background. They are really wrappers around the [corresponding Truffle commands](http://truffleframework.com/docs/advanced/commands). diff --git a/package.json b/package.json index 86e391a..a82bfbe 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test": "node scripts/test_local.js", "injectnetinfo": "node scripts/inject_network_info.js", "extractnetinfo": "node scripts/extract_network_info.js", - "prepublish": "truffle compile && truffle networks --clean && node scripts/inject_network_info.js" + "prepublish": "eslint . && truffle compile && truffle networks --clean && node scripts/inject_network_info.js" }, "keywords": [ "Ethereum", @@ -21,19 +21,13 @@ ], "author": "Gnosis (https://gnosis.pm)", "license": "GPL-3.0", - "dependencies": { - "eslint-config-standard": "^10.2.1" - }, + "dependencies": {}, "devDependencies": { "@digix/tempo": "^0.2.0", "babel-eslint": "^7.2.3", "decimal.js": "^7.2.1", "eslint": "^4.1.1", "eslint-plugin-babel": "^4.1.1", - "eslint-plugin-import": "^2.6.0", - "eslint-plugin-node": "^5.1.0", - "eslint-plugin-promise": "^3.5.0", - "eslint-plugin-standard": "^3.0.1", "ethereumjs-testrpc": "^4.0.1", "lodash": "^4.17.4", "npm-prepublish": "^1.2.2", diff --git a/scripts/extract_network_info.js b/scripts/extract_network_info.js index ad615e3..272dc13 100644 --- a/scripts/extract_network_info.js +++ b/scripts/extract_network_info.js @@ -5,12 +5,12 @@ const _ = require('lodash') const dir = path.join('build', 'contracts') const dirFiles = fs.readdirSync(dir) -Promise.all(dirFiles.filter((fname) => fname.endsWith('.json')).map((fname) => new Promise((resolve, reject) => { +Promise.all(dirFiles.filter((fname) => fname.endsWith('.json')).map((fname) => new Promise((resolve, _reject) => { fs.readFile(path.join(dir, fname), (err, data) => { if(err) throw err; resolve([fname.slice(0, -5), JSON.parse(data)['networks']]) }) }))).then((nameNetworkPairs) => { - fs.writeFileSync('networks.json', JSON.stringify(_.fromPairs(nameNetworkPairs.filter(([name, nets]) => !_.isEmpty(nets))), null, 2)) + fs.writeFileSync('networks.json', JSON.stringify(_.fromPairs(nameNetworkPairs.filter(([_name, nets]) => !_.isEmpty(nets))), null, 2)) }) diff --git a/scripts/inject_network_info.js b/scripts/inject_network_info.js index d8114ad..1450537 100644 --- a/scripts/inject_network_info.js +++ b/scripts/inject_network_info.js @@ -8,7 +8,7 @@ const contractNetworksMap = JSON.parse(fs.readFileSync('networks.json')) _.toPairs(contractNetworksMap) .map(([name, networks]) => [path.join(dir, name + '.json'), networks]) - .filter(([file, networks]) => { + .filter(([file, _networks]) => { if(!fs.existsSync(file)) throw new Error(`missing build artifact ${file}; make sure contracts are compiled`) return true diff --git a/truffle.js b/truffle.js index ada9fec..c7e0e5f 100644 --- a/truffle.js +++ b/truffle.js @@ -1,5 +1,4 @@ const HDWalletProvider = require("truffle-hdwallet-provider") -const fs = require("fs") //address info for acct used to deploy contracts on kovan //address: 0x00200eB02C014831EBa45978415c30cf7110b329 From b0f24e68f22189a029116855482e026964b8533e Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 08:30:36 -0500 Subject: [PATCH 8/9] Remove HD wallet provider dep for Travis --- package.json | 1 - truffle.js | 18 +++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index a82bfbe..c25176b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "truffle": "^3.3.0", "truffle-config": "^1.0.0", "truffle-expect": "0.0.3", - "truffle-hdwallet-provider": "0.0.3", "xhr2": "^0.1.4" }, "repository": { diff --git a/truffle.js b/truffle.js index c7e0e5f..e3626e8 100644 --- a/truffle.js +++ b/truffle.js @@ -1,14 +1,3 @@ -const HDWalletProvider = require("truffle-hdwallet-provider") - -//address info for acct used to deploy contracts on kovan -//address: 0x00200eB02C014831EBa45978415c30cf7110b329 -//*note: parity wallet was used to deploy (not remote provider) - -//address info for acct used to deploy contracts on rinkeby -//address: 0x069fd4784D1DEd8A63923e83fF73c44414240043 -let mnemonic = 'stool arrow fatigue sunny actual bind radio license enemy peanut penalty soccer'; - - module.exports = { networks: { development: { @@ -22,10 +11,9 @@ module.exports = { network_id: "42" }, rinkeby: { - provider: new HDWalletProvider(mnemonic, "https://rinkeby.infura.io"), - network_id: "4", - gas: 4500000, - gasPrice: 25000000000 + host: "localhost", + port: 8545, + network_id: "4" }, } } From 568f1cdad7ffaebab5d72f76ef078db30963d1c7 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 7 Jul 2017 08:41:48 -0500 Subject: [PATCH 9/9] Fussing with README --- README.md | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 01ee80b..c3dfce3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Gnosis Smart Contracts -=================== +====================== [![Logo](assets/logo.png)](https://gnosis.pm/) @@ -11,20 +11,23 @@ Collection of smart contracts for the Gnosis prediction market platform (https:/ To interact with those contracts have a look at (https://github.com/gnosis/gnosis.js/). Install -------------- +------- ### Install requirements with npm: -``` + +```bash npm install ``` Testing and Linting -------------- +------------------- ### Run all tests (requires Node version >=7 for `async/await`, and will automatically run TestRPC in the background): + ```bash npm test ``` ### Lint the JS + ```bash npm run lint ``` @@ -34,11 +37,13 @@ Compile and Deploy These commands apply to the RPC provider running on port 8545. You may want to have TestRPC running in the background. They are really wrappers around the [corresponding Truffle commands](http://truffleframework.com/docs/advanced/commands). ### Compile all contracts to obtain ABI and bytecode: + ```bash npm run compile ``` ### Migrate all contracts required for the basic framework onto network associated with RPC provider: + ```bash npm run migrate ``` @@ -47,6 +52,7 @@ Network Artifacts ----------------- ### Show the deployed addresses of all contracts on all networks: + ```bash npm run networks ``` @@ -54,32 +60,37 @@ npm run networks Command line options for `truffle` can be passed down through NPM by preceding the options list with `--`. For example: ### Clean network artifacts: + ```bash npm run networks -- --clean ``` Network artifacts from running migrations will contain addresses of deployed contracts on the Kovan and Rinkeby testnets. -### Extract all network information into `networks.json` +### Take network info from `networks.json` and inject it into contract build artifacts. This is done prepublish as well. + ```bash -npm run extractnetinfo +npm run injectnetinfo ``` -### Take network info from `networks.json` and inject it into contract build artifacts. This is done prepublish as well. +### Extract all network information into `networks.json`. + +Be aware that this will clobber `networks.json`, so be careful with this command: + ```bash -npm run injectnetinfo +npm run extractnetinfo ``` Security and Liability -------------- +---------------------- All contracts are WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. License -------------- +------- All smart contracts are released under GPL v.3. Contributors -------------- +------------ - Stefan George ([Georgi87](https://github.com/Georgi87)) - Martin Koeppelmann ([koeppelmann](https://github.com/koeppelmann)) - Alan Lu ([cag](https://github.com/cag))