diff --git a/build/contracts/Abie.json b/build/contracts/Abie.json index 8690e4a..be3786a 100644 --- a/build/contracts/Abie.json +++ b/build/contracts/Abie.json @@ -2,103 +2,79 @@ "contractName": "Abie", "abi": [ { - "constant": true, + "anonymous": false, "inputs": [ { - "name": "", - "type": "uint256" - } - ], - "name": "proposals", - "outputs": [ - { - "name": "name", - "type": "bytes32" - }, - { - "name": "voteYes", - "type": "uint256" - }, - { - "name": "voteNo", - "type": "uint256" - }, - { - "name": "recipient", + "indexed": false, + "name": "donor", "type": "address" }, { - "name": "value", + "indexed": false, + "name": "amount", "type": "uint256" - }, + } + ], + "name": "Donated", + "type": "event" + }, + { + "constant": false, + "inputs": [ { - "name": "data", + "name": "_name", "type": "bytes32" }, { - "name": "proposalType", - "type": "uint8" - }, - { - "name": "endDate", + "name": "_value", "type": "uint256" }, { - "name": "lastMemberCounted", - "type": "address" - }, - { - "name": "executed", - "type": "bool" + "name": "_data", + "type": "bytes32" } ], - "payable": false, - "stateMutability": "view", + "name": "addProposal", + "outputs": [], + "payable": true, + "stateMutability": "payable", "type": "function" }, { - "constant": true, + "constant": false, "inputs": [], - "name": "name", - "outputs": [ - { - "name": "", - "type": "bytes32" - } - ], - "payable": false, - "stateMutability": "view", + "name": "askMembership", + "outputs": [], + "payable": true, + "stateMutability": "payable", "type": "function" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "", - "type": "address" + "name": "proposalID", + "type": "uint256" } ], - "name": "members", - "outputs": [ - { - "name": "registration", - "type": "uint256" - }, - { - "name": "prev", - "type": "address" - }, - { - "name": "succ", - "type": "address" - }, + "name": "claim", + "outputs": [], + "payable": true, + "stateMutability": "payable", + "type": "function" + }, + { + "constant": false, + "inputs": [ { - "name": "proposalStoppedOnHim", + "name": "proposalID", "type": "uint256" } ], + "name": "countAllVotes", + "outputs": [], "payable": false, - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { @@ -120,36 +96,17 @@ "type": "function" }, { - "constant": true, - "inputs": [], - "name": "registrationTime", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, + "constant": false, "inputs": [ { - "name": "m", - "type": "address" - } - ], - "name": "isValidMember", - "outputs": [ - { - "name": "", - "type": "bool" + "name": "proposalID", + "type": "uint256" } ], + "name": "executeAddMemberProposal", + "outputs": [], "payable": false, - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { @@ -176,46 +133,50 @@ { "name": "proposalID", "type": "uint256" + }, + { + "name": "voteType", + "type": "uint8" } ], - "name": "claim", + "name": "vote", "outputs": [], - "payable": true, - "stateMutability": "payable", + "payable": false, + "stateMutability": "nonpayable", "type": "function" }, { - "constant": true, "inputs": [ { - "name": "proposalID", - "type": "uint256" - } - ], - "name": "timeLeft", - "outputs": [ + "name": "_name", + "type": "bytes32" + }, { - "name": "", - "type": "uint256" + "name": "_statement", + "type": "bytes32" + }, + { + "name": "initialMembers", + "type": "address[]" } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "payable": true, + "stateMutability": "payable", + "type": "fallback" }, { "constant": true, - "inputs": [ - { - "name": "proposalID", - "type": "uint256" - } - ], - "name": "isExecutable", + "inputs": [], + "name": "contractBalance", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, @@ -223,17 +184,17 @@ "type": "function" }, { - "constant": false, - "inputs": [ + "constant": true, + "inputs": [], + "name": "fee", + "outputs": [ { - "name": "proposalID", + "name": "", "type": "uint256" } ], - "name": "executeAddMemberProposal", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { @@ -263,15 +224,15 @@ "constant": true, "inputs": [ { - "name": "", + "name": "proposalID", "type": "uint256" } ], - "name": "voteLength", + "name": "isExecutable", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, @@ -280,12 +241,17 @@ }, { "constant": true, - "inputs": [], - "name": "contractBalance", + "inputs": [ + { + "name": "m", + "type": "address" + } + ], + "name": "isValidMember", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, @@ -293,72 +259,68 @@ "type": "function" }, { - "constant": false, + "constant": true, "inputs": [ { - "name": "proposalID", - "type": "uint256" + "name": "", + "type": "address" } ], - "name": "countAllVotes", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ + "name": "members", + "outputs": [ { - "name": "proposalID", + "name": "registration", "type": "uint256" }, { - "name": "voteType", - "type": "uint8" + "name": "prev", + "type": "address" + }, + { + "name": "succ", + "type": "address" + }, + { + "name": "proposalStoppedOnHim", + "type": "uint256" } ], - "name": "vote", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "constant": false, - "inputs": [ - { - "name": "_name", - "type": "bytes32" - }, - { - "name": "_value", - "type": "uint256" - }, + "constant": true, + "inputs": [], + "name": "name", + "outputs": [ { - "name": "_data", + "name": "", "type": "bytes32" } ], - "name": "addProposal", - "outputs": [], - "payable": true, - "stateMutability": "payable", + "payable": false, + "stateMutability": "view", "type": "function" }, { - "constant": false, + "constant": true, "inputs": [], - "name": "askMembership", - "outputs": [], - "payable": true, - "stateMutability": "payable", + "name": "nbMembers", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], - "name": "fee", + "name": "nbMembershipReq", "outputs": [ { "name": "", @@ -372,7 +334,7 @@ { "constant": true, "inputs": [], - "name": "nbMembers", + "name": "nbProposalsFund", "outputs": [ { "name": "", @@ -385,12 +347,53 @@ }, { "constant": true, - "inputs": [], - "name": "statement", - "outputs": [ + "inputs": [ { "name": "", + "type": "uint256" + } + ], + "name": "proposals", + "outputs": [ + { + "name": "name", "type": "bytes32" + }, + { + "name": "voteYes", + "type": "uint256" + }, + { + "name": "voteNo", + "type": "uint256" + }, + { + "name": "recipient", + "type": "address" + }, + { + "name": "value", + "type": "uint256" + }, + { + "name": "data", + "type": "bytes32" + }, + { + "name": "proposalType", + "type": "uint8" + }, + { + "name": "endDate", + "type": "uint256" + }, + { + "name": "lastMemberCounted", + "type": "address" + }, + { + "name": "executed", + "type": "bool" } ], "payable": false, @@ -400,7 +403,7 @@ { "constant": true, "inputs": [], - "name": "nbProposalsFund", + "name": "registrationTime", "outputs": [ { "name": "", @@ -414,11 +417,11 @@ { "constant": true, "inputs": [], - "name": "nbMembershipReq", + "name": "statement", "outputs": [ { "name": "", - "type": "uint256" + "type": "bytes32" } ], "payable": false, @@ -426,45 +429,42 @@ "type": "function" }, { + "constant": true, "inputs": [ { - "name": "_name", - "type": "bytes32" - }, - { - "name": "_statement", - "type": "bytes32" - }, + "name": "proposalID", + "type": "uint256" + } + ], + "name": "timeLeft", + "outputs": [ { - "name": "initialMembers", - "type": "address[]" + "name": "", + "type": "uint256" } ], "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "payable": true, - "stateMutability": "payable", - "type": "fallback" + "stateMutability": "view", + "type": "function" }, { - "anonymous": false, + "constant": true, "inputs": [ { - "indexed": false, - "name": "donor", - "type": "address" - }, + "name": "", + "type": "uint256" + } + ], + "name": "voteLength", + "outputs": [ { - "indexed": false, - "name": "amount", + "name": "", "type": "uint256" } ], - "name": "Donated", - "type": "event" + "payable": false, + "stateMutability": "view", + "type": "function" } ], "bytecode": "0x608060405267016345785d8a00006002556301e133806006556040805190810160405280607860ff168152602001607860ff16815250600790600262000047929190620004ca565b50600a6009556000600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600b60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550348015620000de57600080fd5b506040516200210438038062002104833981018060405281019080805190602001909291908051906020019092919080518201929190505050600080846000816000191690555083600181600019169055505b8251821015620002a657600c600084848151811015156200014e57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020905042816000018190555060008214156200026757826000815181101515620001b757fe5b90602001906020020151600d60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508260008151811015156200021457fe5b90602001906020020151600d60010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506200029a565b6200029983838151811015156200027a57fe5b90602001906020020151620002e0640100000000026401000000009004565b5b81600101915062000131565b825160038190555060006003541415620002d557620002d433620002e0640100000000026401000000009004565b5b50505050506200053c565b42600c60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001819055506003600081546001019190508190555080600c6000600d60010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600d60010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600c60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600d60010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b826002810192821562000501579160200282015b8281111562000500578251829060ff16905591602001919060010190620004de565b5b50905062000510919062000514565b5090565b6200053991905b80821115620005355760008160009055506001016200051b565b5090565b90565b611bb8806200054c6000396000f300608060405260043610610133576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063013cf08b146101a057806306fdde031461029a57806308ae4b0c146102cd5780631364326c146103915780631e2e7a06146103c85780632b01bf51146103f35780633584fa381461044e578063379607f51461049e57806347cb7a68146104be5780634e395e2a146104ff5780636ac26d3d1461054457806372ead941146105715780638b112311146106015780638b7afe2e146106425780638f33df771461066d578063943e82161461069a578063a4ce48c0146106d4578063d664cd8914610710578063ddca3f431461071a578063e1bac4a014610745578063e42cb9f314610770578063e79979e5146107a3578063f1239663146107ce575b7f2a01595cddf097c90216094025db714da3f4e5bd8877b56ba86a24ecead8e5433334604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1005b3480156101ac57600080fd5b506101cb600480360381019080803590602001909291905050506107f9565b604051808b600019166000191681526020018a81526020018981526020018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001878152602001866000191660001916815260200185600181111561023b57fe5b60ff1681526020018481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001821515151581526020019a505050505050505050505060405180910390f35b3480156102a657600080fd5b506102af6108b6565b60405180826000191660001916815260200191505060405180910390f35b3480156102d957600080fd5b5061030e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506108bc565b604051808581526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200194505050505060405180910390f35b34801561039d57600080fd5b506103c6600480360381019080803590602001909291908035906020019092919050505061092c565b005b3480156103d457600080fd5b506103dd610dca565b6040518082815260200191505060405180910390f35b3480156103ff57600080fd5b50610434600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610dd0565b604051808215151515815260200191505060405180910390f35b34801561045a57600080fd5b5061049c600480360381019080803560ff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610e86565b005b6104bc60048036038101908080359060200190929190505050610f1c565b005b3480156104ca57600080fd5b506104e960048036038101908080359060200190929190505050611085565b6040518082815260200191505060405180910390f35b34801561050b57600080fd5b5061052a600480360381019080803590602001909291905050506110b6565b604051808215151515815260200191505060405180910390f35b34801561055057600080fd5b5061056f600480360381019080803590602001909291905050506111bc565b005b34801561057d57600080fd5b506105bf600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560ff169060200190929190505050611275565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561060d57600080fd5b5061062c600480360381019080803590602001909291905050506112f3565b6040518082815260200191505060405180910390f35b34801561064e57600080fd5b5061065761130d565b6040518082815260200191505060405180910390f35b34801561067957600080fd5b506106986004803603810190808035906020019092919050505061132c565b005b3480156106a657600080fd5b506106d260048036038101908080359060200190929190803560ff169060200190929190505050611359565b005b61070e6004803603810190808035600019169060200190929190803590602001909291908035600019169060200190929190505050611497565b005b61071861170a565b005b34801561072657600080fd5b5061072f611984565b6040518082815260200191505060405180910390f35b34801561075157600080fd5b5061075a61198a565b6040518082815260200191505060405180910390f35b34801561077c57600080fd5b50610785611990565b60405180826000191660001916815260200191505060405180910390f35b3480156107af57600080fd5b506107b8611996565b6040518082815260200191505060405180910390f35b3480156107da57600080fd5b506107e361199c565b6040518082815260200191505060405180910390f35b600f8181548110151561080857fe5b90600052602060002090600a02016000915090508060000154908060010154908060020154908060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060040154908060050154908060060160009054906101000a900460ff16908060070154908060080160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060080160149054906101000a900460ff1690508a565b60005481565b600c6020528060005260406000206000915090508060000154908060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050154905084565b600080600080600080600f8881548110151561094457fe5b90600052602060002090600a020195504286600701541115151561096757600080fd5b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168660080160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515156109e857600080fd5b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168660080160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610a8f57600d60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169450610ab7565b8560080160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1694505b5b60008780600190039850141515610dc057600c60008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209350849250610b1685610dd0565b15610d0a57600091505b600115610d05578560090160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905060006002811115610b8557fe5b816002811115610b9157fe5b1415610c9357600182019150600c60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018660060160009054906101000a900460ff166001811115610bfc57fe5b600281101515610c0857fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1692508473ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161480610c7c575060008373ffffffffffffffffffffffffffffffffffffffff16145b80610c88575060095482115b15610c9257610d05565b5b60016002811115610ca057fe5b816002811115610cac57fe5b1415610cca5760018660010160008282540192505081905550610d05565b600280811115610cd657fe5b816002811115610ce257fe5b1415610d005760018660020160008282540192505081905550610d05565b610b20565b610d0b565b5b8360040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16945060008573ffffffffffffffffffffffffffffffffffffffff161415610dbb57600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168660080160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550610dc0565b610ab8565b5050505050505050565b60065481565b600080600c60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001541415610e255760009050610e81565b42600654600c60008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000154011015610e7c5760009050610e81565b600190505b919050565b80600c60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018360ff16600281101515610ed957fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b600080600080600254803410151515610f3457600080fd5b600f86815481101515610f4357fe5b90600052602060002090600a020194508460030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16935084600401549250826002805402019150610f93866110b6565b1515610f9e57600080fd5b600015158560080160149054906101000a900460ff161515141515610fc257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16141515610ffc57600080fd5b60018560080160146101000a81548160ff02191690831515021790555060018560080160146101000a81548160ff0219169083151502179055508373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f1935050505015801561107c573d6000803e3d6000fd5b50505050505050565b600080600f8381548110151561109757fe5b90600052602060002090600a0201905042816007015403915050919050565b600080600f838154811015156110c857fe5b90600052602060002090600a02019050600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168160080160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561115c57600091506111b6565b8060080160149054906101000a900460ff161561117c57600091506111b6565b3073ffffffffffffffffffffffffffffffffffffffff1631816004015411156111a857600091506111b6565b806002015481600101541191505b50919050565b6000600f828154811015156111cd57fe5b90600052602060002090600a02019050600060018111156111ea57fe5b8160060160009054906101000a900460ff16600181111561120757fe5b14151561121357600080fd5b61121c826110b6565b151561122757600080fd5b60018160080160146101000a81548160ff0219169083151502179055506112718160030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166119a2565b5050565b6000600c60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018260ff166002811015156112c957fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905092915050565b60078160028110151561130257fe5b016000915090505481565b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b611356817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61092c565b50565b600061136433610dd0565b151561136f57600080fd5b600f8381548110151561137e57fe5b90600052602060002090600a020190506000600281111561139b57fe5b8160090160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1660028111156113f557fe5b14151561140157600080fd5b4281600701541015151561141457600080fd5b81600f8481548110151561142457fe5b90600052602060002090600a020160090160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083600281111561148d57fe5b0217905550505050565b6002548034101515156114a957600080fd5b7f2a01595cddf097c90216094025db714da3f4e5bd8877b56ba86a24ecead8e5433334604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1600f610140604051908101604052808660001916815260200160008152602001600081526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018581526020018460001916815260200160018081111561157357fe5b8152602001607842018152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152509080600181540180825580915050906001820390600052602060002090600a02016000909192909190915060008201518160000190600019169055602082015181600101556040820151816002015560608201518160030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506080820151816004015560a0820151816005019060001916905560c08201518160060160006101000a81548160ff0219169083600181111561167957fe5b021790555060e082015181600701556101008201518160080160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101208201518160080160146101000a81548160ff0219169083151502179055505050506004600081546001019190508190555050505050565b60025480341015151561171c57600080fd5b7f2a01595cddf097c90216094025db714da3f4e5bd8877b56ba86a24ecead8e5433334604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1600f61014060405190810160405280600060010260001916815260200160008152602001600081526020013373ffffffffffffffffffffffffffffffffffffffff168152602001600081526020016000600102600019168152602001600060018111156117f057fe5b8152602001607842018152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152509080600181540180825580915050906001820390600052602060002090600a02016000909192909190915060008201518160000190600019169055602082015181600101556040820151816002015560608201518160030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506080820151816004015560a0820151816005019060001916905560c08201518160060160006101000a81548160ff021916908360018111156118f657fe5b021790555060e082015181600701556101008201518160080160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101208201518160080160146101000a81548160ff0219169083151502179055505050506005600081546001019190508190555050565b60025481565b60035481565b60015481565b60045481565b60055481565b42600c60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001819055506003600081546001019190508190555080600c6000600d60010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600d60010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600c60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600d60010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505600a165627a7a72305820783dff459b2609e3a67d5bdff19038da3c1f728d073f34dd42ffda9543205ee60029", diff --git a/contracts/Abie.sol b/contracts/Abie.sol index 4322a8b..8be699e 100755 --- a/contracts/Abie.sol +++ b/contracts/Abie.sol @@ -1,9 +1,9 @@ //Part of this contract is from the solidity documentation pragma solidity ^0.4.8; -/** Prepare fore deploymets: +/** Prepare for deployments: * - * Add a *100 next to fee in askMembership + * Add a *100 fee to askMembership() * Switch fee to 0.01 ether * Set voteLenght = 15 days * diff --git a/src/app/Home.js b/src/app/Home.js index 457b865..b593e25 100755 --- a/src/app/Home.js +++ b/src/app/Home.js @@ -29,12 +29,14 @@ class Home extends Component { members: '', addresses: [ -{name: '0xeee060a985c02d330ba43735bd50f1ba259ac883', value: '0xeee060a985c02d330ba43735bd50f1ba259ac883'}, -{name: '0xce73d3bb0beb4e75bd214bd9f4311bd7cf489845', value: '0xce73d3bb0beb4e75bd214bd9f4311bd7cf489845'}, + + {name: '0x7f041abd5e84667b540370229b20a8fd4cdb8b09', value: '0x7f041abd5e84667b540370229b20a8fd4cdb8b09'}, + {name: '0xeee060a985c02d330ba43735bd50f1ba259ac883', value: '0xeee060a985c02d330ba43735bd50f1ba259ac883'}, + {name: '0xce73d3bb0beb4e75bd214bd9f4311bd7cf489845', value: '0xce73d3bb0beb4e75bd214bd9f4311bd7cf489845'}, {name: '0xf03003f0f1ca38b8d26b8be44469aba51f31d9f3', value: '0xf03003f0f1ca38b8d26b8be44469aba51f31d9f3'}, {name: '0xc42e30da7cb0087e6ad9200f876b084e8f72c040', value: '0xc42e30da7cb0087e6ad9200f876b084e8f72c040'}, {name:'Other', value: 'Other'} ], - search: '0xeee060a985c02d330ba43735bd50f1ba259ac883', + search: '0x7f041abd5e84667b540370229b20a8fd4cdb8b09', loading: false, searchBox: false } @@ -50,7 +52,7 @@ class Home extends Component { } else { alert("install Metamask or use Mist") } - }, 1000) + }, 200) } loadProposals = address => { @@ -263,7 +265,7 @@ class Home extends Component { return contract.addProposal(this.state.proposalName, web3.toWei(this.state.valueDeposit, "ether"), this.state.dataDeposit, { value: web3.toWei(0.001, "ether"), from: this.state.accounts[0], - gas: 4000000 + gas: 400000 }) }) .then(result => { @@ -287,7 +289,7 @@ class Home extends Component { return contract.vote(idx, 1, { value: 0, from: this.state.accounts[0], - gas: 4000000 + gas: 400000 }) }) .then(result => console.log(result)) @@ -305,7 +307,7 @@ class Home extends Component { return contract.vote(idx, 2, { value: 0, from: this.state.accounts[0], - gas: 4000000 + gas: 400000 }) }) .then(result => console.log(result)) @@ -364,7 +366,7 @@ class Home extends Component { .toString()} ETH
- {this.state.search} + {this.state.search}
@@ -428,7 +430,7 @@ class Home extends Component {