diff --git a/build/contracts/ContractManager.json b/build/contracts/ContractManager.json index 4daf6b5..43bdd8a 100755 --- a/build/contracts/ContractManager.json +++ b/build/contracts/ContractManager.json @@ -8,7 +8,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x715018a6" }, { "constant": true, @@ -22,7 +23,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8da5cb5b" }, { "constant": true, @@ -36,7 +38,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8f32d59b" }, { "constant": false, @@ -50,7 +53,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf2fde38b" }, { "anonymous": false, @@ -72,7 +76,8 @@ } ], "name": "VersionAdded", - "type": "event" + "type": "event", + "signature": "0x337b109e3f497728f2bdd27545c9ed1cb52ed4a4103cc94da88b868879c982e2" }, { "anonymous": false, @@ -99,7 +104,8 @@ } ], "name": "VersionUpdated", - "type": "event" + "type": "event", + "signature": "0x0acf3e1a00b57bfc05ebf65957f42293847dc0938bfa1744660d6df56036d751" }, { "anonymous": false, @@ -116,7 +122,8 @@ } ], "name": "VersionRecommended", - "type": "event" + "type": "event", + "signature": "0xb318550bf93edf51de4bae84db3deabd2a866cc407435a72317ca2503e2a07a6" }, { "anonymous": false, @@ -128,7 +135,8 @@ } ], "name": "RecommendedVersionRemoved", - "type": "event" + "type": "event", + "signature": "0x07b20feb74e0118ee3c73d4cb8d0eb4da169604c68aa233293b094cedcd225f2" }, { "anonymous": false, @@ -145,7 +153,8 @@ } ], "name": "OwnershipTransferred", - "type": "event" + "type": "event", + "signature": "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0" }, { "constant": false, @@ -171,7 +180,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x3de5311a" }, { "constant": false, @@ -197,7 +207,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x5c047fa2" }, { "constant": false, @@ -215,7 +226,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xca2e7cf3" }, { "constant": true, @@ -250,7 +262,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x7e27634e" }, { "constant": false, @@ -264,7 +277,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xacd820a8" }, { "constant": true, @@ -278,7 +292,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x751f592b" }, { "constant": true, @@ -297,7 +312,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xff93dab4" }, { "constant": true, @@ -316,7 +332,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9b534f18" }, { "constant": true, @@ -339,7 +356,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xaf2c7fa3" }, { "constant": true, @@ -378,7 +396,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8ad030c1" } ], "bytecode": "0x6080604052336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a361235d806100cf6000396000f3006080604052600436106100d0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633de5311a146100d55780635c047fa214610155578063715018a6146101c2578063751f592b146101d95780637e27634e146102045780638ad030c11461031c5780638da5cb5b1461044c5780638f32d59b146104a35780639b534f18146104d2578063acd820a814610578578063af2c7fa3146105b3578063ca2e7cf314610671578063f2fde38b146106c4578063ff93dab414610707575b600080fd5b3480156100e157600080fd5b50610153600480360381019080803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390803560ff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610756565b005b34801561016157600080fd5b506101c0600480360381019080803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390803560ff169060200190929190803560ff169060200190929190505050610e6d565b005b3480156101ce57600080fd5b506101d761134a565b005b3480156101e557600080fd5b506101ee61141c565b6040518082815260200191505060405180910390f35b34801561021057600080fd5b5061023d60048036038101908080359060200190820180359060200191909192939192939050505061142c565b604051808060200186600381111561025157fe5b60ff16815260200185600481111561026557fe5b60ff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001838152602001828103825287818151815260200191508051906020019080838360005b838110156102dd5780820151818401526020810190506102c2565b50505050905090810190601f16801561030a5780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390f35b34801561032857600080fd5b5061036d600480360381019080803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390505050611717565b604051808060200186600381111561038157fe5b60ff16815260200185600481111561039557fe5b60ff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001838152602001828103825287818151815260200191508051906020019080838360005b8381101561040d5780820151818401526020810190506103f2565b50505050905090810190601f16801561043a5780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390f35b34801561045857600080fd5b5061046161187b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156104af57600080fd5b506104b86118a4565b604051808215151515815260200191505060405180910390f35b3480156104de57600080fd5b506104fd600480360381019080803590602001909291905050506118fb565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561053d578082015181840152602081019050610522565b50505050905090810190601f16801561056a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561058457600080fd5b506105b16004803603810190808035906020019082018035906020019190919293919293905050506119b9565b005b3480156105bf57600080fd5b506105f660048036038101908080359060200190820180359060200191909192939192939080359060200190929190505050611b73565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561063657808201518184015260208101905061061b565b50505050905090810190601f1680156106635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561067d57600080fd5b506106c2600480360381019080803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390505050611c56565b005b3480156106d057600080fd5b50610705600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612062565b005b34801561071357600080fd5b50610740600480360381019080803590602001908201803590602001919091929391929390505050612081565b6040518082815260200191505060405180910390f35b61075e6118a4565b151561076957600080fd5b80600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610835576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001807f5468652070726f7669646564206164647265737320697320746865203020616481526020017f647265737300000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6000858590501115156108b0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f456d70747920737472696e67207061737365642061732076657273696f6e000081525060200191505060405180910390fd5b600087879050111515610951576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f456d70747920737472696e672070617373656420617320636f6e74726163742081526020017f6e616d650000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b61095a826120b7565b15156109f4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f43616e6e6f742073657420616e20696d706c656d656e746174696f6e20746f2081526020017f61206e6f6e2d636f6e747261637420616464726573730000000000000000000081525060400191505060405180910390fd5b6002878760405180838380828437820191505092505050908152602001604051809103902060009054906101000a900460ff161515610aae576001878790918060018154018082558091505090600182039060005260206000200160009091929390919293909192909192509190610a6d9291906121c4565b505060016002888860405180838380828437820191505092505050908152602001604051809103902060006101000a81548160ff0219169083151502179055505b600073ffffffffffffffffffffffffffffffffffffffff1660048888604051808383808284378201915050925050509081526020016040518091039020868660405180838380828437820191505092505050908152602001604051809103902060010160029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610be3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260238152602001807f56657273696f6e20616c72656164792065786973747320666f7220636f6e747281526020017f616374000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60038787604051808383808284378201915050925050509081526020016040518091039020858590918060018154018082558091505090600182039060005260206000200160009091929390919293909192909192509190610c469291906121c4565b505060a06040519081016040528086868080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050508152602001846003811115610c9857fe5b815260200160006004811115610caa57fe5b81526020018373ffffffffffffffffffffffffffffffffffffffff168152602001428152506004888860405180838380828437820191505092505050908152602001604051809103902086866040518083838082843782019150509250505090815260200160405180910390206000820151816000019080519060200190610d33929190612244565b5060208201518160010160006101000a81548160ff02191690836003811115610d5857fe5b021790555060408201518160010160016101000a81548160ff02191690836004811115610d8157fe5b021790555060608201518160010160026101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550608082015181600201559050508173ffffffffffffffffffffffffffffffffffffffff167f337b109e3f497728f2bdd27545c9ed1cb52ed4a4103cc94da88b868879c982e2888888886040518080602001806020018381038352878782818152602001925080828437820191505083810382528585828181526020019250808284378201915050965050505050505060405180910390a250505050505050565b610e756118a4565b1515610e8057600080fd5b85858080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050506002816040518082805190602001908083835b602083101515610eeb5780518252602082019150602081019050602083039250610ec6565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060009054906101000a900460ff161515610fa0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e747261637420646f6573206e6f7420657869737473000000000000000081525060200191505060405180910390fd5b86868080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505085858080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050600073ffffffffffffffffffffffffffffffffffffffff166004836040518082805190602001908083835b6020831015156110565780518252602082019150602081019050602083039250611031565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020826040518082805190602001908083835b6020831015156110bf578051825260208201915060208101905060208303925061109a565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060010160029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515156111c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f56657273696f6e20646f6573206e6f742065786973747320666f7220636f6e7481526020017f726163740000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b8460048a8a604051808383808284378201915050925050509081526020016040518091039020888860405180838380828437820191505092505050908152602001604051809103902060010160006101000a81548160ff0219169083600381111561122f57fe5b02179055508360048a8a604051808383808284378201915050925050509081526020016040518091039020888860405180838380828437820191505092505050908152602001604051809103902060010160016101000a81548160ff0219169083600481111561129b57fe5b02179055507f0acf3e1a00b57bfc05ebf65957f42293847dc0938bfa1744660d6df56036d7518989898989896040518080602001806020018560038111156112df57fe5b60ff1681526020018460048111156112f357fe5b60ff16815260200183810383528989828181526020019250808284378201915050838103825287878281815260200192508082843782019150509850505050505050505060405180910390a1505050505050505050565b6113526118a4565b151561135d57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b6000600180549050905080905090565b6060600080600080600087878080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050506002816040518082805190602001908083835b6020831015156114a1578051825260208201915060208101905060208303925061147c565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060009054906101000a900460ff161515611556576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e747261637420646f6573206e6f7420657869737473000000000000000081525060200191505060405180910390fd5b600589896040518083838082843782019150509250505090815260200160405180910390208054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561160f5780601f106115e45761010080835404028352916020019161160f565b820191906000526020600020905b8154815290600101906020018083116115f257829003601f168201915b5050505050965060048989604051808383808284378201915050925050509081526020016040518091039020876040518082805190602001908083835b602083101515611671578051825260208201915060208101905060208303925061164c565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902091508160010160009054906101000a900460ff1695508160010160019054906101000a900460ff1694508160010160029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1693508160020154925086868686869650965096509650965050509295509295909350565b6060600080600080600060048a8a60405180838380828437820191505092505050908152602001604051809103902088886040518083838082843782019150509250505090815260200160405180910390209050806000018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156118035780601f106117d857610100808354040283529160200191611803565b820191906000526020600020905b8154815290600101906020018083116117e657829003601f168201915b505050505095508060010160009054906101000a900460ff1694508060010160019054906101000a900460ff1693508060010160029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1692508060020154915085858585859550955095509550955050945094509450945094565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b606060018281548110151561190c57fe5b906000526020600020018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156119aa5780601f1061197f576101008083540402835291602001916119aa565b820191906000526020600020905b81548152906001019060200180831161198d57829003601f168201915b50505050509050809050919050565b6119c16118a4565b15156119cc57600080fd5b81818080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050506002816040518082805190602001908083835b602083101515611a375780518252602082019150602081019050602083039250611a12565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060009054906101000a900460ff161515611aec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e747261637420646f6573206e6f7420657869737473000000000000000081525060200191505060405180910390fd5b600583836040518083838082843782019150509250505090815260200160405180910390206000611b1d91906122c4565b7f07b20feb74e0118ee3c73d4cb8d0eb4da169604c68aa233293b094cedcd225f28383604051808060200182810382528484828181526020019250808284378201915050935050505060405180910390a1505050565b60606003848460405180838380828437820191505092505050908152602001604051809103902082815481101515611ba757fe5b906000526020600020018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015611c455780601f10611c1a57610100808354040283529160200191611c45565b820191906000526020600020905b815481529060010190602001808311611c2857829003601f168201915b505050505090508090509392505050565b611c5e6118a4565b1515611c6957600080fd5b83838080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050506002816040518082805190602001908083835b602083101515611cd45780518252602082019150602081019050602083039250611caf565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060009054906101000a900460ff161515611d89576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e747261637420646f6573206e6f7420657869737473000000000000000081525060200191505060405180910390fd5b84848080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505083838080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050600073ffffffffffffffffffffffffffffffffffffffff166004836040518082805190602001908083835b602083101515611e3f5780518252602082019150602081019050602083039250611e1a565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020826040518082805190602001908083835b602083101515611ea85780518252602082019150602081019050602083039250611e83565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060010160029054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515611fb1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f56657273696f6e20646f6573206e6f742065786973747320666f7220636f6e7481526020017f726163740000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b8484600589896040518083838082843782019150509250505090815260200160405180910390209190611fe59291906121c4565b507fb318550bf93edf51de4bae84db3deabd2a866cc407435a72317ca2503e2a07a6878787876040518080602001806020018381038352878782818152602001925080828437820191505083810382528585828181526020019250808284378201915050965050505050505060405180910390a150505050505050565b61206a6118a4565b151561207557600080fd5b61207e816120ca565b50565b60006003838360405180838380828437820191505092505050908152602001604051809103902080549050905080905092915050565b600080823b905060008111915050919050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561210657600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061220557803560ff1916838001178555612233565b82800160010185558215612233579182015b82811115612232578235825591602001919060010190612217565b5b509050612240919061230c565b5090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061228557805160ff19168380011785556122b3565b828001600101855582156122b3579182015b828111156122b2578251825591602001919060010190612297565b5b5090506122c0919061230c565b5090565b50805460018160011615610100020316600290046000825580601f106122ea5750612309565b601f016020900490600052602060002090810190612308919061230c565b5b50565b61232e91905b8082111561232a576000816000905550600101612312565b5090565b905600a165627a7a72305820aa6844997f41f951c9295263216d4996e5cad1058f323a4a829061dbfda598410029", @@ -13253,7 +13272,26 @@ "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-02-26T06:26:12.992Z" + "networks": { + "1554199358609": { + "events": {}, + "links": {}, + "address": "0xa500C297184F4085F459152634FA1C17644ea10a", + "transactionHash": "0x665059d0afe0931d29f3c3e1e2d87b6bbc01cb142b0260cb89b91380d57289da" + }, + "1554199463123": { + "events": {}, + "links": {}, + "address": "0xa500C297184F4085F459152634FA1C17644ea10a", + "transactionHash": "0x665059d0afe0931d29f3c3e1e2d87b6bbc01cb142b0260cb89b91380d57289da" + }, + "1554199545405": { + "events": {}, + "links": {}, + "address": "0xa500C297184F4085F459152634FA1C17644ea10a", + "transactionHash": "0x665059d0afe0931d29f3c3e1e2d87b6bbc01cb142b0260cb89b91380d57289da" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:50.963Z" } \ No newline at end of file diff --git a/build/contracts/Escrow_v1_0.json b/build/contracts/Escrow_v1_0.json index bbe31d0..78e8f57 100755 --- a/build/contracts/Escrow_v1_0.json +++ b/build/contracts/Escrow_v1_0.json @@ -54,7 +54,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x642f2eaf" }, { "constant": true, @@ -68,7 +69,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb77bf600" }, { "anonymous": false, @@ -90,7 +92,8 @@ } ], "name": "Executed", - "type": "event" + "type": "event", + "signature": "0x688e2a1b34445bcd47b0e11ba2a9c8c4d850a1831b64199b59d1c70e29701545" }, { "anonymous": false, @@ -112,7 +115,8 @@ } ], "name": "FundAdded", - "type": "event" + "type": "event", + "signature": "0xf66fd2ae9e24a6a24b02e1b5b7512ffde5149a4176085fc0298ae228c9b9d729" }, { "anonymous": false, @@ -134,7 +138,8 @@ } ], "name": "Funded", - "type": "event" + "type": "event", + "signature": "0xce7089d0668849fb9ca29778c0cbf1e764d9efb048d81fd71fb34c94f26db368" }, { "constant": false, @@ -172,7 +177,8 @@ "outputs": [], "payable": true, "stateMutability": "payable", - "type": "function" + "type": "function", + "signature": "0x23b6fd3f" }, { "constant": false, @@ -218,7 +224,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x57bced76" }, { "constant": true, @@ -241,7 +248,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb0550c66" }, { "constant": true, @@ -264,7 +272,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf0786562" }, { "constant": false, @@ -278,7 +287,8 @@ "outputs": [], "payable": true, "stateMutability": "payable", - "type": "function" + "type": "function", + "signature": "0x2d9ef96e" }, { "constant": false, @@ -296,7 +306,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xb719e280" }, { "constant": true, @@ -315,7 +326,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xbe84ceaf" }, { "constant": false, @@ -349,7 +361,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xe4ec8b00" }, { "constant": true, @@ -392,54 +405,55 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x46fbcdeb" } ], "bytecode": "0x6080604052600060015534801561001557600080fd5b5061443c806100256000396000f3006080604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806323b6fd3f146100b45780632d9ef96e1461016e57806346fbcdeb1461019257806357bced7614610287578063642f2eaf14610378578063b0550c66146104da578063b719e28014610543578063b77bf6001461057e578063be84ceaf146105a9578063e4ec8b0014610641578063f0786562146106ea575b600080fd5b61016c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560ff169060200190929190803563ffffffff169060200190929190803560001916906020019092919080356bffffffffffffffffffffffff19169060200190929190505050610753565b005b61019060048036038101908080356000191690602001909291905050506109a7565b005b34801561019e57600080fd5b5061026960048036038101908080356bffffffffffffffffffffffff19169060200190929190803560ff169060200190929190803563ffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610e02565b60405180826000191660001916815260200191505060405180910390f35b34801561029357600080fd5b50610376600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560ff169060200190929190803563ffffffff16906020019092919080356000191690602001909291908035906020019092919080356bffffffffffffffffffffffff19169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506112ae565b005b34801561038457600080fd5b506103a76004803603810190808035600019169060200190929190505050611783565b604051808b81526020018a81526020018960018111156103c357fe5b60ff1681526020018860018111156103d757fe5b60ff1681526020018760ff1660ff1681526020018663ffffffff1663ffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019a505050505050505050505060405180910390f35b3480156104e657600080fd5b506105296004803603810190808035600019169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061188e565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061057c600480360381019080803560001916906020019092919080359060200190929190505050611900565b005b34801561058a57600080fd5b50610593611f97565b6040518082815260200191505060405180910390f35b3480156105b557600080fd5b506105ea600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611f9d565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561062d578082015181840152602081019050610612565b505050509050019250505060405180910390f35b34801561064d57600080fd5b506106e86004803603810190808035906020019082018035906020019190919293919293908035906020019082018035906020019190919293919293908035906020019082018035906020019190919293919293908035600019169060200190929190803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390505050612038565b005b3480156106f657600080fd5b506107396004803603810190808035600019169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612621565b604051808215151515815260200191505060405180910390f35b8160008060008360001916600019168152602001908152602001600020600001541415156107e9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f5472616e73616374696f6e20657869737473000000000000000000000000000081525060200191505060405180910390fd5b87600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561088f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b87600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610935576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b6109488a8a8a8a8a8a348b600080612693565b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fce7089d0668849fb9ca29778c0cbf1e764d9efb048d81fd71fb34c94f26db368346040518082815260200191505060405180910390a350505050505050505050565b80600080600083600019166000191681526020019081526020016000206000015414151515610a3e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b8160006001811115610a4c57fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff166001811115610a8257fe5b141515610b1d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b826000806001811115610b2c57fe5b600080846000191660001916815260200190815260200160002060020160019054906101000a900460ff166001811115610b6257fe5b141515610bd7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f5472616e73616374696f6e207479706520646f6573206e6f74206d617463680081525060200191505060405180910390fd5b84600080826000191660001916815260200190815260200160002060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610cde576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f54686520696e69746961746f72206f6620746865207472616e73616374696f6e81526020017f206973206e6f742062757965720000000000000000000000000000000000000081525060400191505060405180910390fd5b600034111515610d56576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f56616c7565206d7573742062652067726561746572207468616e207a65726f2e81525060200191505060405180910390fd5b610d863460008089600019166000191681526020019081526020016000206000015461308b90919063ffffffff16565b6000808860001916600019168152602001908152602001600020600001819055503373ffffffffffffffffffffffffffffffffffffffff1686600019167ff66fd2ae9e24a6a24b02e1b5b7512ffde5149a4176085fc0298ae228c9b9d729346040518082815260200191505060405180910390a3505050505050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561104e578787878787873060405160200180886bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018760ff1660ff167f01000000000000000000000000000000000000000000000000000000000000000281526001018663ffffffff1663ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014019750505050505050506040516020818303038152906040526040518082805190602001908083835b60208310151561101a5780518252602082019150602081019050602083039250610ff5565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090506112a3565b878787878787308860405160200180896bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018860ff1660ff167f01000000000000000000000000000000000000000000000000000000000000000281526001018763ffffffff1663ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401985050505050505050506040516020818303038152906040526040518082805190602001908083835b602083101515611273578051825260208201915060208101905060208303925061124e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090505b979650505050505050565b6000846000806000836000191660001916815260200190815260200160002060000154141515611346576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f5472616e73616374696f6e20657869737473000000000000000000000000000081525060200191505060405180910390fd5b8a600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156113ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b8a600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515611492576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b84600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515611538576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b61154b8e8e8e8e8e8e8e8e60018f612693565b8594508473ffffffffffffffffffffffffffffffffffffffff166323b872dd33308b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561162557600080fd5b505af1158015611639573d6000803e3d6000fd5b505050506040513d602081101561164f57600080fd5b81019080805190602001909291905050501515611720576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252605d8152602001807f546f6b656e207472616e73666572206661696c65642c206d6179626520796f7581526020017f20646964206e6f7420617070726f766520657363726f7720636f6e747261637481526020017f20746f207370656e64206f6e20626568616c66206f662073656e64657200000081525060600191505060405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff1689600019167fce7089d0668849fb9ca29778c0cbf1e764d9efb048d81fd71fb34c94f26db3688a6040518082815260200191505060405180910390a35050505050505050505050505050565b60006020528060005260406000206000915090508060000154908060010154908060020160009054906101000a900460ff16908060020160019054906101000a900460ff16908060020160029054906101000a900460ff16908060020160039054906101000a900463ffffffff16908060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508a565b6000806000846000191660001916815260200190815260200160002060080160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600082600080600083600019166000191681526020019081526020016000206000015414151515611999576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b83600060018111156119a757fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff1660018111156119dd57fe5b141515611a78576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b846001806001811115611a8757fe5b600080846000191660001916815260200190815260200160002060020160019054906101000a900460ff166001811115611abd57fe5b141515611b32576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f5472616e73616374696f6e207479706520646f6573206e6f74206d617463680081525060200191505060405180910390fd5b86600080826000191660001916815260200190815260200160002060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515611c39576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f54686520696e69746961746f72206f6620746865207472616e73616374696f6e81526020017f206973206e6f742062757965720000000000000000000000000000000000000081525060400191505060405180910390fd5b600087111515611cb1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f56616c7565206d7573742062652067726561746572207468616e207a65726f2e81525060200191505060405180910390fd5b600080896000191660001916815260200190815260200160002060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1695508573ffffffffffffffffffffffffffffffffffffffff166323b872dd33308a6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611dc857600080fd5b505af1158015611ddc573d6000803e3d6000fd5b505050506040513d6020811015611df257600080fd5b81019080805190602001909291905050501515611ee9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260648152602001807f546f6b656e207472616e73666572206661696c65642c206d6179626520796f7581526020017f20646964206e6f7420617070726f76652074686520657363726f7720636f6e7481526020017f7261637420746f207370656e64206f6e20626568616c66206f6620746865206281526020017f757965720000000000000000000000000000000000000000000000000000000081525060800191505060405180910390fd5b611f19876000808b600019166000191681526020019081526020016000206000015461308b90919063ffffffff16565b6000808a60001916600019168152602001908152602001600020600001819055503373ffffffffffffffffffffffffffffffffffffffff1688600019167ff66fd2ae9e24a6a24b02e1b5b7512ffde5149a4176085fc0298ae228c9b9d729896040518082815260200191505060405180910390a35050505050505050565b60015481565b6060600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561202c57602002820191906000526020600020905b81546000191681526020019060010190808311612014575b50505050509050919050565b846000806000836000191660001916815260200190815260200160002060000154141515156120cf576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b85600060018111156120dd57fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff16600181111561211357fe5b1415156121ae576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008686905011151561224f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f4e756d626572206f662064657374696e6174696f6e73206d757374206265206781526020017f726561746572207468616e20300000000000000000000000000000000000000081525060400191505060405180910390fd5b83839050868690501415156122f2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260378152602001807f4e756d626572206f662064657374696e6174696f6e73206d757374206d61746381526020017f68206e756d626572206f662076616c7565732073656e7400000000000000000081525060400191505060405180910390fd5b6123eb8d8d808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508c8c808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508b8b808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508a8a8a808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508989808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050506130ac565b6001600080896000191660001916815260200190815260200160002060020160006101000a81548160ff0219169083600181111561242557fe5b0217905550426000808960001916600019168152602001908152602001600020600101819055506000808860001916600019168152602001908152602001600020600001546124d38888888080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505087878080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505061332c565b141515612594576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260488152602001807f546f74616c2076616c756520746f2062652072656c6561736564206d7573742081526020017f626520657175616c20746f20746865207472616e73616374696f6e206573637281526020017f6f772076616c756500000000000000000000000000000000000000000000000081525060600191505060405180910390fd5b86600019167f688e2a1b34445bcd47b0e11ba2a9c8c4d850a1831b64199b59d1c70e29701545878787876040518080602001806020018381038352878782818152602001925060200280828437820191505083810382528585828181526020019250602002808284378201915050965050505050505060405180910390a250505050505050505050505050565b6000806000846000191660001916815260200190815260200160002060070160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b8873ffffffffffffffffffffffffffffffffffffffff168a73ffffffffffffffffffffffffffffffffffffffff1614151515612737576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f427579657220616e642073656c6c6572206172652073616d650000000000000081525060200191505060405180910390fd5b6000841115156127af576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f56616c756520706173736564206973203000000000000000000000000000000081525060200191505060405180910390fd5b60008760ff1611151561282a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f5468726573686f6c64206d7573742062652067726561746572207468616e203081525060200191505060405180910390fd5b60038760ff16111515156128cc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f5468726573686f6c64206d757374206e6f74206265206772656174657220746881526020017f616e20330000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60018760ff16148061290b5750600073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614155b15156129cb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260488152602001807f456974686572207468726573686f6c642073686f756c642062652031206f722081526020017f76616c6964206d6f64657261746f7220616464726573732073686f756c64206281526020017f652070617373656400000000000000000000000000000000000000000000000081525060600191505060405180910390fd5b6129da8388888d8d8d87610e02565b600019168560001916141515612a7e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260398152602001807f43616c63756c6174656420736372697074206861736820646f6573206e6f742081526020017f6d61746368207061737365642073637269707420686173682e0000000000000081525060400191505060405180910390fd5b6101406040519081016040528085815260200142815260200160006001811115612aa457fe5b8152602001836001811115612ab557fe5b81526020018860ff1681526020018763ffffffff1681526020018b73ffffffffffffffffffffffffffffffffffffffff1681526020018a73ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1681526020018973ffffffffffffffffffffffffffffffffffffffff168152506000808760001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020160006101000a81548160ff02191690836001811115612b8f57fe5b021790555060608201518160020160016101000a81548160ff02191690836001811115612bb857fe5b021790555060808201518160020160026101000a81548160ff021916908360ff16021790555060a08201518160020160036101000a81548163ffffffff021916908363ffffffff16021790555060c08201518160020160076101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060e08201518160030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101008201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101208201518160050160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509050506001600080876000191660001916815260200190815260200160002060060160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506001600080876000191660001916815260200190815260200160002060060160008c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600080866000191660001916815260200190815260200160002060060160008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515612f0f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f456974686572206275796572206f722073656c6c65722069732070617373656481526020017f206173206d6f64657261746f720000000000000000000000000000000000000081525060400191505060405180910390fd5b60018760ff161115612f8f576001600080876000191660001916815260200190815260200160002060060160008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505b600160008154809291906001019190505550600260008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020859080600181540180825580915050906001820390600052602060002001600090919290919091509060001916905550600260008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002085908060018154018082558091505090600182039060005260206000200160009091929091909150906000191690555050505050505050505050565b60008082840190508381101515156130a257600080fd5b8091505092915050565b60006130bc878787878787613c84565b613110600080866000191660001916815260200190815260200160002060020160039054906101000a900463ffffffff1660008087600019166000191681526020019081526020016000206001015461435d565b9050600080856000191660001916815260200190815260200160002060020160029054906101000a900460ff1660ff1687511015613323578015156131e3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260378152602001807f4d696e206e756d626572206f662073696773206e6f742070726573656e74206181526020017f6e642074696d656c6f636b206e6f74206578706972656400000000000000000081525060400191505060405180910390fd5b60008085600019166000191681526020019081526020016000206007016000806000876000191660001916815260200190815260200160002060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613322576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f4d696e206e756d626572206f662073696773206e6f742070726573656e74206181526020017f6e642073656c6c657220646964206e6f74207369676e0000000000000000000081525060400191505060405180910390fd5b5b50505050505050565b6000806000806000806000808a600019166000191681526020019081526020016000209450600093506000600181111561336257fe5b8560020160019054906101000a900460ff16600181111561337f57fe5b141561374e57600092505b875183101561374957600073ffffffffffffffffffffffffffffffffffffffff1688848151811015156133b957fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1614151515613475576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f7a65726f2061646472657373206973206e6f7420616c6c6f776564206173206481526020017f657374696e6174696f6e2061646472657373000000000000000000000000000081525060400191505060405180910390fd5b846006016000898581518110151561348957fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613575576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f81526020017f6620746865206f776e657273000000000000000000000000000000000000000081525060400191505060405180910390fd5b6000878481518110151561358557fe5b9060200190602002015111151561362a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602a8152602001807f416d6f756e7420746f2062652073656e742073686f756c64206265206772656181526020017f746572207468616e20300000000000000000000000000000000000000000000081525060400191505060405180910390fd5b613654878481518110151561363b57fe5b906020019060200201518561308b90919063ffffffff16565b935060018560080160008a8681518110151561366c57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555087838151811015156136d557fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc888581518110151561370657fe5b906020019060200201519081150290604051600060405180830381858888f1935050505015801561373b573d6000803e3d6000fd5b50828060010193505061338a565b613c75565b60018081111561375a57fe5b8560020160019054906101000a900460ff16600181111561377757fe5b1415613c74578460040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150600090505b8751811015613c7357600073ffffffffffffffffffffffffffffffffffffffff1688828151811015156137d857fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1614151515613894576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f7a65726f2061646472657373206973206e6f7420616c6c6f776564206173206481526020017f657374696e6174696f6e2061646472657373000000000000000000000000000081525060400191505060405180910390fd5b84600601600089838151811015156138a857fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613994576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f81526020017f6620746865206f776e657273000000000000000000000000000000000000000081525060400191505060405180910390fd5b600087828151811015156139a457fe5b90602001906020020151111515613a49576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602a8152602001807f416d6f756e7420746f2062652073656e742073686f756c64206265206772656181526020017f746572207468616e20300000000000000000000000000000000000000000000081525060400191505060405180910390fd5b613a738782815181101515613a5a57fe5b906020019060200201518561308b90919063ffffffff16565b935060018560080160008a84815181101515613a8b57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8983815181101515613b1057fe5b906020019060200201518984815181101515613b2857fe5b906020019060200201516040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015613bb757600080fd5b505af1158015613bcb573d6000803e3d6000fd5b505050506040513d6020811015613be157600080fd5b81019080805190602001909291905050501515613c66576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e207472616e73666572206661696c65642e0000000000000000000081525060200191505060405180910390fd5b80806001019150506137a9565b5b5b83955050505050509392505050565b600080600086518851141515613d02576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f522c53206c656e677468206d69736d617463680000000000000000000000000081525060200191505060405180910390fd5b88518851141515613d7b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f522c56206c656e677468206d69736d617463680000000000000000000000000081525060200191505060405180910390fd5b60197f01000000000000000000000000000000000000000000000000000000000000000260007f0100000000000000000000000000000000000000000000000000000000000000023087878a60405160200180877effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101867effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526001018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401848051906020019060200280838360005b83811015613ecf578082015181840152602081019050613eb4565b50505050905001838051906020019060200280838360005b83811015613f02578082015181840152602081019050613ee7565b50505050905001826000191660001916815260200196505050505050506040516020818303038152906040526040518082805190602001908083835b602083101515613f635780518252602082019150602081019050602083039250613f3e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060405160200180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c0182600019166000191681526020019150506040516020818303038152906040526040518082805190602001908083835b6020831015156140145780518252602082019150602081019050602083039250613fef565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390209250600091505b8751821015614352576001838a8481518110151561406257fe5b906020019060200201518a8581518110151561407a57fe5b906020019060200201518a8681518110151561409257fe5b90602001906020020151604051600081526020016040526040518085600019166000191681526020018460ff1660ff1681526020018360001916600019168152602001826000191660001916815260200194505050505060206040516020810390808403906000865af115801561410d573d6000803e3d6000fd5b505050602060405103519050600080876000191660001916815260200190815260200160002060060160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156141f5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f496e76616c6964207369676e617475726500000000000000000000000000000081525060200191505060405180910390fd5b600080876000191660001916815260200190815260200160002060070160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156142d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f53616d65207369676e61747572652073656e742074776963650000000000000081525060200191505060405180910390fd5b6001600080886000191660001916815260200190815260200160002060070160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508180600101925050614048565b505050505050505050565b60008061437383426143b190919063ffffffff16565b905060008463ffffffff16146143a55761439e610e108563ffffffff166143d290919063ffffffff16565b81116143a8565b60005b91505092915050565b6000808383111515156143c357600080fd5b82840390508091505092915050565b60008060008414156143e75760009150614409565b82840290508284828115156143f857fe5b0414151561440557600080fd5b8091505b50929150505600a165627a7a72305820d2f574ccdd4189c4e2b023ed50dbe60a8c217b2688d25c6ae67d3b99ec97fb810029", "deployedBytecode": "0x6080604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806323b6fd3f146100b45780632d9ef96e1461016e57806346fbcdeb1461019257806357bced7614610287578063642f2eaf14610378578063b0550c66146104da578063b719e28014610543578063b77bf6001461057e578063be84ceaf146105a9578063e4ec8b0014610641578063f0786562146106ea575b600080fd5b61016c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560ff169060200190929190803563ffffffff169060200190929190803560001916906020019092919080356bffffffffffffffffffffffff19169060200190929190505050610753565b005b61019060048036038101908080356000191690602001909291905050506109a7565b005b34801561019e57600080fd5b5061026960048036038101908080356bffffffffffffffffffffffff19169060200190929190803560ff169060200190929190803563ffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610e02565b60405180826000191660001916815260200191505060405180910390f35b34801561029357600080fd5b50610376600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560ff169060200190929190803563ffffffff16906020019092919080356000191690602001909291908035906020019092919080356bffffffffffffffffffffffff19169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506112ae565b005b34801561038457600080fd5b506103a76004803603810190808035600019169060200190929190505050611783565b604051808b81526020018a81526020018960018111156103c357fe5b60ff1681526020018860018111156103d757fe5b60ff1681526020018760ff1660ff1681526020018663ffffffff1663ffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019a505050505050505050505060405180910390f35b3480156104e657600080fd5b506105296004803603810190808035600019169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061188e565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061057c600480360381019080803560001916906020019092919080359060200190929190505050611900565b005b34801561058a57600080fd5b50610593611f97565b6040518082815260200191505060405180910390f35b3480156105b557600080fd5b506105ea600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611f9d565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561062d578082015181840152602081019050610612565b505050509050019250505060405180910390f35b34801561064d57600080fd5b506106e86004803603810190808035906020019082018035906020019190919293919293908035906020019082018035906020019190919293919293908035906020019082018035906020019190919293919293908035600019169060200190929190803590602001908201803590602001919091929391929390803590602001908201803590602001919091929391929390505050612038565b005b3480156106f657600080fd5b506107396004803603810190808035600019169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612621565b604051808215151515815260200191505060405180910390f35b8160008060008360001916600019168152602001908152602001600020600001541415156107e9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f5472616e73616374696f6e20657869737473000000000000000000000000000081525060200191505060405180910390fd5b87600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561088f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b87600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610935576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b6109488a8a8a8a8a8a348b600080612693565b3373ffffffffffffffffffffffffffffffffffffffff1685600019167fce7089d0668849fb9ca29778c0cbf1e764d9efb048d81fd71fb34c94f26db368346040518082815260200191505060405180910390a350505050505050505050565b80600080600083600019166000191681526020019081526020016000206000015414151515610a3e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b8160006001811115610a4c57fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff166001811115610a8257fe5b141515610b1d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b826000806001811115610b2c57fe5b600080846000191660001916815260200190815260200160002060020160019054906101000a900460ff166001811115610b6257fe5b141515610bd7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f5472616e73616374696f6e207479706520646f6573206e6f74206d617463680081525060200191505060405180910390fd5b84600080826000191660001916815260200190815260200160002060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610cde576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f54686520696e69746961746f72206f6620746865207472616e73616374696f6e81526020017f206973206e6f742062757965720000000000000000000000000000000000000081525060400191505060405180910390fd5b600034111515610d56576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f56616c7565206d7573742062652067726561746572207468616e207a65726f2e81525060200191505060405180910390fd5b610d863460008089600019166000191681526020019081526020016000206000015461308b90919063ffffffff16565b6000808860001916600019168152602001908152602001600020600001819055503373ffffffffffffffffffffffffffffffffffffffff1686600019167ff66fd2ae9e24a6a24b02e1b5b7512ffde5149a4176085fc0298ae228c9b9d729346040518082815260200191505060405180910390a3505050505050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561104e578787878787873060405160200180886bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018760ff1660ff167f01000000000000000000000000000000000000000000000000000000000000000281526001018663ffffffff1663ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014019750505050505050506040516020818303038152906040526040518082805190602001908083835b60208310151561101a5780518252602082019150602081019050602083039250610ff5565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090506112a3565b878787878787308860405160200180896bffffffffffffffffffffffff19166bffffffffffffffffffffffff191681526014018860ff1660ff167f01000000000000000000000000000000000000000000000000000000000000000281526001018763ffffffff1663ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401985050505050505050506040516020818303038152906040526040518082805190602001908083835b602083101515611273578051825260208201915060208101905060208303925061124e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090505b979650505050505050565b6000846000806000836000191660001916815260200190815260200160002060000154141515611346576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f5472616e73616374696f6e20657869737473000000000000000000000000000081525060200191505060405180910390fd5b8a600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156113ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b8a600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515611492576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b84600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515611538576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b61154b8e8e8e8e8e8e8e8e60018f612693565b8594508473ffffffffffffffffffffffffffffffffffffffff166323b872dd33308b6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b15801561162557600080fd5b505af1158015611639573d6000803e3d6000fd5b505050506040513d602081101561164f57600080fd5b81019080805190602001909291905050501515611720576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252605d8152602001807f546f6b656e207472616e73666572206661696c65642c206d6179626520796f7581526020017f20646964206e6f7420617070726f766520657363726f7720636f6e747261637481526020017f20746f207370656e64206f6e20626568616c66206f662073656e64657200000081525060600191505060405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff1689600019167fce7089d0668849fb9ca29778c0cbf1e764d9efb048d81fd71fb34c94f26db3688a6040518082815260200191505060405180910390a35050505050505050505050505050565b60006020528060005260406000206000915090508060000154908060010154908060020160009054906101000a900460ff16908060020160019054906101000a900460ff16908060020160029054906101000a900460ff16908060020160039054906101000a900463ffffffff16908060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060050160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508a565b6000806000846000191660001916815260200190815260200160002060080160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600082600080600083600019166000191681526020019081526020016000206000015414151515611999576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b83600060018111156119a757fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff1660018111156119dd57fe5b141515611a78576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b846001806001811115611a8757fe5b600080846000191660001916815260200190815260200160002060020160019054906101000a900460ff166001811115611abd57fe5b141515611b32576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f5472616e73616374696f6e207479706520646f6573206e6f74206d617463680081525060200191505060405180910390fd5b86600080826000191660001916815260200190815260200160002060020160079054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515611c39576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f54686520696e69746961746f72206f6620746865207472616e73616374696f6e81526020017f206973206e6f742062757965720000000000000000000000000000000000000081525060400191505060405180910390fd5b600087111515611cb1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f56616c7565206d7573742062652067726561746572207468616e207a65726f2e81525060200191505060405180910390fd5b600080896000191660001916815260200190815260200160002060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1695508573ffffffffffffffffffffffffffffffffffffffff166323b872dd33308a6040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050602060405180830381600087803b158015611dc857600080fd5b505af1158015611ddc573d6000803e3d6000fd5b505050506040513d6020811015611df257600080fd5b81019080805190602001909291905050501515611ee9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260648152602001807f546f6b656e207472616e73666572206661696c65642c206d6179626520796f7581526020017f20646964206e6f7420617070726f76652074686520657363726f7720636f6e7481526020017f7261637420746f207370656e64206f6e20626568616c66206f6620746865206281526020017f757965720000000000000000000000000000000000000000000000000000000081525060800191505060405180910390fd5b611f19876000808b600019166000191681526020019081526020016000206000015461308b90919063ffffffff16565b6000808a60001916600019168152602001908152602001600020600001819055503373ffffffffffffffffffffffffffffffffffffffff1688600019167ff66fd2ae9e24a6a24b02e1b5b7512ffde5149a4176085fc0298ae228c9b9d729896040518082815260200191505060405180910390a35050505050505050565b60015481565b6060600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561202c57602002820191906000526020600020905b81546000191681526020019060010190808311612014575b50505050509050919050565b846000806000836000191660001916815260200190815260200160002060000154141515156120cf576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f5472616e73616374696f6e20646f6573206e6f7420657869737400000000000081525060200191505060405180910390fd5b85600060018111156120dd57fe5b600080836000191660001916815260200190815260200160002060020160009054906101000a900460ff16600181111561211357fe5b1415156121ae576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5472616e73616374696f6e206973206e6f7420696e2046554e4445442073746181526020017f746500000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008686905011151561224f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f4e756d626572206f662064657374696e6174696f6e73206d757374206265206781526020017f726561746572207468616e20300000000000000000000000000000000000000081525060400191505060405180910390fd5b83839050868690501415156122f2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260378152602001807f4e756d626572206f662064657374696e6174696f6e73206d757374206d61746381526020017f68206e756d626572206f662076616c7565732073656e7400000000000000000081525060400191505060405180910390fd5b6123eb8d8d808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508c8c808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508b8b808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508a8a8a808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050508989808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050506130ac565b6001600080896000191660001916815260200190815260200160002060020160006101000a81548160ff0219169083600181111561242557fe5b0217905550426000808960001916600019168152602001908152602001600020600101819055506000808860001916600019168152602001908152602001600020600001546124d38888888080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505087878080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505061332c565b141515612594576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260488152602001807f546f74616c2076616c756520746f2062652072656c6561736564206d7573742081526020017f626520657175616c20746f20746865207472616e73616374696f6e206573637281526020017f6f772076616c756500000000000000000000000000000000000000000000000081525060600191505060405180910390fd5b86600019167f688e2a1b34445bcd47b0e11ba2a9c8c4d850a1831b64199b59d1c70e29701545878787876040518080602001806020018381038352878782818152602001925060200280828437820191505083810382528585828181526020019250602002808284378201915050965050505050505060405180910390a250505050505050505050505050565b6000806000846000191660001916815260200190815260200160002060070160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b8873ffffffffffffffffffffffffffffffffffffffff168a73ffffffffffffffffffffffffffffffffffffffff1614151515612737576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f427579657220616e642073656c6c6572206172652073616d650000000000000081525060200191505060405180910390fd5b6000841115156127af576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f56616c756520706173736564206973203000000000000000000000000000000081525060200191505060405180910390fd5b60008760ff1611151561282a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f5468726573686f6c64206d7573742062652067726561746572207468616e203081525060200191505060405180910390fd5b60038760ff16111515156128cc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f5468726573686f6c64206d757374206e6f74206265206772656174657220746881526020017f616e20330000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60018760ff16148061290b5750600073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614155b15156129cb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260488152602001807f456974686572207468726573686f6c642073686f756c642062652031206f722081526020017f76616c6964206d6f64657261746f7220616464726573732073686f756c64206281526020017f652070617373656400000000000000000000000000000000000000000000000081525060600191505060405180910390fd5b6129da8388888d8d8d87610e02565b600019168560001916141515612a7e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260398152602001807f43616c63756c6174656420736372697074206861736820646f6573206e6f742081526020017f6d61746368207061737365642073637269707420686173682e0000000000000081525060400191505060405180910390fd5b6101406040519081016040528085815260200142815260200160006001811115612aa457fe5b8152602001836001811115612ab557fe5b81526020018860ff1681526020018763ffffffff1681526020018b73ffffffffffffffffffffffffffffffffffffffff1681526020018a73ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1681526020018973ffffffffffffffffffffffffffffffffffffffff168152506000808760001916600019168152602001908152602001600020600082015181600001556020820151816001015560408201518160020160006101000a81548160ff02191690836001811115612b8f57fe5b021790555060608201518160020160016101000a81548160ff02191690836001811115612bb857fe5b021790555060808201518160020160026101000a81548160ff021916908360ff16021790555060a08201518160020160036101000a81548163ffffffff021916908363ffffffff16021790555060c08201518160020160076101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060e08201518160030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101008201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101208201518160050160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509050506001600080876000191660001916815260200190815260200160002060060160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506001600080876000191660001916815260200190815260200160002060060160008c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600080866000191660001916815260200190815260200160002060060160008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515612f0f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602d8152602001807f456974686572206275796572206f722073656c6c65722069732070617373656481526020017f206173206d6f64657261746f720000000000000000000000000000000000000081525060400191505060405180910390fd5b60018760ff161115612f8f576001600080876000191660001916815260200190815260200160002060060160008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505b600160008154809291906001019190505550600260008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020859080600181540180825580915050906001820390600052602060002001600090919290919091509060001916905550600260008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002085908060018154018082558091505090600182039060005260206000200160009091929091909150906000191690555050505050505050505050565b60008082840190508381101515156130a257600080fd5b8091505092915050565b60006130bc878787878787613c84565b613110600080866000191660001916815260200190815260200160002060020160039054906101000a900463ffffffff1660008087600019166000191681526020019081526020016000206001015461435d565b9050600080856000191660001916815260200190815260200160002060020160029054906101000a900460ff1660ff1687511015613323578015156131e3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260378152602001807f4d696e206e756d626572206f662073696773206e6f742070726573656e74206181526020017f6e642074696d656c6f636b206e6f74206578706972656400000000000000000081525060400191505060405180910390fd5b60008085600019166000191681526020019081526020016000206007016000806000876000191660001916815260200190815260200160002060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613322576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260368152602001807f4d696e206e756d626572206f662073696773206e6f742070726573656e74206181526020017f6e642073656c6c657220646964206e6f74207369676e0000000000000000000081525060400191505060405180910390fd5b5b50505050505050565b6000806000806000806000808a600019166000191681526020019081526020016000209450600093506000600181111561336257fe5b8560020160019054906101000a900460ff16600181111561337f57fe5b141561374e57600092505b875183101561374957600073ffffffffffffffffffffffffffffffffffffffff1688848151811015156133b957fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1614151515613475576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f7a65726f2061646472657373206973206e6f7420616c6c6f776564206173206481526020017f657374696e6174696f6e2061646472657373000000000000000000000000000081525060400191505060405180910390fd5b846006016000898581518110151561348957fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613575576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f81526020017f6620746865206f776e657273000000000000000000000000000000000000000081525060400191505060405180910390fd5b6000878481518110151561358557fe5b9060200190602002015111151561362a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602a8152602001807f416d6f756e7420746f2062652073656e742073686f756c64206265206772656181526020017f746572207468616e20300000000000000000000000000000000000000000000081525060400191505060405180910390fd5b613654878481518110151561363b57fe5b906020019060200201518561308b90919063ffffffff16565b935060018560080160008a8681518110151561366c57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555087838151811015156136d557fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc888581518110151561370657fe5b906020019060200201519081150290604051600060405180830381858888f1935050505015801561373b573d6000803e3d6000fd5b50828060010193505061338a565b613c75565b60018081111561375a57fe5b8560020160019054906101000a900460ff16600181111561377757fe5b1415613c74578460040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150600090505b8751811015613c7357600073ffffffffffffffffffffffffffffffffffffffff1688828151811015156137d857fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1614151515613894576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260328152602001807f7a65726f2061646472657373206973206e6f7420616c6c6f776564206173206481526020017f657374696e6174696f6e2061646472657373000000000000000000000000000081525060400191505060405180910390fd5b84600601600089838151811015156138a857fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515613994576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f81526020017f6620746865206f776e657273000000000000000000000000000000000000000081525060400191505060405180910390fd5b600087828151811015156139a457fe5b90602001906020020151111515613a49576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602a8152602001807f416d6f756e7420746f2062652073656e742073686f756c64206265206772656181526020017f746572207468616e20300000000000000000000000000000000000000000000081525060400191505060405180910390fd5b613a738782815181101515613a5a57fe5b906020019060200201518561308b90919063ffffffff16565b935060018560080160008a84815181101515613a8b57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff1663a9059cbb8983815181101515613b1057fe5b906020019060200201518984815181101515613b2857fe5b906020019060200201516040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015613bb757600080fd5b505af1158015613bcb573d6000803e3d6000fd5b505050506040513d6020811015613be157600080fd5b81019080805190602001909291905050501515613c66576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e207472616e73666572206661696c65642e0000000000000000000081525060200191505060405180910390fd5b80806001019150506137a9565b5b5b83955050505050509392505050565b600080600086518851141515613d02576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f522c53206c656e677468206d69736d617463680000000000000000000000000081525060200191505060405180910390fd5b88518851141515613d7b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f522c56206c656e677468206d69736d617463680000000000000000000000000081525060200191505060405180910390fd5b60197f01000000000000000000000000000000000000000000000000000000000000000260007f0100000000000000000000000000000000000000000000000000000000000000023087878a60405160200180877effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152600101867effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526001018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401848051906020019060200280838360005b83811015613ecf578082015181840152602081019050613eb4565b50505050905001838051906020019060200280838360005b83811015613f02578082015181840152602081019050613ee7565b50505050905001826000191660001916815260200196505050505050506040516020818303038152906040526040518082805190602001908083835b602083101515613f635780518252602082019150602081019050602083039250613f3e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060405160200180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c0182600019166000191681526020019150506040516020818303038152906040526040518082805190602001908083835b6020831015156140145780518252602082019150602081019050602083039250613fef565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390209250600091505b8751821015614352576001838a8481518110151561406257fe5b906020019060200201518a8581518110151561407a57fe5b906020019060200201518a8681518110151561409257fe5b90602001906020020151604051600081526020016040526040518085600019166000191681526020018460ff1660ff1681526020018360001916600019168152602001826000191660001916815260200194505050505060206040516020810390808403906000865af115801561410d573d6000803e3d6000fd5b505050602060405103519050600080876000191660001916815260200190815260200160002060060160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156141f5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f496e76616c6964207369676e617475726500000000000000000000000000000081525060200191505060405180910390fd5b600080876000191660001916815260200190815260200160002060070160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156142d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f53616d65207369676e61747572652073656e742074776963650000000000000081525060200191505060405180910390fd5b6001600080886000191660001916815260200190815260200160002060070160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508180600101925050614048565b505050505050505050565b60008061437383426143b190919063ffffffff16565b905060008463ffffffff16146143a55761439e610e108563ffffffff166143d290919063ffffffff16565b81116143a8565b60005b91505092915050565b6000808383111515156143c357600080fd5b82840390508091505092915050565b60008060008414156143e75760009150614409565b82840290508284828115156143f857fe5b0414151561440557600080fd5b8091505b50929150505600a165627a7a72305820d2f574ccdd4189c4e2b023ed50dbe60a8c217b2688d25c6ae67d3b99ec97fb810029", - "sourceMap": "603:20735:0:-;;;1801:1;1767:35;;603:20735;8:9:-1;5:2;;;30:1;27;20:12;5:2;603:20735:0;;;;;;;", - "deployedSourceMap": "603:20735:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3916:693;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7847:507;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12159:1017;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12159:1017:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5577:1030;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5577:1030:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1709:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1709:51:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6854:221;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6854:221:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8693:821;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8693:821:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1767:35;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1767:35:0;;;;;;;;;;;;;;;;;;;;;;;9631:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9631:190:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;9631:190:0;;;;;;;;;;;;;;;;;10425:1189;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10425:1189:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7315:194;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7315:194:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3916:693;4193:10;2226:1;2192:12;:24;2205:10;2192:24;;;;;;;;;;;;;;;;;:30;;;:35;2184:66;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4228:5;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4258:6;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4280:264;4309:5;4328:6;4348:9;4371;4394:12;4420:10;4444:9;4467:8;4489:21;4532:1;4280:15;:264::i;:::-;4579:10;4560:41;;4567:10;4560:41;;;;4591:9;4560:41;;;;;;;;;;;;;;;;;;2608:1;2260;3916:693;;;;;;;;:::o;7847:507::-;7971:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8005:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8046:10;8058:21;2806:15;2762:59;;;;;;;;:12;:24;2775:10;2762:24;;;;;;;;;;;;;;;;;:40;;;;;;;;;;;;:59;;;;;;;;;2741:137;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8099:10;2986:12;:24;2999:10;2986:24;;;;;;;;;;;;;;;;;:30;;;;;;;;;;;;2972:44;;:10;:44;;;2951:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8147:1;8135:9;:13;8127:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8229;8277:9;8229:12;:24;8242:10;8229:24;;;;;;;;;;;;;;;;;:30;;;:47;;:58;;;;:::i;:::-;8196:12;:24;8209:10;8196:24;;;;;;;;;;;;;;;;;:30;;:91;;;;8325:10;8303:44;;8313:10;8303:44;;;;8337:9;8303:44;;;;;;;;;;;;;;;;;;2888:1;2466;;2107;7847:507;;:::o;12159:1017::-;12429:7;12480:1;12456:26;;:12;:26;;;12452:718;;;12570:8;12600:9;12631:12;12665:5;12692:6;12720:9;12759:4;12532:250;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12532:250:0;;;12505:291;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12505:291:0;;;;;;;;;;;;;;;;12498:298;;;;12452:718;12899:8;12929:9;12960:12;12994:5;13021:6;13049:9;13088:4;13115:12;12861:284;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12861:284:0;;;12834:325;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12834:325:0;;;;;;;;;;;;;;;;12827:332;;12159:1017;;;;;;;;;;:::o;5577:1030::-;6294:20;5896:10;2226:1;2192:12;:24;2205:10;2192:24;;;;;;;;;;;;;;;;;:30;;;:35;2184:66;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5931:5;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5961:6;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5992:12;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6021:262;6050:5;6069:6;6089:9;6112;6135:12;6161:10;6185:5;6204:8;6226:21;6261:12;6021:15;:262::i;:::-;6332:12;6294:51;;6377:5;:18;;;6396:10;6416:4;6423:5;6377:52;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6377:52:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6377:52:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6377:52:0;;;;;;;;;;;;;;;;6356:192;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6582:10;6563:37;;6570:10;6563:37;;;;6594:5;6563:37;;;;;;;;;;;;;;;;;;2608:1;;2260;5577:1030;;;;;;;;;;;:::o;1709:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6854:221::-;6990:4;7017:12;:24;7030:10;7017:24;;;;;;;;;;;;;;;;;:38;;:51;7056:11;7017:51;;;;;;;;;;;;;;;;;;;;;;;;;7010:58;;6854:221;;;;:::o;8693:821::-;9045:20;8825:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8859:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8900:10;8912:21;2806:15;2762:59;;;;;;;;:12;:24;2775:10;2762:24;;;;;;;;;;;;;;;;;:40;;;;;;;;;;;;:59;;;;;;;;;2741:137;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8953:10;2986:12;:24;2999:10;2986:24;;;;;;;;;;;;;;;;;:30;;;;;;;;;;;;2972:44;;:10;:44;;;2951:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8996:1;8988:5;:9;8980:54;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9096:12;:24;9109:10;9096:24;;;;;;;;;;;;;;;;;:37;;;;;;;;;;;;9045:98;;9175:5;:18;;;9194:10;9214:4;9221:5;9175:52;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9175:52:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9175:52:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9175:52:0;;;;;;;;;;;;;;;;9154:199;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9397:54;9445:5;9397:12;:24;9410:10;9397:24;;;;;;;;;;;;;;;;;:30;;;:47;;:54;;;;:::i;:::-;9364:12;:24;9377:10;9364:24;;;;;;;;;;;;;;;;;:30;;:87;;;;9489:10;9467:40;;9477:10;9467:40;;;;9501:5;9467:40;;;;;;;;;;;;;;;;;;2888:1;2466;;2107;8693:821;;;;:::o;1767:35::-;;;;:::o;9631:190::-;9750:9;9782:18;:32;9801:12;9782:32;;;;;;;;;;;;;;;9775:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9631:190;;;:::o;10425:1189::-;10648:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10682:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10752:1;10730:12;;:19;;:23;10709:115;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10878:7;;:14;;10855:12;;:19;;:37;10834:139;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10984:153;11016:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11034:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11052:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11070:10;11094:12;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11120:7;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:18;:153::i;:::-;11182:15;11148:12;:24;11161:10;11148:24;;;;;;;;;;;;;;;;;:31;;;:49;;;;;;;;;;;;;;;;;;;;;;;;11321:15;11281:12;:24;11294:10;11281:24;;;;;;;;;;;;;;;;;:37;;:55;;;;11420:12;:24;11433:10;11420:24;;;;;;;;;;;;;;;;;:30;;;11367:49;11382:10;11394:12;;11367:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11408:7;;11367:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:14;:49::i;:::-;:83;11346:202;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11573:10;11564:43;;;;11585:12;;11599:7;;11564:43;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2107:1;10425:1189;;;;;;;;;;;;:::o;7315:194::-;7438:4;7465:12;:24;7478:10;7465:24;;;;;;;;;;;;;;;;;:30;;:37;7496:5;7465:37;;;;;;;;;;;;;;;;;;;;;;;;;7458:44;;7315:194;;;;:::o;18853:2483::-;19207:6;19198:15;;:5;:15;;;;19190:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19318:1;19310:5;:9;19302:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19443:1;19431:9;:13;;;19423:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19512:1;19499:9;:14;;;;19491:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19717:1;19704:9;:14;;;:41;;;;19743:1;19722:23;;:9;:23;;;;19704:41;19683:160;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19889:226;19932:8;19958:9;19985:12;20015:5;20038:6;20062:9;20089:12;19889:25;:226::i;:::-;19875:240;;;:10;:240;;;;19854:344;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20236:373;;;;;;;;;20357:5;20236:373;;;;20425:15;20236:373;;;;20384:13;20236:373;;;;;;;;;;;;20544:15;20236:373;;;;;;;;;;;;20465:9;20236:373;;;;;;20502:12;20236:373;;;;;;20269:5;20236:373;;;;;;20296:6;20236:373;;;;;;20586:12;20236:373;;;;;;20327:9;20236:373;;;;;20209:12;:24;20222:10;20209:24;;;;;;;;;;;;;;;;;:400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20663:4;20620:12;:24;20633:10;20620:24;;;;;;;;;;;;;;;;;:32;;:40;20653:6;20620:40;;;;;;;;;;;;;;;;:47;;;;;;;;;;;;;;;;;;20719:4;20677:12;:24;20690:10;20677:24;;;;;;;;;;;;;;;;;:32;;:39;20710:5;20677:39;;;;;;;;;;;;;;;;:46;;;;;;;;;;;;;;;;;;20819:12;:24;20832:10;20819:24;;;;;;;;;;;;;;;;;:32;;:43;20852:9;20819:43;;;;;;;;;;;;;;;;;;;;;;;;;20818:44;20797:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;21116:1;21104:9;:13;;;21100:94;;;21179:4;21133:12;:24;21146:10;21133:24;;;;;;;;;;;;;;;;;:32;;:43;21166:9;21133:43;;;;;;;;;;;;;;;;:50;;;;;;;;;;;;;;;;;;21100:94;21205:16;;:18;;;;;;;;;;;;;21234;:25;21253:5;21234:25;;;;;;;;;;;;;;;21265:10;21234:42;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;21234:42:0;;;;;;;;;;;;;;;;;;;;;;;;;;;21286:18;:26;21305:6;21286:26;;;;;;;;;;;;;;;21318:10;21286:43;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;21286:43:0;;;;;;;;;;;;;;;;;;;;;;;;;;;18853:2483;;;;;;;;;;:::o;1272:131:4:-;1330:7;1345:9;1361:1;1357;:5;1345:17;;1381:1;1376;:6;;1368:15;;;;;;;;1397:1;1390:8;;1272:131;;;;;:::o;13460:1108:0:-;13844:20;13681:152;13712:4;13730;13748;13766:10;13790:12;13816:7;13681:17;:152::i;:::-;13867:130;13899:12;:24;13912:10;13899:24;;;;;;;;;;;;;;;;;:37;;;;;;;;;;;;13950:12;:24;13963:10;13950:24;;;;;;;;;;;;;;;;;:37;;;13867:18;:130::i;:::-;13844:153;;14197:12;:24;14210:10;14197:24;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;14183:48;;:4;:11;:48;14179:383;;;14252:15;14251:16;14247:305;;;14287:65;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14247:305;14390:12;:24;14403:10;14390:24;;;;;;;;;;;;;;;;;:30;;:63;14421:12;:24;14434:10;14421:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;14390:63;;;;;;;;;;;;;;;;;;;;;;;;;14389:64;14385:167;;;14473:64;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14385:167;14179:383;13460:1108;;;;;;;:::o;14700:2163::-;14848:7;14871:21;14930:24;15036:9;15879:20;15952:9;14895:12;:24;14908:10;14895:24;;;;;;;;;;;;;;;;;14871:48;;14957:1;14930:28;;14994:21;14973:42;;;;;;;;:1;:17;;;;;;;;;;;;:42;;;;;;;;;14969:1855;;;15048:1;15036:13;;15031:768;15055:12;:19;15051:1;:23;15031:768;;;15156:1;15129:29;;:12;15142:1;15129:15;;;;;;;;;;;;;;;;;;:29;;;;15100:150;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15298:1;:9;;:26;15308:12;15321:1;15308:15;;;;;;;;;;;;;;;;;;15298:26;;;;;;;;;;;;;;;;;;;;;;;;;15269:141;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15471:1;15458:7;15466:1;15458:10;;;;;;;;;;;;;;;;;;:14;15429:127;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15594:32;15615:7;15623:1;15615:10;;;;;;;;;;;;;;;;;;15594:16;:20;;:32;;;;:::i;:::-;15575:51;;15726:4;15691:1;:15;;:32;15707:12;15720:1;15707:15;;;;;;;;;;;;;;;;;;15691:32;;;;;;;;;;;;;;;;:39;;;;;;;;;;;;;;;;;;15748:12;15761:1;15748:15;;;;;;;;;;;;;;;;;;:24;;:36;15773:7;15781:1;15773:10;;;;;;;;;;;;;;;;;;15748:36;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15748:36:0;15076:3;;;;;;;15031:768;;;14969:1855;;;15841:21;15820:42;;;;;;;;:1;:17;;;;;;;;;;;;:42;;;;;;;;;15816:1008;;;15917:1;:14;;;;;;;;;;;;15879:53;;15964:1;15952:13;;15947:867;15969:12;:19;15967:1;:21;15947:867;;;16070:1;16043:29;;:12;16056:1;16043:15;;;;;;;;;;;;;;;;;;:29;;;;16014:150;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16212:1;:9;;:26;16222:12;16235:1;16222:15;;;;;;;;;;;;;;;;;;16212:26;;;;;;;;;;;;;;;;;;;;;;;;;16183:141;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16385:1;16372:7;16380:1;16372:10;;;;;;;;;;;;;;;;;;:14;16343:127;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16508:32;16529:7;16537:1;16529:10;;;;;;;;;;;;;;;;;;16508:16;:20;;:32;;;;:::i;:::-;16489:51;;16640:4;16605:1;:15;;:32;16621:12;16634:1;16621:15;;;;;;;;;;;;;;;;;;16605:32;;;;;;;;;;;;;;;;:39;;;;;;;;;;;;;;;;;;16692:5;:14;;;16707:12;16720:1;16707:15;;;;;;;;;;;;;;;;;;16724:7;16732:1;16724:10;;;;;;;;;;;;;;;;;;16692:43;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16692:43:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16692:43:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16692:43:0;;;;;;;;;;;;;;;;16663:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15990:3;;;;;;;15947:867;;;15816:1008;14969:1855;16840:16;16833:23;;14700:2163;;;;;;;;;;:::o;16985:1456::-;17429:14;17897:6;17946:17;17227:4;:11;17212:4;:11;:26;17204:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17295:4;:11;17280:4;:11;:26;17272:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17633:4;17628:10;;17669:1;17664:7;;17705:4;17736:12;17774:7;17807:10;17586:253;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;17586:253:0;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;17586:253:0;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17586:253:0;;;17555:302;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17555:302:0;;;;;;;;;;;;;;;;17469:402;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17469:402:0;;;17446:435;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17446:435:0;;;;;;;;;;;;;;;;17429:452;;17906:1;17897:10;;17892:543;17913:4;:11;17909:1;:15;17892:543;;;17966:122;17993:6;18017:4;18022:1;18017:7;;;;;;;;;;;;;;;;;;18042:4;18047:1;18042:7;;;;;;;;;;;;;;;;;;18067:4;18072:1;18067:7;;;;;;;;;;;;;;;;;;17966:122;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;17966:122:0;;;;;;;;17946:142;;18128:12;:24;18141:10;18128:24;;;;;;;;;;;;;;;;;:32;;:43;18161:9;18128:43;;;;;;;;;;;;;;;;;;;;;;;;;18103:119;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18262:12;:24;18275:10;18262:24;;;;;;;;;;;;;;;;;:30;;:41;18293:9;18262:41;;;;;;;;;;;;;;;;;;;;;;;;;18261:42;18236:126;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18420:4;18376:12;:24;18389:10;18376:24;;;;;;;;;;;;;;;;;:30;;:41;18407:9;18376:41;;;;;;;;;;;;;;;;:48;;;;;;;;;;;;;;;;;;17926:3;;;;;;;17892:543;;;16985:1456;;;;;;;;;:::o;18447:319::-;18586:4;18606:17;18626:21;18634:12;18626:3;:7;;:21;;;;:::i;:::-;18606:41;;18694:1;18678:12;:17;;;:71;;18718:31;18744:4;18726:12;18718:21;;:25;;:31;;;;:::i;:::-;18706:9;:43;18678:71;;;18698:5;18678:71;18657:102;;18447:319;;;;;:::o;1078:131:4:-;1136:7;1172:9;1164:1;1159;:6;;1151:15;;;;;;;;1188:1;1184;:5;1172:17;;1203:1;1196:8;;1078:131;;;;;:::o;204:381::-;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o", + "sourceMap": "603:20735:1:-;;;1801:1;1767:35;;603:20735;8:9:-1;5:2;;;30:1;27;20:12;5:2;603:20735:1;;;;;;;", + "deployedSourceMap": "603:20735:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3916:693;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7847:507;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12159:1017;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12159:1017:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5577:1030;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5577:1030:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1709:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1709:51:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6854:221;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6854:221:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8693:821;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8693:821:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1767:35;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1767:35:1;;;;;;;;;;;;;;;;;;;;;;;9631:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9631:190:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;9631:190:1;;;;;;;;;;;;;;;;;10425:1189;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10425:1189:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7315:194;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7315:194:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3916:693;4193:10;2226:1;2192:12;:24;2205:10;2192:24;;;;;;;;;;;;;;;;;:30;;;:35;2184:66;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4228:5;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4258:6;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4280:264;4309:5;4328:6;4348:9;4371;4394:12;4420:10;4444:9;4467:8;4489:21;4532:1;4280:15;:264::i;:::-;4579:10;4560:41;;4567:10;4560:41;;;;4591:9;4560:41;;;;;;;;;;;;;;;;;;2608:1;2260;3916:693;;;;;;;;:::o;7847:507::-;7971:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8005:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8046:10;8058:21;2806:15;2762:59;;;;;;;;:12;:24;2775:10;2762:24;;;;;;;;;;;;;;;;;:40;;;;;;;;;;;;:59;;;;;;;;;2741:137;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8099:10;2986:12;:24;2999:10;2986:24;;;;;;;;;;;;;;;;;:30;;;;;;;;;;;;2972:44;;:10;:44;;;2951:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8147:1;8135:9;:13;8127:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8229;8277:9;8229:12;:24;8242:10;8229:24;;;;;;;;;;;;;;;;;:30;;;:47;;:58;;;;:::i;:::-;8196:12;:24;8209:10;8196:24;;;;;;;;;;;;;;;;;:30;;:91;;;;8325:10;8303:44;;8313:10;8303:44;;;;8337:9;8303:44;;;;;;;;;;;;;;;;;;2888:1;2466;;2107;7847:507;;:::o;12159:1017::-;12429:7;12480:1;12456:26;;:12;:26;;;12452:718;;;12570:8;12600:9;12631:12;12665:5;12692:6;12720:9;12759:4;12532:250;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12532:250:1;;;12505:291;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12505:291:1;;;;;;;;;;;;;;;;12498:298;;;;12452:718;12899:8;12929:9;12960:12;12994:5;13021:6;13049:9;13088:4;13115:12;12861:284;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;12861:284:1;;;12834:325;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;12834:325:1;;;;;;;;;;;;;;;;12827:332;;12159:1017;;;;;;;;;;:::o;5577:1030::-;6294:20;5896:10;2226:1;2192:12;:24;2205:10;2192:24;;;;;;;;;;;;;;;;;:30;;;:35;2184:66;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5931:5;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5961:6;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5992:12;2572:1;2546:28;;:14;:28;;;;2538:60;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6021:262;6050:5;6069:6;6089:9;6112;6135:12;6161:10;6185:5;6204:8;6226:21;6261:12;6021:15;:262::i;:::-;6332:12;6294:51;;6377:5;:18;;;6396:10;6416:4;6423:5;6377:52;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6377:52:1;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6377:52:1;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6377:52:1;;;;;;;;;;;;;;;;6356:192;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6582:10;6563:37;;6570:10;6563:37;;;;6594:5;6563:37;;;;;;;;;;;;;;;;;;2608:1;;2260;5577:1030;;;;;;;;;;;:::o;1709:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6854:221::-;6990:4;7017:12;:24;7030:10;7017:24;;;;;;;;;;;;;;;;;:38;;:51;7056:11;7017:51;;;;;;;;;;;;;;;;;;;;;;;;;7010:58;;6854:221;;;;:::o;8693:821::-;9045:20;8825:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8859:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8900:10;8912:21;2806:15;2762:59;;;;;;;;:12;:24;2775:10;2762:24;;;;;;;;;;;;;;;;;:40;;;;;;;;;;;;:59;;;;;;;;;2741:137;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8953:10;2986:12;:24;2999:10;2986:24;;;;;;;;;;;;;;;;;:30;;;;;;;;;;;;2972:44;;:10;:44;;;2951:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8996:1;8988:5;:9;8980:54;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9096:12;:24;9109:10;9096:24;;;;;;;;;;;;;;;;;:37;;;;;;;;;;;;9045:98;;9175:5;:18;;;9194:10;9214:4;9221:5;9175:52;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9175:52:1;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9175:52:1;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;9175:52:1;;;;;;;;;;;;;;;;9154:199;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9397:54;9445:5;9397:12;:24;9410:10;9397:24;;;;;;;;;;;;;;;;;:30;;;:47;;:54;;;;:::i;:::-;9364:12;:24;9377:10;9364:24;;;;;;;;;;;;;;;;;:30;;:87;;;;9489:10;9467:40;;9477:10;9467:40;;;;9501:5;9467:40;;;;;;;;;;;;;;;;;;2888:1;2466;;2107;8693:821;;;;:::o;1767:35::-;;;;:::o;9631:190::-;9750:9;9782:18;:32;9801:12;9782:32;;;;;;;;;;;;;;;9775:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9631:190;;;:::o;10425:1189::-;10648:10;2056:1;2022:12;:24;2035:10;2022:24;;;;;;;;;;;;;;;;;:30;;;:35;;2001:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10682:10;2383:13;2348:48;;;;;;;;:12;:24;2361:10;2348:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;:48;;;;;;;;;2327:129;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10752:1;10730:12;;:19;;:23;10709:115;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10878:7;;:14;;10855:12;;:19;;:37;10834:139;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10984:153;11016:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11034:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11052:4;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11070:10;11094:12;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11120:7;;10984:153;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:18;:153::i;:::-;11182:15;11148:12;:24;11161:10;11148:24;;;;;;;;;;;;;;;;;:31;;;:49;;;;;;;;;;;;;;;;;;;;;;;;11321:15;11281:12;:24;11294:10;11281:24;;;;;;;;;;;;;;;;;:37;;:55;;;;11420:12;:24;11433:10;11420:24;;;;;;;;;;;;;;;;;:30;;;11367:49;11382:10;11394:12;;11367:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11408:7;;11367:49;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:14;:49::i;:::-;:83;11346:202;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11573:10;11564:43;;;;11585:12;;11599:7;;11564:43;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2107:1;10425:1189;;;;;;;;;;;;:::o;7315:194::-;7438:4;7465:12;:24;7478:10;7465:24;;;;;;;;;;;;;;;;;:30;;:37;7496:5;7465:37;;;;;;;;;;;;;;;;;;;;;;;;;7458:44;;7315:194;;;;:::o;18853:2483::-;19207:6;19198:15;;:5;:15;;;;19190:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19318:1;19310:5;:9;19302:39;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19443:1;19431:9;:13;;;19423:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19512:1;19499:9;:14;;;;19491:63;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19717:1;19704:9;:14;;;:41;;;;19743:1;19722:23;;:9;:23;;;;19704:41;19683:160;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19889:226;19932:8;19958:9;19985:12;20015:5;20038:6;20062:9;20089:12;19889:25;:226::i;:::-;19875:240;;;:10;:240;;;;19854:344;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20236:373;;;;;;;;;20357:5;20236:373;;;;20425:15;20236:373;;;;20384:13;20236:373;;;;;;;;;;;;20544:15;20236:373;;;;;;;;;;;;20465:9;20236:373;;;;;;20502:12;20236:373;;;;;;20269:5;20236:373;;;;;;20296:6;20236:373;;;;;;20586:12;20236:373;;;;;;20327:9;20236:373;;;;;20209:12;:24;20222:10;20209:24;;;;;;;;;;;;;;;;;:400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20663:4;20620:12;:24;20633:10;20620:24;;;;;;;;;;;;;;;;;:32;;:40;20653:6;20620:40;;;;;;;;;;;;;;;;:47;;;;;;;;;;;;;;;;;;20719:4;20677:12;:24;20690:10;20677:24;;;;;;;;;;;;;;;;;:32;;:39;20710:5;20677:39;;;;;;;;;;;;;;;;:46;;;;;;;;;;;;;;;;;;20819:12;:24;20832:10;20819:24;;;;;;;;;;;;;;;;;:32;;:43;20852:9;20819:43;;;;;;;;;;;;;;;;;;;;;;;;;20818:44;20797:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;21116:1;21104:9;:13;;;21100:94;;;21179:4;21133:12;:24;21146:10;21133:24;;;;;;;;;;;;;;;;;:32;;:43;21166:9;21133:43;;;;;;;;;;;;;;;;:50;;;;;;;;;;;;;;;;;;21100:94;21205:16;;:18;;;;;;;;;;;;;21234;:25;21253:5;21234:25;;;;;;;;;;;;;;;21265:10;21234:42;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;21234:42:1;;;;;;;;;;;;;;;;;;;;;;;;;;;21286:18;:26;21305:6;21286:26;;;;;;;;;;;;;;;21318:10;21286:43;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;21286:43:1;;;;;;;;;;;;;;;;;;;;;;;;;;;18853:2483;;;;;;;;;;:::o;1272:131:10:-;1330:7;1345:9;1361:1;1357;:5;1345:17;;1381:1;1376;:6;;1368:15;;;;;;;;1397:1;1390:8;;1272:131;;;;;:::o;13460:1108:1:-;13844:20;13681:152;13712:4;13730;13748;13766:10;13790:12;13816:7;13681:17;:152::i;:::-;13867:130;13899:12;:24;13912:10;13899:24;;;;;;;;;;;;;;;;;:37;;;;;;;;;;;;13950:12;:24;13963:10;13950:24;;;;;;;;;;;;;;;;;:37;;;13867:18;:130::i;:::-;13844:153;;14197:12;:24;14210:10;14197:24;;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;14183:48;;:4;:11;:48;14179:383;;;14252:15;14251:16;14247:305;;;14287:65;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14247:305;14390:12;:24;14403:10;14390:24;;;;;;;;;;;;;;;;;:30;;:63;14421:12;:24;14434:10;14421:24;;;;;;;;;;;;;;;;;:31;;;;;;;;;;;;14390:63;;;;;;;;;;;;;;;;;;;;;;;;;14389:64;14385:167;;;14473:64;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14385:167;14179:383;13460:1108;;;;;;;:::o;14700:2163::-;14848:7;14871:21;14930:24;15036:9;15879:20;15952:9;14895:12;:24;14908:10;14895:24;;;;;;;;;;;;;;;;;14871:48;;14957:1;14930:28;;14994:21;14973:42;;;;;;;;:1;:17;;;;;;;;;;;;:42;;;;;;;;;14969:1855;;;15048:1;15036:13;;15031:768;15055:12;:19;15051:1;:23;15031:768;;;15156:1;15129:29;;:12;15142:1;15129:15;;;;;;;;;;;;;;;;;;:29;;;;15100:150;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15298:1;:9;;:26;15308:12;15321:1;15308:15;;;;;;;;;;;;;;;;;;15298:26;;;;;;;;;;;;;;;;;;;;;;;;;15269:141;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15471:1;15458:7;15466:1;15458:10;;;;;;;;;;;;;;;;;;:14;15429:127;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15594:32;15615:7;15623:1;15615:10;;;;;;;;;;;;;;;;;;15594:16;:20;;:32;;;;:::i;:::-;15575:51;;15726:4;15691:1;:15;;:32;15707:12;15720:1;15707:15;;;;;;;;;;;;;;;;;;15691:32;;;;;;;;;;;;;;;;:39;;;;;;;;;;;;;;;;;;15748:12;15761:1;15748:15;;;;;;;;;;;;;;;;;;:24;;:36;15773:7;15781:1;15773:10;;;;;;;;;;;;;;;;;;15748:36;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15748:36:1;15076:3;;;;;;;15031:768;;;14969:1855;;;15841:21;15820:42;;;;;;;;:1;:17;;;;;;;;;;;;:42;;;;;;;;;15816:1008;;;15917:1;:14;;;;;;;;;;;;15879:53;;15964:1;15952:13;;15947:867;15969:12;:19;15967:1;:21;15947:867;;;16070:1;16043:29;;:12;16056:1;16043:15;;;;;;;;;;;;;;;;;;:29;;;;16014:150;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16212:1;:9;;:26;16222:12;16235:1;16222:15;;;;;;;;;;;;;;;;;;16212:26;;;;;;;;;;;;;;;;;;;;;;;;;16183:141;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16385:1;16372:7;16380:1;16372:10;;;;;;;;;;;;;;;;;;:14;16343:127;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;16508:32;16529:7;16537:1;16529:10;;;;;;;;;;;;;;;;;;16508:16;:20;;:32;;;;:::i;:::-;16489:51;;16640:4;16605:1;:15;;:32;16621:12;16634:1;16621:15;;;;;;;;;;;;;;;;;;16605:32;;;;;;;;;;;;;;;;:39;;;;;;;;;;;;;;;;;;16692:5;:14;;;16707:12;16720:1;16707:15;;;;;;;;;;;;;;;;;;16724:7;16732:1;16724:10;;;;;;;;;;;;;;;;;;16692:43;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16692:43:1;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16692:43:1;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16692:43:1;;;;;;;;;;;;;;;;16663:136;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;15990:3;;;;;;;15947:867;;;15816:1008;14969:1855;16840:16;16833:23;;14700:2163;;;;;;;;;;:::o;16985:1456::-;17429:14;17897:6;17946:17;17227:4;:11;17212:4;:11;:26;17204:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17295:4;:11;17280:4;:11;:26;17272:58;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17633:4;17628:10;;17669:1;17664:7;;17705:4;17736:12;17774:7;17807:10;17586:253;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;17586:253:1;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;17586:253:1;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17586:253:1;;;17555:302;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17555:302:1;;;;;;;;;;;;;;;;17469:402;;;;;;;;;;;;;;;;;;;;;;;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;17469:402:1;;;17446:435;;;;;;;;;;;;;36:153:-1;66:2;61:3;58:11;51:19;36:153;;;182:3;176:10;171:3;164:23;98:2;93:3;89:12;82:19;;123:2;118:3;114:12;107:19;;148:2;143:3;139:12;132:19;;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;17446:435:1;;;;;;;;;;;;;;;;17429:452;;17906:1;17897:10;;17892:543;17913:4;:11;17909:1;:15;17892:543;;;17966:122;17993:6;18017:4;18022:1;18017:7;;;;;;;;;;;;;;;;;;18042:4;18047:1;18042:7;;;;;;;;;;;;;;;;;;18067:4;18072:1;18067:7;;;;;;;;;;;;;;;;;;17966:122;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;17966:122:1;;;;;;;;17946:142;;18128:12;:24;18141:10;18128:24;;;;;;;;;;;;;;;;;:32;;:43;18161:9;18128:43;;;;;;;;;;;;;;;;;;;;;;;;;18103:119;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18262:12;:24;18275:10;18262:24;;;;;;;;;;;;;;;;;:30;;:41;18293:9;18262:41;;;;;;;;;;;;;;;;;;;;;;;;;18261:42;18236:126;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18420:4;18376:12;:24;18389:10;18376:24;;;;;;;;;;;;;;;;;:30;;:41;18407:9;18376:41;;;;;;;;;;;;;;;;:48;;;;;;;;;;;;;;;;;;17926:3;;;;;;;17892:543;;;16985:1456;;;;;;;;;:::o;18447:319::-;18586:4;18606:17;18626:21;18634:12;18626:3;:7;;:21;;;;:::i;:::-;18606:41;;18694:1;18678:12;:17;;;:71;;18718:31;18744:4;18726:12;18718:21;;:25;;:31;;;;:::i;:::-;18706:9;:43;18678:71;;;18698:5;18678:71;18657:102;;18447:319;;;;;:::o;1078:131:10:-;1136:7;1172:9;1164:1;1159;:6;;1151:15;;;;;;;;1188:1;1184;:5;1172:17;;1203:1;1196:8;;1078:131;;;;;:::o;204:381::-;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o", "source": "pragma solidity 0.4.24;\n\nimport \"openzeppelin-solidity/contracts/math/SafeMath.sol\";\n\nimport \"../token/ITokenContract.sol\";\n\n\n/**\n* @dev Supports ERC20 tokens\n* The escrow smart contract for the OpenBazaar trades in Ethereum\n* The smart contract is designed keeping in mind the current wallet interface\n* of OB-core:\n* https://github.com/OpenBazaar/wallet-interface/blob/master/wallet.go\n* Current wallet interface strictly adheres to UTXO(bitcoin) model\n* Please read below mentioned link for detailed specs\n* https://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md\n*/\ncontract Escrow_v1_0 {\n\n using SafeMath for uint256;\n\n enum Status {FUNDED, RELEASED}\n\n enum TransactionType {ETHER, TOKEN}\n\n event Executed(\n bytes32 indexed scriptHash,\n address[] destinations,\n uint256[] amounts\n );\n\n event FundAdded(\n bytes32 indexed scriptHash,\n address indexed from,\n uint256 valueAdded\n );\n\n event Funded(\n bytes32 indexed scriptHash,\n address indexed from,\n uint256 value\n );\n\n struct Transaction {\n uint256 value;\n uint256 lastModified; //time txn was last modified (in seconds)\n Status status;\n TransactionType transactionType;\n uint8 threshold;\n uint32 timeoutHours;\n address buyer;\n address seller;\n address tokenAddress; //token address in case of token transfer\n address moderator;\n mapping(address => bool) isOwner; //to keep track of owners.\n mapping(address => bool) voted; //to keep track of who all voted\n mapping(address => bool) beneficiaries; //beneficiaries of execution\n }\n\n mapping(bytes32 => Transaction) public transactions;\n\n uint256 public transactionCount = 0;\n\n //Contains mapping between each party and all of their transactions\n mapping(address => bytes32[]) private partyVsTransaction;\n\n modifier transactionExists(bytes32 scriptHash) {\n require(\n transactions[scriptHash].value != 0, \"Transaction does not exist\"\n );\n _;\n }\n\n modifier transactionDoesNotExist(bytes32 scriptHash) {\n require(transactions[scriptHash].value == 0, \"Transaction exists\");\n _;\n }\n\n modifier inFundedState(bytes32 scriptHash) {\n require(\n transactions[scriptHash].status == Status.FUNDED,\n \"Transaction is not in FUNDED state\"\n );\n _;\n }\n\n modifier nonZeroAddress(address addressToCheck) {\n require(addressToCheck != address(0), \"Zero address passed\");\n _;\n }\n\n modifier checkTransactionType(\n bytes32 scriptHash,\n TransactionType transactionType\n )\n {\n require(\n transactions[scriptHash].transactionType == transactionType,\n \"Transaction type does not match\"\n );\n _;\n }\n\n modifier onlyBuyer(bytes32 scriptHash) {\n require(\n msg.sender == transactions[scriptHash].buyer,\n \"The initiator of the transaction is not buyer\"\n );\n _;\n }\n\n /**\n * @dev Add new transaction in the contract\n * @param buyer The buyer of the transaction\n * @param seller The seller of the listing associated with the transaction\n * @param moderator Moderator for this transaction\n * @param threshold Minimum number of signatures required to released funds\n * @param timeoutHours Hours after which seller can release funds into his\n * favour by signing transaction unilaterally\n * @param scriptHash keccak256 hash of the redeem script\n * @param uniqueId bytes20 unique id for the transaction, generated by\n * ETH wallet\n * Redeem Script format will be following\n * \n * \n * Pass amount of the ETH to be put in escrow\n */\n function addTransaction(\n address buyer,\n address seller,\n address moderator,\n uint8 threshold,\n uint32 timeoutHours,\n bytes32 scriptHash,\n bytes20 uniqueId\n )\n external\n payable\n transactionDoesNotExist(scriptHash)\n nonZeroAddress(buyer)\n nonZeroAddress(seller)\n {\n _addTransaction(\n buyer,\n seller,\n moderator,\n threshold,\n timeoutHours,\n scriptHash,\n msg.value,\n uniqueId,\n TransactionType.ETHER,\n address(0)\n );\n\n emit Funded(scriptHash, msg.sender, msg.value);\n\n }\n\n /**\n * @dev Add new transaction in the contract\n * @param buyer The buyer of the transaction\n * @param seller The seller of the listing associated with the transaction\n * @param moderator Moderator for this transaction\n * @param threshold Minimum number of signatures required to released funds\n * @param timeoutHours Hours after which seller can release funds into his\n * favour by signing transaction unilaterally\n * @param scriptHash keccak256 hash of the redeem script\n * @param value Amount of tokens to be put in escrow\n * @param uniqueId bytes20 unique id for the transaction, generated by\n * ETH wallet\n * @param tokenAddress Address of the token to be used\n * Redeem Script format will be following:\n * \n * \n * Approve escrow contract to spend amount of token on sender's behalf\n */\n function addTokenTransaction(\n address buyer,\n address seller,\n address moderator,\n uint8 threshold,\n uint32 timeoutHours,\n bytes32 scriptHash,\n uint256 value,\n bytes20 uniqueId,\n address tokenAddress\n )\n external\n transactionDoesNotExist(scriptHash)\n nonZeroAddress(buyer)\n nonZeroAddress(seller)\n nonZeroAddress(tokenAddress)\n {\n\n _addTransaction(\n buyer,\n seller,\n moderator,\n threshold,\n timeoutHours,\n scriptHash,\n value,\n uniqueId,\n TransactionType.TOKEN,\n tokenAddress\n );\n\n ITokenContract token = ITokenContract(tokenAddress);\n\n require(\n token.transferFrom(msg.sender, address(this), value),\n \"Token transfer failed, maybe you did not approve escrow contract to spend on behalf of sender\"\n );\n emit Funded(scriptHash, msg.sender, value);\n }\n\n /**\n * @dev This method will check whether given address was a beneficiary of\n * transaction execution or not\n * @param scriptHash script hash of the transaction\n * @param beneficiary Beneficiary address to be checked\n */\n function checkBeneficiary(\n bytes32 scriptHash,\n address beneficiary\n )\n external\n view\n returns (bool)\n {\n return transactions[scriptHash].beneficiaries[beneficiary];\n }\n\n /**\n * @dev This method will check whether given party has voted or not\n * @param scriptHash script hash of the transaction\n * @param party Address of the party whose vote has to be checked\n * @return bool vote\n */\n function checkVote(\n bytes32 scriptHash,\n address party\n )\n external\n view\n returns (bool)\n {\n return transactions[scriptHash].voted[party];\n }\n\n /**\n * @dev Allows buyer of the transaction to add more funds(ether) in the\n * transaction.\n * This will help to cater scenarios wherein initially buyer missed to\n * fund transaction as required\n * @param scriptHash script hash of the transaction\n * Only buyer of the transaction can invoke this method\n */\n function addFundsToTransaction(\n bytes32 scriptHash\n )\n external\n payable\n transactionExists(scriptHash)\n inFundedState(scriptHash)\n checkTransactionType(scriptHash, TransactionType.ETHER)\n onlyBuyer(scriptHash)\n\n {\n\n require(msg.value > 0, \"Value must be greater than zero.\");\n\n transactions[scriptHash].value = transactions[scriptHash].value\n .add(msg.value);\n\n emit FundAdded(scriptHash, msg.sender, msg.value);\n }\n\n /**\n * @dev Allows buyer of the transaction to add more funds(Tokens) in the\n * transaction.\n * This will help to cater scenarios wherein initially buyer missed to\n * fund transaction as required\n * @param scriptHash script hash of the transaction\n * Only buyer of the transaction can invoke this method\n */\n function addTokensToTransaction(\n bytes32 scriptHash,\n uint256 value\n )\n external\n transactionExists(scriptHash)\n inFundedState(scriptHash)\n checkTransactionType(scriptHash, TransactionType.TOKEN)\n onlyBuyer(scriptHash)\n {\n\n require(value > 0, \"Value must be greater than zero.\");\n\n ITokenContract token = ITokenContract(\n transactions[scriptHash].tokenAddress\n );\n\n require(\n token.transferFrom(msg.sender, address(this), value),\n \"Token transfer failed, maybe you did not approve the escrow contract to spend on behalf of the buyer\"\n );\n\n transactions[scriptHash].value = transactions[scriptHash].value\n .add(value);\n\n emit FundAdded(scriptHash, msg.sender, value);\n }\n\n /**\n *@dev Returns all transaction ids for a party\n *@param partyAddress Address of the party\n */\n function getAllTransactionsForParty(\n address partyAddress\n )\n external\n view\n returns (bytes32[])\n {\n return partyVsTransaction[partyAddress];\n }\n\n /**\n *@dev This method will be used to release funds associated with\n * the transaction\n * Please see specs https://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md\n *@param sigV Array containing V component of all the signatures\n *@param sigR Array containing R component of all the signatures\n *@param signS Array containing S component of all the signatures\n *@param scriptHash script hash of the transaction\n *@param destinations List of addresses who will receive funds\n *@param amounts amount released to each destination\n */\n function execute(\n uint8[] sigV,\n bytes32[] sigR,\n bytes32[] sigS,\n bytes32 scriptHash,\n address[] destinations,\n uint256[] amounts\n )\n external\n transactionExists(scriptHash)\n inFundedState(scriptHash)\n {\n\n require(\n destinations.length > 0,\n \"Number of destinations must be greater than 0\"\n );\n require(\n destinations.length == amounts.length,\n \"Number of destinations must match number of values sent\"\n );\n\n _verifyTransaction(\n sigV,\n sigR,\n sigS,\n scriptHash,\n destinations,\n amounts\n );\n\n transactions[scriptHash].status = Status.RELEASED;\n //Last modified timestamp modified, which will be used by rewards\n transactions[scriptHash].lastModified = block.timestamp;\n require(\n _transferFunds(scriptHash, destinations, amounts) == transactions[scriptHash].value,\n \"Total value to be released must be equal to the transaction escrow value\"\n );\n\n emit Executed(scriptHash, destinations, amounts);\n }\n\n\n /**\n *@dev Method for calculating script hash. Calculation will depend upon\n * the type of transaction\n * ETHER Type transaction-:\n * Script Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\n * moderator, multiSigContractAddress)\n * TOKEN Type transaction\n * Script Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\n * moderator, multiSigContractAddress, tokenAddress)\n * Client can use this method to verify whether it has calculated correct\n * script hash or not\n */\n function calculateRedeemScriptHash(\n bytes20 uniqueId,\n uint8 threshold,\n uint32 timeoutHours,\n address buyer,\n address seller,\n address moderator,\n address tokenAddress\n )\n public\n view\n returns (bytes32)\n {\n if (tokenAddress == address(0)) {\n return keccak256(\n abi.encodePacked(\n uniqueId,\n threshold,\n timeoutHours,\n buyer,\n seller,\n moderator,\n address(this)\n )\n );\n } else {\n return keccak256(\n abi.encodePacked(\n uniqueId,\n threshold,\n timeoutHours,\n buyer,\n seller,\n moderator,\n address(this),\n tokenAddress\n )\n );\n }\n }\n\n /**\n * @dev This methods checks validity of transaction\n * 1. Verify Signatures\n * 2. Check if minimum number of signatures has been acquired\n * 3. If above condition is false, check if timelock is expired or if the\n * execution is signed by seller\n */\n function _verifyTransaction(\n uint8[] sigV,\n bytes32[] sigR,\n bytes32[] sigS,\n bytes32 scriptHash,\n address[] destinations,\n uint256[] amounts\n )\n private\n {\n _verifySignatures(\n sigV,\n sigR,\n sigS,\n scriptHash,\n destinations,\n amounts\n );\n\n bool timeLockExpired = _isTimeLockExpired(\n transactions[scriptHash].timeoutHours,\n transactions[scriptHash].lastModified\n );\n\n //if the minimum number of signatures are not gathered and either\n //timelock has not expired or transaction was not signed by seller\n //then revert\n if (sigV.length < transactions[scriptHash].threshold) {\n if (!timeLockExpired) {\n revert(\"Min number of sigs not present and timelock not expired\");\n }\n else if (!transactions[scriptHash].voted[transactions[scriptHash].seller]) {\n revert(\"Min number of sigs not present and seller did not sign\");\n }\n }\n }\n\n /**\n *@dev Private method to transfer funds to the destination addresses on\n * the basis of transaction type\n */\n function _transferFunds(\n bytes32 scriptHash,\n address[]destinations,\n uint256[]amounts\n )\n private\n returns (uint256)\n {\n Transaction storage t = transactions[scriptHash];\n\n uint256 valueTransferred = 0;\n\n if (t.transactionType == TransactionType.ETHER) {\n for (uint256 i = 0; i < destinations.length; i++) {\n\n require(\n destinations[i] != address(0),\n \"zero address is not allowed as destination address\"\n );\n\n require(\n t.isOwner[destinations[i]],\n \"Destination address is not one of the owners\"\n );\n\n require(\n amounts[i] > 0,\n \"Amount to be sent should be greater than 0\"\n );\n\n valueTransferred = valueTransferred.add(amounts[i]);\n\n //add receiver as beneficiary\n t.beneficiaries[destinations[i]] = true;\n destinations[i].transfer(amounts[i]);\n }\n\n } else if (t.transactionType == TransactionType.TOKEN) {\n\n ITokenContract token = ITokenContract(t.tokenAddress);\n\n for (uint256 j = 0; j 0,\n \"Amount to be sent should be greater than 0\"\n );\n\n valueTransferred = valueTransferred.add(amounts[j]);\n\n //add receiver as beneficiary\n t.beneficiaries[destinations[j]] = true;\n\n require(\n token.transfer(destinations[j], amounts[j]),\n \"Token transfer failed.\"\n );\n }\n }\n return valueTransferred;\n }\n\n\n /**\n *@dev Checks whether the signatures are valid or not and marks signers as\n * having \"voted\".\n */\n function _verifySignatures(\n uint8[] sigV,\n bytes32[] sigR,\n bytes32[] sigS,\n bytes32 scriptHash,\n address[] destinations,\n uint256[]amounts\n )\n private\n {\n require(sigR.length == sigS.length, \"R,S length mismatch\");\n require(sigR.length == sigV.length, \"R,V length mismatch\");\n\n // Follows ERC191 signature scheme: https://github.com/ethereum/EIPs/issues/191\n bytes32 txHash = keccak256(\n abi.encodePacked(\n \"\\x19Ethereum Signed Message:\\n32\",\n keccak256(\n abi.encodePacked(\n byte(0x19),\n byte(0),\n address(this),\n destinations,\n amounts,\n scriptHash\n )\n )\n )\n );\n\n for (uint i = 0; i < sigR.length; i++) {\n\n address recovered = ecrecover(\n txHash,\n sigV[i],\n sigR[i],\n sigS[i]\n );\n\n require(\n transactions[scriptHash].isOwner[recovered],\n \"Invalid signature\"\n );\n require(\n !transactions[scriptHash].voted[recovered],\n \"Same signature sent twice\"\n );\n transactions[scriptHash].voted[recovered] = true;\n }\n }\n\n function _isTimeLockExpired(\n uint32 timeoutHours,\n uint256 lastModified\n )\n private\n view\n returns (bool)\n {\n uint256 timeSince = now.sub(lastModified);\n return (\n timeoutHours == 0 ? false : timeSince > uint256(timeoutHours).mul(3600)\n );\n }\n\n /**\n * Private method to add transaction to reduce code redundancy\n */\n function _addTransaction(\n address buyer,\n address seller,\n address moderator,\n uint8 threshold,\n uint32 timeoutHours,\n bytes32 scriptHash,\n uint256 value,\n bytes20 uniqueId,\n TransactionType transactionType,\n address tokenAddress\n )\n private\n {\n require(buyer != seller, \"Buyer and seller are same\");\n\n //value passed should be greater than 0\n require(value > 0, \"Value passed is 0\");\n\n // For now allowing 0 moderator to support 1-2 multisig wallet\n require(threshold > 0, \"Threshold must be greater than 0\");\n require(threshold <= 3, \"Threshold must not be greater than 3\");\n\n //if threshold is 1 then moderator can be any address\n //otherwise moderator should be a valid address\n require(\n threshold == 1 || moderator != address(0),\n \"Either threshold should be 1 or valid moderator address should be passed\"\n );\n\n require(\n scriptHash == calculateRedeemScriptHash(\n uniqueId,\n threshold,\n timeoutHours,\n buyer,\n seller,\n moderator,\n tokenAddress\n ),\n \"Calculated script hash does not match passed script hash.\"\n );\n\n transactions[scriptHash] = Transaction({\n buyer: buyer,\n seller: seller,\n moderator: moderator,\n value: value,\n status: Status.FUNDED,\n lastModified: block.timestamp,\n threshold: threshold,\n timeoutHours: timeoutHours,\n transactionType:transactionType,\n tokenAddress:tokenAddress\n });\n\n transactions[scriptHash].isOwner[seller] = true;\n transactions[scriptHash].isOwner[buyer] = true;\n\n //check if buyer or seller are not passed as moderator\n require(\n !transactions[scriptHash].isOwner[moderator],\n \"Either buyer or seller is passed as moderator\"\n );\n\n //set moderator as one of the owners only if threshold is greater than\n // 1 otherwise only buyer and seller should be able to release funds\n if (threshold > 1) {\n transactions[scriptHash].isOwner[moderator] = true;\n }\n\n\n transactionCount++;\n\n partyVsTransaction[buyer].push(scriptHash);\n partyVsTransaction[seller].push(scriptHash);\n }\n}\n", "sourcePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/Escrow_v1_0.sol", "ast": { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/Escrow_v1_0.sol", "exportedSymbols": { "Escrow_v1_0": [ - 1208 + 1266 ] }, - "id": 1209, + "id": 1267, "nodeType": "SourceUnit", "nodes": [ { - "id": 1, + "id": 59, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:0" + "src": "0:23:1" }, { "absolutePath": "openzeppelin-solidity/contracts/math/SafeMath.sol", "file": "openzeppelin-solidity/contracts/math/SafeMath.sol", - "id": 2, + "id": 60, "nodeType": "ImportDirective", - "scope": 1209, - "sourceUnit": 2406, - "src": "25:59:0", + "scope": 1267, + "sourceUnit": 4623, + "src": "25:59:1", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/token/ITokenContract.sol", "file": "../token/ITokenContract.sol", - "id": 3, + "id": 61, "nodeType": "ImportDirective", - "scope": 1209, - "sourceUnit": 2278, - "src": "86:37:0", + "scope": 1267, + "sourceUnit": 4446, + "src": "86:37:1", "symbolAliases": [], "unitAlias": "" }, @@ -449,34 +463,34 @@ "contractKind": "contract", "documentation": "@dev Supports ERC20 tokens\nThe escrow smart contract for the OpenBazaar trades in Ethereum\nThe smart contract is designed keeping in mind the current wallet interface\nof OB-core:\nhttps://github.com/OpenBazaar/wallet-interface/blob/master/wallet.go\nCurrent wallet interface strictly adheres to UTXO(bitcoin) model\nPlease read below mentioned link for detailed specs\nhttps://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md", "fullyImplemented": true, - "id": 1208, + "id": 1266, "linearizedBaseContracts": [ - 1208 + 1266 ], "name": "Escrow_v1_0", "nodeType": "ContractDefinition", "nodes": [ { - "id": 6, + "id": 64, "libraryName": { "contractScope": null, - "id": 4, + "id": 62, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2405, - "src": "637:8:0", + "referencedDeclaration": 4622, + "src": "637:8:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$2405", + "typeIdentifier": "t_contract$_SafeMath_$4622", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "631:27:0", + "src": "631:27:1", "typeName": { - "id": 5, + "id": 63, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "650:7:0", + "src": "650:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -485,64 +499,64 @@ }, { "canonicalName": "Escrow_v1_0.Status", - "id": 9, + "id": 67, "members": [ { - "id": 7, + "id": 65, "name": "FUNDED", "nodeType": "EnumValue", - "src": "677:6:0" + "src": "677:6:1" }, { - "id": 8, + "id": 66, "name": "RELEASED", "nodeType": "EnumValue", - "src": "685:8:0" + "src": "685:8:1" } ], "name": "Status", "nodeType": "EnumDefinition", - "src": "664:30:0" + "src": "664:30:1" }, { "canonicalName": "Escrow_v1_0.TransactionType", - "id": 12, + "id": 70, "members": [ { - "id": 10, + "id": 68, "name": "ETHER", "nodeType": "EnumValue", - "src": "722:5:0" + "src": "722:5:1" }, { - "id": 11, + "id": 69, "name": "TOKEN", "nodeType": "EnumValue", - "src": "729:5:0" + "src": "729:5:1" } ], "name": "TransactionType", "nodeType": "EnumDefinition", - "src": "700:35:0" + "src": "700:35:1" }, { "anonymous": false, "documentation": null, - "id": 22, + "id": 80, "name": "Executed", "nodeType": "EventDefinition", "parameters": { - "id": 21, + "id": 79, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 14, + "id": 72, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "765:26:0", + "scope": 80, + "src": "765:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -550,10 +564,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 13, + "id": 71, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "765:7:0", + "src": "765:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -564,12 +578,12 @@ }, { "constant": false, - "id": 17, + "id": 75, "indexed": false, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "801:22:0", + "scope": 80, + "src": "801:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -578,19 +592,19 @@ }, "typeName": { "baseType": { - "id": 15, + "id": 73, "name": "address", "nodeType": "ElementaryTypeName", - "src": "801:7:0", + "src": "801:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 16, + "id": 74, "length": null, "nodeType": "ArrayTypeName", - "src": "801:9:0", + "src": "801:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -601,12 +615,12 @@ }, { "constant": false, - "id": 20, + "id": 78, "indexed": false, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "833:17:0", + "scope": 80, + "src": "833:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -615,19 +629,19 @@ }, "typeName": { "baseType": { - "id": 18, + "id": 76, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "833:7:0", + "src": "833:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 19, + "id": 77, "length": null, "nodeType": "ArrayTypeName", - "src": "833:9:0", + "src": "833:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -637,28 +651,28 @@ "visibility": "internal" } ], - "src": "755:101:0" + "src": "755:101:1" }, - "src": "741:116:0" + "src": "741:116:1" }, { "anonymous": false, "documentation": null, - "id": 30, + "id": 88, "name": "FundAdded", "nodeType": "EventDefinition", "parameters": { - "id": 29, + "id": 87, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 24, + "id": 82, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "888:26:0", + "scope": 88, + "src": "888:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -666,10 +680,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 23, + "id": 81, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "888:7:0", + "src": "888:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -680,12 +694,12 @@ }, { "constant": false, - "id": 26, + "id": 84, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "924:20:0", + "scope": 88, + "src": "924:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -693,10 +707,10 @@ "typeString": "address" }, "typeName": { - "id": 25, + "id": 83, "name": "address", "nodeType": "ElementaryTypeName", - "src": "924:7:0", + "src": "924:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -707,12 +721,12 @@ }, { "constant": false, - "id": 28, + "id": 86, "indexed": false, "name": "valueAdded", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "954:18:0", + "scope": 88, + "src": "954:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -720,10 +734,10 @@ "typeString": "uint256" }, "typeName": { - "id": 27, + "id": 85, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "954:7:0", + "src": "954:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -733,28 +747,28 @@ "visibility": "internal" } ], - "src": "878:100:0" + "src": "878:100:1" }, - "src": "863:116:0" + "src": "863:116:1" }, { "anonymous": false, "documentation": null, - "id": 38, + "id": 96, "name": "Funded", "nodeType": "EventDefinition", "parameters": { - "id": 37, + "id": 95, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 32, + "id": 90, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1007:26:0", + "scope": 96, + "src": "1007:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -762,10 +776,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 31, + "id": 89, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1007:7:0", + "src": "1007:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -776,12 +790,12 @@ }, { "constant": false, - "id": 34, + "id": 92, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1043:20:0", + "scope": 96, + "src": "1043:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -789,10 +803,10 @@ "typeString": "address" }, "typeName": { - "id": 33, + "id": 91, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1043:7:0", + "src": "1043:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -803,12 +817,12 @@ }, { "constant": false, - "id": 36, + "id": 94, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1073:13:0", + "scope": 96, + "src": "1073:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -816,10 +830,10 @@ "typeString": "uint256" }, "typeName": { - "id": 35, + "id": 93, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1073:7:0", + "src": "1073:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -829,21 +843,21 @@ "visibility": "internal" } ], - "src": "997:95:0" + "src": "997:95:1" }, - "src": "985:108:0" + "src": "985:108:1" }, { "canonicalName": "Escrow_v1_0.Transaction", - "id": 71, + "id": 129, "members": [ { "constant": false, - "id": 40, + "id": 98, "name": "value", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1128:13:0", + "scope": 129, + "src": "1128:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -851,10 +865,10 @@ "typeString": "uint256" }, "typeName": { - "id": 39, + "id": 97, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1128:7:0", + "src": "1128:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -865,11 +879,11 @@ }, { "constant": false, - "id": 42, + "id": 100, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1151:20:0", + "scope": 129, + "src": "1151:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -877,10 +891,10 @@ "typeString": "uint256" }, "typeName": { - "id": 41, + "id": 99, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1151:7:0", + "src": "1151:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -891,26 +905,26 @@ }, { "constant": false, - "id": 44, + "id": 102, "name": "status", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1223:13:0", + "scope": 129, + "src": "1223:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" }, "typeName": { "contractScope": null, - "id": 43, + "id": 101, "name": "Status", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 9, - "src": "1223:6:0", + "referencedDeclaration": 67, + "src": "1223:6:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -919,26 +933,26 @@ }, { "constant": false, - "id": 46, + "id": 104, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1246:31:0", + "scope": 129, + "src": "1246:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 45, + "id": 103, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "1246:15:0", + "referencedDeclaration": 70, + "src": "1246:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -947,11 +961,11 @@ }, { "constant": false, - "id": 48, + "id": 106, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1287:15:0", + "scope": 129, + "src": "1287:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -959,10 +973,10 @@ "typeString": "uint8" }, "typeName": { - "id": 47, + "id": 105, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "1287:5:0", + "src": "1287:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -973,11 +987,11 @@ }, { "constant": false, - "id": 50, + "id": 108, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1312:19:0", + "scope": 129, + "src": "1312:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -985,10 +999,10 @@ "typeString": "uint32" }, "typeName": { - "id": 49, + "id": 107, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1312:6:0", + "src": "1312:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -999,11 +1013,11 @@ }, { "constant": false, - "id": 52, + "id": 110, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1341:13:0", + "scope": 129, + "src": "1341:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1011,10 +1025,10 @@ "typeString": "address" }, "typeName": { - "id": 51, + "id": 109, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1341:7:0", + "src": "1341:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1025,11 +1039,11 @@ }, { "constant": false, - "id": 54, + "id": 112, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1364:14:0", + "scope": 129, + "src": "1364:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1037,10 +1051,10 @@ "typeString": "address" }, "typeName": { - "id": 53, + "id": 111, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1364:7:0", + "src": "1364:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1051,11 +1065,11 @@ }, { "constant": false, - "id": 56, + "id": 114, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1388:20:0", + "scope": 129, + "src": "1388:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1063,10 +1077,10 @@ "typeString": "address" }, "typeName": { - "id": 55, + "id": 113, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1388:7:0", + "src": "1388:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1077,11 +1091,11 @@ }, { "constant": false, - "id": 58, + "id": 116, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1460:17:0", + "scope": 129, + "src": "1460:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1089,10 +1103,10 @@ "typeString": "address" }, "typeName": { - "id": 57, + "id": 115, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1460:7:0", + "src": "1460:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1103,11 +1117,11 @@ }, { "constant": false, - "id": 62, + "id": 120, "name": "isOwner", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1487:32:0", + "scope": 129, + "src": "1487:32:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1115,28 +1129,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 61, + "id": 119, "keyType": { - "id": 59, + "id": 117, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1495:7:0", + "src": "1495:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1487:24:0", + "src": "1487:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 60, + "id": 118, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1506:4:0", + "src": "1506:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1148,11 +1162,11 @@ }, { "constant": false, - "id": 66, + "id": 124, "name": "voted", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1556:30:0", + "scope": 129, + "src": "1556:30:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1160,28 +1174,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 65, + "id": 123, "keyType": { - "id": 63, + "id": 121, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1564:7:0", + "src": "1564:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1556:24:0", + "src": "1556:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 64, + "id": 122, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1575:4:0", + "src": "1575:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1193,11 +1207,11 @@ }, { "constant": false, - "id": 70, + "id": 128, "name": "beneficiaries", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1629:38:0", + "scope": 129, + "src": "1629:38:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1205,28 +1219,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 69, + "id": 127, "keyType": { - "id": 67, + "id": 125, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1637:7:0", + "src": "1637:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1629:24:0", + "src": "1629:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 68, + "id": 126, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1648:4:0", + "src": "1648:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1239,50 +1253,50 @@ ], "name": "Transaction", "nodeType": "StructDefinition", - "scope": 1208, - "src": "1099:604:0", + "scope": 1266, + "src": "1099:604:1", "visibility": "public" }, { "constant": false, - "id": 75, + "id": 133, "name": "transactions", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1709:51:0", + "scope": 1266, + "src": "1709:51:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction)" }, "typeName": { - "id": 74, + "id": 132, "keyType": { - "id": 72, + "id": 130, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1717:7:0", + "src": "1717:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1709:31:0", + "src": "1709:31:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction)" }, "valueType": { "contractScope": null, - "id": 73, + "id": 131, "name": "Transaction", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 71, - "src": "1728:11:0", + "referencedDeclaration": 129, + "src": "1728:11:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" } } @@ -1292,11 +1306,11 @@ }, { "constant": false, - "id": 78, + "id": 136, "name": "transactionCount", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1767:35:0", + "scope": 1266, + "src": "1767:35:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1304,10 +1318,10 @@ "typeString": "uint256" }, "typeName": { - "id": 76, + "id": 134, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1767:7:0", + "src": "1767:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1316,14 +1330,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 77, + "id": 135, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1801:1:0", + "src": "1801:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1335,11 +1349,11 @@ }, { "constant": false, - "id": 83, + "id": 141, "name": "partyVsTransaction", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1881:56:0", + "scope": 1266, + "src": "1881:56:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1347,38 +1361,38 @@ "typeString": "mapping(address => bytes32[])" }, "typeName": { - "id": 82, + "id": 140, "keyType": { - "id": 79, + "id": 137, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1889:7:0", + "src": "1889:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1881:29:0", + "src": "1881:29:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[])" }, "valueType": { "baseType": { - "id": 80, + "id": 138, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1900:7:0", + "src": "1900:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 81, + "id": 139, "length": null, "nodeType": "ArrayTypeName", - "src": "1900:9:0", + "src": "1900:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -1390,9 +1404,9 @@ }, { "body": { - "id": 98, + "id": 156, "nodeType": "Block", - "src": "1991:124:0", + "src": "1991:124:1", "statements": [ { "expression": { @@ -1404,7 +1418,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 93, + "id": 151, "isConstant": false, "isLValue": false, "isPure": false, @@ -1415,26 +1429,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 88, + "id": 146, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2022:12:0", + "referencedDeclaration": 133, + "src": "2022:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 90, + "id": 148, "indexExpression": { "argumentTypes": null, - "id": 89, + "id": 147, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, - "src": "2035:10:0", + "referencedDeclaration": 143, + "src": "2035:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1445,21 +1459,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2022:24:0", + "src": "2022:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 91, + "id": 149, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "2022:30:0", + "referencedDeclaration": 98, + "src": "2022:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1470,14 +1484,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 92, + "id": 150, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2056:1:0", + "src": "2056:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1485,7 +1499,7 @@ }, "value": "0" }, - "src": "2022:35:0", + "src": "2022:35:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1494,14 +1508,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e20646f6573206e6f74206578697374", - "id": 94, + "id": 152, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2059:28:0", + "src": "2059:28:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_cb323e46bbcca91e157c2b50ad4ce2acbe1153338b838c84372d5723b8995ef0", @@ -1521,21 +1535,21 @@ "typeString": "literal_string \"Transaction does not exist\"" } ], - "id": 87, + "id": 145, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2001:7:0", + "referencedDeclaration": 5313, + "src": "2001:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 95, + "id": 153, "isConstant": false, "isLValue": false, "isPure": false, @@ -1543,38 +1557,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2001:96:0", + "src": "2001:96:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 96, + "id": 154, "nodeType": "ExpressionStatement", - "src": "2001:96:0" + "src": "2001:96:1" }, { - "id": 97, + "id": 155, "nodeType": "PlaceholderStatement", - "src": "2107:1:0" + "src": "2107:1:1" } ] }, "documentation": null, - "id": 99, + "id": 157, "name": "transactionExists", "nodeType": "ModifierDefinition", "parameters": { - "id": 86, + "id": 144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 85, + "id": 143, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 99, - "src": "1971:18:0", + "scope": 157, + "src": "1971:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1582,10 +1596,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 84, + "id": 142, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1971:7:0", + "src": "1971:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1595,16 +1609,16 @@ "visibility": "internal" } ], - "src": "1970:20:0" + "src": "1970:20:1" }, - "src": "1944:171:0", + "src": "1944:171:1", "visibility": "internal" }, { "body": { - "id": 114, + "id": 172, "nodeType": "Block", - "src": "2174:94:0", + "src": "2174:94:1", "statements": [ { "expression": { @@ -1616,7 +1630,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 109, + "id": 167, "isConstant": false, "isLValue": false, "isPure": false, @@ -1627,26 +1641,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 104, + "id": 162, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2192:12:0", + "referencedDeclaration": 133, + "src": "2192:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 106, + "id": 164, "indexExpression": { "argumentTypes": null, - "id": 105, + "id": 163, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 101, - "src": "2205:10:0", + "referencedDeclaration": 159, + "src": "2205:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1657,21 +1671,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2192:24:0", + "src": "2192:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 107, + "id": 165, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "2192:30:0", + "referencedDeclaration": 98, + "src": "2192:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1682,14 +1696,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 108, + "id": 166, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2226:1:0", + "src": "2226:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1697,7 +1711,7 @@ }, "value": "0" }, - "src": "2192:35:0", + "src": "2192:35:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1706,14 +1720,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e20657869737473", - "id": 110, + "id": 168, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2229:20:0", + "src": "2229:20:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_64ff8d63c933e41af18e90354a9e9e0a94a0877b0dd96b73b67df48f68d00e8a", @@ -1733,21 +1747,21 @@ "typeString": "literal_string \"Transaction exists\"" } ], - "id": 103, + "id": 161, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2184:7:0", + "referencedDeclaration": 5313, + "src": "2184:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 111, + "id": 169, "isConstant": false, "isLValue": false, "isPure": false, @@ -1755,38 +1769,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2184:66:0", + "src": "2184:66:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 112, + "id": 170, "nodeType": "ExpressionStatement", - "src": "2184:66:0" + "src": "2184:66:1" }, { - "id": 113, + "id": 171, "nodeType": "PlaceholderStatement", - "src": "2260:1:0" + "src": "2260:1:1" } ] }, "documentation": null, - "id": 115, + "id": 173, "name": "transactionDoesNotExist", "nodeType": "ModifierDefinition", "parameters": { - "id": 102, + "id": 160, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 101, + "id": 159, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 115, - "src": "2154:18:0", + "scope": 173, + "src": "2154:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1794,10 +1808,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 100, + "id": 158, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2154:7:0", + "src": "2154:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1807,16 +1821,16 @@ "visibility": "internal" } ], - "src": "2153:20:0" + "src": "2153:20:1" }, - "src": "2121:147:0", + "src": "2121:147:1", "visibility": "internal" }, { "body": { - "id": 131, + "id": 189, "nodeType": "Block", - "src": "2317:157:0", + "src": "2317:157:1", "statements": [ { "expression": { @@ -1825,10 +1839,10 @@ { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" }, - "id": 126, + "id": 184, "isConstant": false, "isLValue": false, "isPure": false, @@ -1839,26 +1853,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 120, + "id": 178, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2348:12:0", + "referencedDeclaration": 133, + "src": "2348:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 122, + "id": 180, "indexExpression": { "argumentTypes": null, - "id": 121, + "id": 179, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 117, - "src": "2361:10:0", + "referencedDeclaration": 175, + "src": "2361:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1869,23 +1883,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2348:24:0", + "src": "2348:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 123, + "id": 181, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "status", "nodeType": "MemberAccess", - "referencedDeclaration": 44, - "src": "2348:31:0", + "referencedDeclaration": 102, + "src": "2348:31:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -1895,18 +1909,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 124, + "id": 182, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "2383:6:0", + "referencedDeclaration": 67, + "src": "2383:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 125, + "id": 183, "isConstant": false, "isLValue": false, "isPure": true, @@ -1914,13 +1928,13 @@ "memberName": "FUNDED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2383:13:0", + "src": "2383:13:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "src": "2348:48:0", + "src": "2348:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1929,14 +1943,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e206973206e6f7420696e2046554e444544207374617465", - "id": 127, + "id": 185, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2410:36:0", + "src": "2410:36:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5244efce1630cfae7257c0817c921ae75135c1043344a4cf9a1988c03337f39d", @@ -1956,21 +1970,21 @@ "typeString": "literal_string \"Transaction is not in FUNDED state\"" } ], - "id": 119, + "id": 177, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2327:7:0", + "referencedDeclaration": 5313, + "src": "2327:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 128, + "id": 186, "isConstant": false, "isLValue": false, "isPure": false, @@ -1978,38 +1992,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2327:129:0", + "src": "2327:129:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 129, + "id": 187, "nodeType": "ExpressionStatement", - "src": "2327:129:0" + "src": "2327:129:1" }, { - "id": 130, + "id": 188, "nodeType": "PlaceholderStatement", - "src": "2466:1:0" + "src": "2466:1:1" } ] }, "documentation": null, - "id": 132, + "id": 190, "name": "inFundedState", "nodeType": "ModifierDefinition", "parameters": { - "id": 118, + "id": 176, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 117, + "id": 175, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 132, - "src": "2297:18:0", + "scope": 190, + "src": "2297:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2017,10 +2031,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 116, + "id": 174, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2297:7:0", + "src": "2297:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2030,16 +2044,16 @@ "visibility": "internal" } ], - "src": "2296:20:0" + "src": "2296:20:1" }, - "src": "2274:200:0", + "src": "2274:200:1", "visibility": "internal" }, { "body": { - "id": 146, + "id": 204, "nodeType": "Block", - "src": "2528:88:0", + "src": "2528:88:1", "statements": [ { "expression": { @@ -2051,19 +2065,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 141, + "id": 199, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 137, + "id": 195, "name": "addressToCheck", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 134, - "src": "2546:14:0", + "referencedDeclaration": 192, + "src": "2546:14:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2077,14 +2091,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 139, + "id": 197, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2572:1:0", + "src": "2572:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2100,20 +2114,20 @@ "typeString": "int_const 0" } ], - "id": 138, + "id": 196, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2564:7:0", + "src": "2564:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 140, + "id": 198, "isConstant": false, "isLValue": false, "isPure": true, @@ -2121,13 +2135,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2564:10:0", + "src": "2564:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2546:28:0", + "src": "2546:28:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2136,14 +2150,14 @@ { "argumentTypes": null, "hexValue": "5a65726f206164647265737320706173736564", - "id": 142, + "id": 200, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2576:21:0", + "src": "2576:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_93e85f37f73cf8e1b855512ab7e00aab2b791117712ecb476daeb6c2c0a27a67", @@ -2163,21 +2177,21 @@ "typeString": "literal_string \"Zero address passed\"" } ], - "id": 136, + "id": 194, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2538:7:0", + "referencedDeclaration": 5313, + "src": "2538:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 143, + "id": 201, "isConstant": false, "isLValue": false, "isPure": false, @@ -2185,38 +2199,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2538:60:0", + "src": "2538:60:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 144, + "id": 202, "nodeType": "ExpressionStatement", - "src": "2538:60:0" + "src": "2538:60:1" }, { - "id": 145, + "id": 203, "nodeType": "PlaceholderStatement", - "src": "2608:1:0" + "src": "2608:1:1" } ] }, "documentation": null, - "id": 147, + "id": 205, "name": "nonZeroAddress", "nodeType": "ModifierDefinition", "parameters": { - "id": 135, + "id": 193, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 134, + "id": 192, "name": "addressToCheck", "nodeType": "VariableDeclaration", - "scope": 147, - "src": "2504:22:0", + "scope": 205, + "src": "2504:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2224,10 +2238,10 @@ "typeString": "address" }, "typeName": { - "id": 133, + "id": 191, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2504:7:0", + "src": "2504:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2237,16 +2251,16 @@ "visibility": "internal" } ], - "src": "2503:24:0" + "src": "2503:24:1" }, - "src": "2480:136:0", + "src": "2480:136:1", "visibility": "internal" }, { "body": { - "id": 164, + "id": 222, "nodeType": "Block", - "src": "2731:165:0", + "src": "2731:165:1", "statements": [ { "expression": { @@ -2255,10 +2269,10 @@ { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 159, + "id": 217, "isConstant": false, "isLValue": false, "isPure": false, @@ -2269,26 +2283,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 154, + "id": 212, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2762:12:0", + "referencedDeclaration": 133, + "src": "2762:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 156, + "id": 214, "indexExpression": { "argumentTypes": null, - "id": 155, + "id": 213, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 149, - "src": "2775:10:0", + "referencedDeclaration": 207, + "src": "2775:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2299,23 +2313,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2762:24:0", + "src": "2762:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 157, + "id": 215, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "2762:40:0", + "referencedDeclaration": 104, + "src": "2762:40:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -2323,18 +2337,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 158, + "id": 216, "name": "transactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 151, - "src": "2806:15:0", + "referencedDeclaration": 209, + "src": "2806:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "2762:59:0", + "src": "2762:59:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2343,14 +2357,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e207479706520646f6573206e6f74206d61746368", - "id": 160, + "id": 218, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2835:33:0", + "src": "2835:33:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_c798eb33a8bd5d4c22212d5c8611219bb87da2d82aefe8e88b1f970a0f133cc3", @@ -2370,21 +2384,21 @@ "typeString": "literal_string \"Transaction type does not match\"" } ], - "id": 153, + "id": 211, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2741:7:0", + "referencedDeclaration": 5313, + "src": "2741:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 161, + "id": 219, "isConstant": false, "isLValue": false, "isPure": false, @@ -2392,38 +2406,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2741:137:0", + "src": "2741:137:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 162, + "id": 220, "nodeType": "ExpressionStatement", - "src": "2741:137:0" + "src": "2741:137:1" }, { - "id": 163, + "id": 221, "nodeType": "PlaceholderStatement", - "src": "2888:1:0" + "src": "2888:1:1" } ] }, "documentation": null, - "id": 165, + "id": 223, "name": "checkTransactionType", "nodeType": "ModifierDefinition", "parameters": { - "id": 152, + "id": 210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 149, + "id": 207, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 165, - "src": "2661:18:0", + "scope": 223, + "src": "2661:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2431,10 +2445,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 148, + "id": 206, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2661:7:0", + "src": "2661:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2445,26 +2459,26 @@ }, { "constant": false, - "id": 151, + "id": 209, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 165, - "src": "2689:31:0", + "scope": 223, + "src": "2689:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 150, + "id": 208, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "2689:15:0", + "referencedDeclaration": 70, + "src": "2689:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -2472,16 +2486,16 @@ "visibility": "internal" } ], - "src": "2651:75:0" + "src": "2651:75:1" }, - "src": "2622:274:0", + "src": "2622:274:1", "visibility": "internal" }, { "body": { - "id": 181, + "id": 239, "nodeType": "Block", - "src": "2941:164:0", + "src": "2941:164:1", "statements": [ { "expression": { @@ -2493,7 +2507,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 176, + "id": 234, "isConstant": false, "isLValue": false, "isPure": false, @@ -2502,18 +2516,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 170, + "id": 228, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "2972:3:0", + "referencedDeclaration": 5309, + "src": "2972:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 171, + "id": 229, "isConstant": false, "isLValue": false, "isPure": false, @@ -2521,7 +2535,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2972:10:0", + "src": "2972:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2535,26 +2549,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 172, + "id": 230, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2986:12:0", + "referencedDeclaration": 133, + "src": "2986:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 174, + "id": 232, "indexExpression": { "argumentTypes": null, - "id": 173, + "id": 231, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 167, - "src": "2999:10:0", + "referencedDeclaration": 225, + "src": "2999:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2565,27 +2579,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2986:24:0", + "src": "2986:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 175, + "id": 233, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "buyer", "nodeType": "MemberAccess", - "referencedDeclaration": 52, - "src": "2986:30:0", + "referencedDeclaration": 110, + "src": "2986:30:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2972:44:0", + "src": "2972:44:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2594,14 +2608,14 @@ { "argumentTypes": null, "hexValue": "54686520696e69746961746f72206f6620746865207472616e73616374696f6e206973206e6f74206275796572", - "id": 177, + "id": 235, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3030:47:0", + "src": "3030:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_b4fc72d2373e6fc668b2bc10a6c84713d84de5f4dc58bb69053e1a18ae67c2f9", @@ -2621,21 +2635,21 @@ "typeString": "literal_string \"The initiator of the transaction is not buyer\"" } ], - "id": 169, + "id": 227, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2951:7:0", + "referencedDeclaration": 5313, + "src": "2951:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 178, + "id": 236, "isConstant": false, "isLValue": false, "isPure": false, @@ -2643,38 +2657,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2951:136:0", + "src": "2951:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 179, + "id": 237, "nodeType": "ExpressionStatement", - "src": "2951:136:0" + "src": "2951:136:1" }, { - "id": 180, + "id": 238, "nodeType": "PlaceholderStatement", - "src": "3097:1:0" + "src": "3097:1:1" } ] }, "documentation": null, - "id": 182, + "id": 240, "name": "onlyBuyer", "nodeType": "ModifierDefinition", "parameters": { - "id": 168, + "id": 226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 167, + "id": 225, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 182, - "src": "2921:18:0", + "scope": 240, + "src": "2921:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2682,10 +2696,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 166, + "id": 224, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2921:7:0", + "src": "2921:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2695,16 +2709,16 @@ "visibility": "internal" } ], - "src": "2920:20:0" + "src": "2920:20:1" }, - "src": "2902:203:0", + "src": "2902:203:1", "visibility": "internal" }, { "body": { - "id": 233, + "id": 291, "nodeType": "Block", - "src": "4270:339:0", + "src": "4270:339:1", "statements": [ { "expression": { @@ -2712,12 +2726,12 @@ "arguments": [ { "argumentTypes": null, - "id": 209, + "id": 267, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 184, - "src": "4309:5:0", + "referencedDeclaration": 242, + "src": "4309:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2725,12 +2739,12 @@ }, { "argumentTypes": null, - "id": 210, + "id": 268, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 186, - "src": "4328:6:0", + "referencedDeclaration": 244, + "src": "4328:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2738,12 +2752,12 @@ }, { "argumentTypes": null, - "id": 211, + "id": 269, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 188, - "src": "4348:9:0", + "referencedDeclaration": 246, + "src": "4348:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2751,12 +2765,12 @@ }, { "argumentTypes": null, - "id": 212, + "id": 270, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 190, - "src": "4371:9:0", + "referencedDeclaration": 248, + "src": "4371:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -2764,12 +2778,12 @@ }, { "argumentTypes": null, - "id": 213, + "id": 271, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 192, - "src": "4394:12:0", + "referencedDeclaration": 250, + "src": "4394:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -2777,12 +2791,12 @@ }, { "argumentTypes": null, - "id": 214, + "id": 272, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4420:10:0", + "referencedDeclaration": 252, + "src": "4420:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2792,18 +2806,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 215, + "id": 273, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4444:3:0", + "referencedDeclaration": 5309, + "src": "4444:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 216, + "id": 274, "isConstant": false, "isLValue": false, "isPure": false, @@ -2811,7 +2825,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4444:9:0", + "src": "4444:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2819,12 +2833,12 @@ }, { "argumentTypes": null, - "id": 217, + "id": 275, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 196, - "src": "4467:8:0", + "referencedDeclaration": 254, + "src": "4467:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -2834,18 +2848,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 218, + "id": 276, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "4489:15:0", + "referencedDeclaration": 70, + "src": "4489:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 219, + "id": 277, "isConstant": false, "isLValue": false, "isPure": true, @@ -2853,9 +2867,9 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4489:21:0", + "src": "4489:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -2865,14 +2879,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 221, + "id": 279, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4532:1:0", + "src": "4532:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2888,20 +2902,20 @@ "typeString": "int_const 0" } ], - "id": 220, + "id": 278, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4524:7:0", + "src": "4524:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 222, + "id": 280, "isConstant": false, "isLValue": false, "isPure": true, @@ -2909,7 +2923,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4524:10:0", + "src": "4524:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2951,7 +2965,7 @@ "typeString": "bytes20" }, { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, { @@ -2959,18 +2973,18 @@ "typeString": "address" } ], - "id": 208, + "id": 266, "name": "_addTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1207, - "src": "4280:15:0", + "referencedDeclaration": 1265, + "src": "4280:15:1", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$12_$_t_address_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$70_$_t_address_$returns$__$", "typeString": "function (address,address,address,uint8,uint32,bytes32,uint256,bytes20,enum Escrow_v1_0.TransactionType,address)" } }, - "id": 223, + "id": 281, "isConstant": false, "isLValue": false, "isPure": false, @@ -2978,15 +2992,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4280:264:0", + "src": "4280:264:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 224, + "id": 282, "nodeType": "ExpressionStatement", - "src": "4280:264:0" + "src": "4280:264:1" }, { "eventCall": { @@ -2994,12 +3008,12 @@ "arguments": [ { "argumentTypes": null, - "id": 226, + "id": 284, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4567:10:0", + "referencedDeclaration": 252, + "src": "4567:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3009,18 +3023,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 227, + "id": 285, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4579:3:0", + "referencedDeclaration": 5309, + "src": "4579:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 228, + "id": 286, "isConstant": false, "isLValue": false, "isPure": false, @@ -3028,7 +3042,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4579:10:0", + "src": "4579:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3038,18 +3052,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 229, + "id": 287, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4591:3:0", + "referencedDeclaration": 5309, + "src": "4591:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 230, + "id": 288, "isConstant": false, "isLValue": false, "isPure": false, @@ -3057,7 +3071,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4591:9:0", + "src": "4591:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3079,18 +3093,18 @@ "typeString": "uint256" } ], - "id": 225, + "id": 283, "name": "Funded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 38, - "src": "4560:6:0", + "referencedDeclaration": 96, + "src": "4560:6:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 231, + "id": 289, "isConstant": false, "isLValue": false, "isPure": false, @@ -3098,20 +3112,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4560:41:0", + "src": "4560:41:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 232, + "id": 290, "nodeType": "EmitStatement", - "src": "4555:46:0" + "src": "4555:46:1" } ] }, "documentation": "@dev Add new transaction in the contract\n@param buyer The buyer of the transaction\n@param seller The seller of the listing associated with the transaction\n@param moderator Moderator for this transaction\n@param threshold Minimum number of signatures required to released funds\n@param timeoutHours Hours after which seller can release funds into his\nfavour by signing transaction unilaterally\n@param scriptHash keccak256 hash of the redeem script\n@param uniqueId bytes20 unique id for the transaction, generated by\nETH wallet\nRedeem Script format will be following\n\n\nPass amount of the ETH to be put in escrow", - "id": 234, + "id": 292, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -3120,115 +3134,115 @@ "arguments": [ { "argumentTypes": null, - "id": 199, + "id": 257, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4193:10:0", + "referencedDeclaration": 252, + "src": "4193:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 200, + "id": 258, "modifierName": { "argumentTypes": null, - "id": 198, + "id": 256, "name": "transactionDoesNotExist", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 115, - "src": "4169:23:0", + "referencedDeclaration": 173, + "src": "4169:23:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "4169:35:0" + "src": "4169:35:1" }, { "arguments": [ { "argumentTypes": null, - "id": 202, + "id": 260, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 184, - "src": "4228:5:0", + "referencedDeclaration": 242, + "src": "4228:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 203, + "id": 261, "modifierName": { "argumentTypes": null, - "id": 201, + "id": 259, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "4213:14:0", + "referencedDeclaration": 205, + "src": "4213:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "4213:21:0" + "src": "4213:21:1" }, { "arguments": [ { "argumentTypes": null, - "id": 205, + "id": 263, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 186, - "src": "4258:6:0", + "referencedDeclaration": 244, + "src": "4258:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 206, + "id": 264, "modifierName": { "argumentTypes": null, - "id": 204, + "id": 262, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "4243:14:0", + "referencedDeclaration": 205, + "src": "4243:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "4243:22:0" + "src": "4243:22:1" } ], "name": "addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 197, + "id": 255, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 184, + "id": 242, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3949:13:0", + "scope": 292, + "src": "3949:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3236,10 +3250,10 @@ "typeString": "address" }, "typeName": { - "id": 183, + "id": 241, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3949:7:0", + "src": "3949:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3250,11 +3264,11 @@ }, { "constant": false, - "id": 186, + "id": 244, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3972:14:0", + "scope": 292, + "src": "3972:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3262,10 +3276,10 @@ "typeString": "address" }, "typeName": { - "id": 185, + "id": 243, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3972:7:0", + "src": "3972:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3276,11 +3290,11 @@ }, { "constant": false, - "id": 188, + "id": 246, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3996:17:0", + "scope": 292, + "src": "3996:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3288,10 +3302,10 @@ "typeString": "address" }, "typeName": { - "id": 187, + "id": 245, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3996:7:0", + "src": "3996:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3302,11 +3316,11 @@ }, { "constant": false, - "id": 190, + "id": 248, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4023:15:0", + "scope": 292, + "src": "4023:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3314,10 +3328,10 @@ "typeString": "uint8" }, "typeName": { - "id": 189, + "id": 247, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "4023:5:0", + "src": "4023:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -3328,11 +3342,11 @@ }, { "constant": false, - "id": 192, + "id": 250, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4048:19:0", + "scope": 292, + "src": "4048:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3340,10 +3354,10 @@ "typeString": "uint32" }, "typeName": { - "id": 191, + "id": 249, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "4048:6:0", + "src": "4048:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -3354,11 +3368,11 @@ }, { "constant": false, - "id": 194, + "id": 252, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4077:18:0", + "scope": 292, + "src": "4077:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3366,10 +3380,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 193, + "id": 251, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4077:7:0", + "src": "4077:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3380,11 +3394,11 @@ }, { "constant": false, - "id": 196, + "id": 254, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4105:16:0", + "scope": 292, + "src": "4105:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3392,10 +3406,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 195, + "id": 253, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "4105:7:0", + "src": "4105:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -3405,26 +3419,26 @@ "visibility": "internal" } ], - "src": "3939:188:0" + "src": "3939:188:1" }, "payable": true, "returnParameters": { - "id": 207, + "id": 265, "nodeType": "ParameterList", "parameters": [], - "src": "4270:0:0" + "src": "4270:0:1" }, - "scope": 1208, - "src": "3916:693:0", + "scope": 1266, + "src": "3916:693:1", "stateMutability": "payable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 307, + "id": 365, "nodeType": "Block", - "src": "6010:597:0", + "src": "6010:597:1", "statements": [ { "expression": { @@ -3432,12 +3446,12 @@ "arguments": [ { "argumentTypes": null, - "id": 268, + "id": 326, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 236, - "src": "6050:5:0", + "referencedDeclaration": 294, + "src": "6050:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3445,12 +3459,12 @@ }, { "argumentTypes": null, - "id": 269, + "id": 327, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 238, - "src": "6069:6:0", + "referencedDeclaration": 296, + "src": "6069:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3458,12 +3472,12 @@ }, { "argumentTypes": null, - "id": 270, + "id": 328, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 240, - "src": "6089:9:0", + "referencedDeclaration": 298, + "src": "6089:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3471,12 +3485,12 @@ }, { "argumentTypes": null, - "id": 271, + "id": 329, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 242, - "src": "6112:9:0", + "referencedDeclaration": 300, + "src": "6112:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -3484,12 +3498,12 @@ }, { "argumentTypes": null, - "id": 272, + "id": 330, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 244, - "src": "6135:12:0", + "referencedDeclaration": 302, + "src": "6135:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -3497,12 +3511,12 @@ }, { "argumentTypes": null, - "id": 273, + "id": 331, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "6161:10:0", + "referencedDeclaration": 304, + "src": "6161:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3510,12 +3524,12 @@ }, { "argumentTypes": null, - "id": 274, + "id": 332, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6185:5:0", + "referencedDeclaration": 306, + "src": "6185:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3523,12 +3537,12 @@ }, { "argumentTypes": null, - "id": 275, + "id": 333, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 250, - "src": "6204:8:0", + "referencedDeclaration": 308, + "src": "6204:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -3538,18 +3552,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 276, + "id": 334, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "6226:15:0", + "referencedDeclaration": 70, + "src": "6226:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 277, + "id": 335, "isConstant": false, "isLValue": false, "isPure": true, @@ -3557,20 +3571,20 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6226:21:0", + "src": "6226:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, { "argumentTypes": null, - "id": 278, + "id": 336, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "6261:12:0", + "referencedDeclaration": 310, + "src": "6261:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3612,7 +3626,7 @@ "typeString": "bytes20" }, { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, { @@ -3620,18 +3634,18 @@ "typeString": "address" } ], - "id": 267, + "id": 325, "name": "_addTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1207, - "src": "6021:15:0", + "referencedDeclaration": 1265, + "src": "6021:15:1", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$12_$_t_address_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$70_$_t_address_$returns$__$", "typeString": "function (address,address,address,uint8,uint32,bytes32,uint256,bytes20,enum Escrow_v1_0.TransactionType,address)" } }, - "id": 279, + "id": 337, "isConstant": false, "isLValue": false, "isPure": false, @@ -3639,43 +3653,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6021:262:0", + "src": "6021:262:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 280, + "id": 338, "nodeType": "ExpressionStatement", - "src": "6021:262:0" + "src": "6021:262:1" }, { "assignments": [ - 282 + 340 ], "declarations": [ { "constant": false, - "id": 282, + "id": 340, "name": "token", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "6294:20:0", + "scope": 366, + "src": "6294:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 281, + "id": 339, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "6294:14:0", + "referencedDeclaration": 4445, + "src": "6294:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -3683,18 +3697,18 @@ "visibility": "internal" } ], - "id": 286, + "id": 344, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 284, + "id": 342, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "6332:12:0", + "referencedDeclaration": 310, + "src": "6332:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3708,18 +3722,18 @@ "typeString": "address" } ], - "id": 283, + "id": 341, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "6317:14:0", + "referencedDeclaration": 4445, + "src": "6317:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 285, + "id": 343, "isConstant": false, "isLValue": false, "isPure": false, @@ -3727,14 +3741,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6317:28:0", + "src": "6317:28:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "6294:51:0" + "src": "6294:51:1" }, { "expression": { @@ -3747,18 +3761,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 290, + "id": 348, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "6396:3:0", + "referencedDeclaration": 5309, + "src": "6396:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 291, + "id": 349, "isConstant": false, "isLValue": false, "isPure": false, @@ -3766,7 +3780,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6396:10:0", + "src": "6396:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3777,14 +3791,14 @@ "arguments": [ { "argumentTypes": null, - "id": 293, + "id": 351, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "6416:4:0", + "referencedDeclaration": 5328, + "src": "6416:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -3792,24 +3806,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 292, + "id": 350, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6408:7:0", + "src": "6408:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 294, + "id": 352, "isConstant": false, "isLValue": false, "isPure": false, @@ -3817,7 +3831,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6408:13:0", + "src": "6408:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3825,12 +3839,12 @@ }, { "argumentTypes": null, - "id": 295, + "id": 353, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6423:5:0", + "referencedDeclaration": 306, + "src": "6423:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3854,32 +3868,32 @@ ], "expression": { "argumentTypes": null, - "id": 288, + "id": 346, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 282, - "src": "6377:5:0", + "referencedDeclaration": 340, + "src": "6377:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 289, + "id": 347, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 2255, - "src": "6377:18:0", + "referencedDeclaration": 4423, + "src": "6377:18:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 296, + "id": 354, "isConstant": false, "isLValue": false, "isPure": false, @@ -3887,7 +3901,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6377:52:0", + "src": "6377:52:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3896,14 +3910,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642c206d6179626520796f7520646964206e6f7420617070726f766520657363726f7720636f6e747261637420746f207370656e64206f6e20626568616c66206f662073656e646572", - "id": 297, + "id": 355, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6443:95:0", + "src": "6443:95:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_d81b627ac67759234197a5bdf4d9f7d33298e824ce7bd47e08ce9919cd96c696", @@ -3923,21 +3937,21 @@ "typeString": "literal_string \"Token transfer failed, maybe you did not approve escrow contract to spend on behalf of sender\"" } ], - "id": 287, + "id": 345, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "6356:7:0", + "referencedDeclaration": 5313, + "src": "6356:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 298, + "id": 356, "isConstant": false, "isLValue": false, "isPure": false, @@ -3945,15 +3959,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6356:192:0", + "src": "6356:192:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 299, + "id": 357, "nodeType": "ExpressionStatement", - "src": "6356:192:0" + "src": "6356:192:1" }, { "eventCall": { @@ -3961,12 +3975,12 @@ "arguments": [ { "argumentTypes": null, - "id": 301, + "id": 359, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "6570:10:0", + "referencedDeclaration": 304, + "src": "6570:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3976,18 +3990,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 302, + "id": 360, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "6582:3:0", + "referencedDeclaration": 5309, + "src": "6582:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 303, + "id": 361, "isConstant": false, "isLValue": false, "isPure": false, @@ -3995,7 +4009,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6582:10:0", + "src": "6582:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4003,12 +4017,12 @@ }, { "argumentTypes": null, - "id": 304, + "id": 362, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6594:5:0", + "referencedDeclaration": 306, + "src": "6594:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4030,18 +4044,18 @@ "typeString": "uint256" } ], - "id": 300, + "id": 358, "name": "Funded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 38, - "src": "6563:6:0", + "referencedDeclaration": 96, + "src": "6563:6:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 305, + "id": 363, "isConstant": false, "isLValue": false, "isPure": false, @@ -4049,20 +4063,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6563:37:0", + "src": "6563:37:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 306, + "id": 364, "nodeType": "EmitStatement", - "src": "6558:42:0" + "src": "6558:42:1" } ] }, "documentation": "@dev Add new transaction in the contract\n@param buyer The buyer of the transaction\n@param seller The seller of the listing associated with the transaction\n@param moderator Moderator for this transaction\n@param threshold Minimum number of signatures required to released funds\n@param timeoutHours Hours after which seller can release funds into his\nfavour by signing transaction unilaterally\n@param scriptHash keccak256 hash of the redeem script\n@param value Amount of tokens to be put in escrow\n@param uniqueId bytes20 unique id for the transaction, generated by\nETH wallet\n@param tokenAddress Address of the token to be used\nRedeem Script format will be following:\n\n\nApprove escrow contract to spend amount of token on sender's behalf", - "id": 308, + "id": 366, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -4071,148 +4085,148 @@ "arguments": [ { "argumentTypes": null, - "id": 255, + "id": 313, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "5896:10:0", + "referencedDeclaration": 304, + "src": "5896:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 256, + "id": 314, "modifierName": { "argumentTypes": null, - "id": 254, + "id": 312, "name": "transactionDoesNotExist", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 115, - "src": "5872:23:0", + "referencedDeclaration": 173, + "src": "5872:23:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "5872:35:0" + "src": "5872:35:1" }, { "arguments": [ { "argumentTypes": null, - "id": 258, + "id": 316, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 236, - "src": "5931:5:0", + "referencedDeclaration": 294, + "src": "5931:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 259, + "id": 317, "modifierName": { "argumentTypes": null, - "id": 257, + "id": 315, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5916:14:0", + "referencedDeclaration": 205, + "src": "5916:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5916:21:0" + "src": "5916:21:1" }, { "arguments": [ { "argumentTypes": null, - "id": 261, + "id": 319, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 238, - "src": "5961:6:0", + "referencedDeclaration": 296, + "src": "5961:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 262, + "id": 320, "modifierName": { "argumentTypes": null, - "id": 260, + "id": 318, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5946:14:0", + "referencedDeclaration": 205, + "src": "5946:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5946:22:0" + "src": "5946:22:1" }, { "arguments": [ { "argumentTypes": null, - "id": 264, + "id": 322, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "5992:12:0", + "referencedDeclaration": 310, + "src": "5992:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 265, + "id": 323, "modifierName": { "argumentTypes": null, - "id": 263, + "id": 321, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5977:14:0", + "referencedDeclaration": 205, + "src": "5977:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5977:28:0" + "src": "5977:28:1" } ], "name": "addTokenTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 253, + "id": 311, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 236, + "id": 294, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5615:13:0", + "scope": 366, + "src": "5615:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4220,10 +4234,10 @@ "typeString": "address" }, "typeName": { - "id": 235, + "id": 293, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5615:7:0", + "src": "5615:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4234,11 +4248,11 @@ }, { "constant": false, - "id": 238, + "id": 296, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5638:14:0", + "scope": 366, + "src": "5638:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4246,10 +4260,10 @@ "typeString": "address" }, "typeName": { - "id": 237, + "id": 295, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5638:7:0", + "src": "5638:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4260,11 +4274,11 @@ }, { "constant": false, - "id": 240, + "id": 298, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5662:17:0", + "scope": 366, + "src": "5662:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4272,10 +4286,10 @@ "typeString": "address" }, "typeName": { - "id": 239, + "id": 297, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5662:7:0", + "src": "5662:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4286,11 +4300,11 @@ }, { "constant": false, - "id": 242, + "id": 300, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5689:15:0", + "scope": 366, + "src": "5689:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4298,10 +4312,10 @@ "typeString": "uint8" }, "typeName": { - "id": 241, + "id": 299, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "5689:5:0", + "src": "5689:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -4312,11 +4326,11 @@ }, { "constant": false, - "id": 244, + "id": 302, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5714:19:0", + "scope": 366, + "src": "5714:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4324,10 +4338,10 @@ "typeString": "uint32" }, "typeName": { - "id": 243, + "id": 301, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "5714:6:0", + "src": "5714:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -4338,11 +4352,11 @@ }, { "constant": false, - "id": 246, + "id": 304, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5743:18:0", + "scope": 366, + "src": "5743:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4350,10 +4364,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 245, + "id": 303, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5743:7:0", + "src": "5743:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4364,11 +4378,11 @@ }, { "constant": false, - "id": 248, + "id": 306, "name": "value", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5771:13:0", + "scope": 366, + "src": "5771:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4376,10 +4390,10 @@ "typeString": "uint256" }, "typeName": { - "id": 247, + "id": 305, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5771:7:0", + "src": "5771:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4390,11 +4404,11 @@ }, { "constant": false, - "id": 250, + "id": 308, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5794:16:0", + "scope": 366, + "src": "5794:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4402,10 +4416,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 249, + "id": 307, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "5794:7:0", + "src": "5794:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -4416,11 +4430,11 @@ }, { "constant": false, - "id": 252, + "id": 310, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5820:20:0", + "scope": 366, + "src": "5820:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4428,10 +4442,10 @@ "typeString": "address" }, "typeName": { - "id": 251, + "id": 309, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5820:7:0", + "src": "5820:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4441,26 +4455,26 @@ "visibility": "internal" } ], - "src": "5605:241:0" + "src": "5605:241:1" }, "payable": false, "returnParameters": { - "id": 266, + "id": 324, "nodeType": "ParameterList", "parameters": [], - "src": "6010:0:0" + "src": "6010:0:1" }, - "scope": 1208, - "src": "5577:1030:0", + "scope": 1266, + "src": "5577:1030:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 324, + "id": 382, "nodeType": "Block", - "src": "7000:75:0", + "src": "7000:75:1", "statements": [ { "expression": { @@ -4471,26 +4485,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 317, + "id": 375, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "7017:12:0", + "referencedDeclaration": 133, + "src": "7017:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 319, + "id": 377, "indexExpression": { "argumentTypes": null, - "id": 318, + "id": 376, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 310, - "src": "7030:10:0", + "referencedDeclaration": 368, + "src": "7030:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4501,35 +4515,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7017:24:0", + "src": "7017:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 320, + "id": 378, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "7017:38:0", + "referencedDeclaration": 128, + "src": "7017:38:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 322, + "id": 380, "indexExpression": { "argumentTypes": null, - "id": 321, + "id": 379, "name": "beneficiary", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "7056:11:0", + "referencedDeclaration": 370, + "src": "7056:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4540,21 +4554,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7017:51:0", + "src": "7017:51:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 316, - "id": 323, + "functionReturnParameters": 374, + "id": 381, "nodeType": "Return", - "src": "7010:58:0" + "src": "7010:58:1" } ] }, "documentation": "@dev This method will check whether given address was a beneficiary of\ntransaction execution or not\n@param scriptHash script hash of the transaction\n@param beneficiary Beneficiary address to be checked", - "id": 325, + "id": 383, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -4562,16 +4576,16 @@ "name": "checkBeneficiary", "nodeType": "FunctionDefinition", "parameters": { - "id": 313, + "id": 371, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 310, + "id": 368, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6889:18:0", + "scope": 383, + "src": "6889:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4579,10 +4593,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 309, + "id": 367, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6889:7:0", + "src": "6889:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4593,11 +4607,11 @@ }, { "constant": false, - "id": 312, + "id": 370, "name": "beneficiary", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6917:19:0", + "scope": 383, + "src": "6917:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4605,10 +4619,10 @@ "typeString": "address" }, "typeName": { - "id": 311, + "id": 369, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6917:7:0", + "src": "6917:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4618,20 +4632,20 @@ "visibility": "internal" } ], - "src": "6879:63:0" + "src": "6879:63:1" }, "payable": false, "returnParameters": { - "id": 316, + "id": 374, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 315, + "id": 373, "name": "", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6990:4:0", + "scope": 383, + "src": "6990:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4639,10 +4653,10 @@ "typeString": "bool" }, "typeName": { - "id": 314, + "id": 372, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6990:4:0", + "src": "6990:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4652,19 +4666,19 @@ "visibility": "internal" } ], - "src": "6989:6:0" + "src": "6989:6:1" }, - "scope": 1208, - "src": "6854:221:0", + "scope": 1266, + "src": "6854:221:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 341, + "id": 399, "nodeType": "Block", - "src": "7448:61:0", + "src": "7448:61:1", "statements": [ { "expression": { @@ -4675,26 +4689,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 334, + "id": 392, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "7465:12:0", + "referencedDeclaration": 133, + "src": "7465:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 336, + "id": 394, "indexExpression": { "argumentTypes": null, - "id": 335, + "id": 393, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 327, - "src": "7478:10:0", + "referencedDeclaration": 385, + "src": "7478:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4705,35 +4719,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7465:24:0", + "src": "7465:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 337, + "id": 395, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "7465:30:0", + "referencedDeclaration": 124, + "src": "7465:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 339, + "id": 397, "indexExpression": { "argumentTypes": null, - "id": 338, + "id": 396, "name": "party", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 329, - "src": "7496:5:0", + "referencedDeclaration": 387, + "src": "7496:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4744,21 +4758,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7465:37:0", + "src": "7465:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 333, - "id": 340, + "functionReturnParameters": 391, + "id": 398, "nodeType": "Return", - "src": "7458:44:0" + "src": "7458:44:1" } ] }, "documentation": "@dev This method will check whether given party has voted or not\n@param scriptHash script hash of the transaction\n@param party Address of the party whose vote has to be checked\n@return bool vote", - "id": 342, + "id": 400, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -4766,16 +4780,16 @@ "name": "checkVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 330, + "id": 388, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 327, + "id": 385, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7343:18:0", + "scope": 400, + "src": "7343:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4783,10 +4797,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 326, + "id": 384, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7343:7:0", + "src": "7343:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4797,11 +4811,11 @@ }, { "constant": false, - "id": 329, + "id": 387, "name": "party", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7371:13:0", + "scope": 400, + "src": "7371:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4809,10 +4823,10 @@ "typeString": "address" }, "typeName": { - "id": 328, + "id": 386, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7371:7:0", + "src": "7371:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4822,20 +4836,20 @@ "visibility": "internal" } ], - "src": "7333:57:0" + "src": "7333:57:1" }, "payable": false, "returnParameters": { - "id": 333, + "id": 391, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 332, + "id": 390, "name": "", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7438:4:0", + "scope": 400, + "src": "7438:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4843,10 +4857,10 @@ "typeString": "bool" }, "typeName": { - "id": 331, + "id": 389, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "7438:4:0", + "src": "7438:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4856,19 +4870,19 @@ "visibility": "internal" } ], - "src": "7437:6:0" + "src": "7437:6:1" }, - "scope": 1208, - "src": "7315:194:0", + "scope": 1266, + "src": "7315:194:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 391, + "id": 449, "nodeType": "Block", - "src": "8116:238:0", + "src": "8116:238:1", "statements": [ { "expression": { @@ -4880,7 +4894,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 365, + "id": 423, "isConstant": false, "isLValue": false, "isPure": false, @@ -4889,18 +4903,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 362, + "id": 420, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8135:3:0", + "referencedDeclaration": 5309, + "src": "8135:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 363, + "id": 421, "isConstant": false, "isLValue": false, "isPure": false, @@ -4908,7 +4922,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8135:9:0", + "src": "8135:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4919,14 +4933,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 364, + "id": 422, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8147:1:0", + "src": "8147:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4934,7 +4948,7 @@ }, "value": "0" }, - "src": "8135:13:0", + "src": "8135:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4943,14 +4957,14 @@ { "argumentTypes": null, "hexValue": "56616c7565206d7573742062652067726561746572207468616e207a65726f2e", - "id": 366, + "id": 424, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8150:34:0", + "src": "8150:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_21fbec2be6560b9ccffc4980d43c0d147770168e7aaf24999b418b9010085622", @@ -4970,21 +4984,21 @@ "typeString": "literal_string \"Value must be greater than zero.\"" } ], - "id": 361, + "id": 419, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8127:7:0", + "referencedDeclaration": 5313, + "src": "8127:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 367, + "id": 425, "isConstant": false, "isLValue": false, "isPure": false, @@ -4992,20 +5006,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8127:58:0", + "src": "8127:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 368, + "id": 426, "nodeType": "ExpressionStatement", - "src": "8127:58:0" + "src": "8127:58:1" }, { "expression": { "argumentTypes": null, - "id": 381, + "id": 439, "isConstant": false, "isLValue": false, "isPure": false, @@ -5016,26 +5030,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 369, + "id": 427, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "8196:12:0", + "referencedDeclaration": 133, + "src": "8196:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 371, + "id": 429, "indexExpression": { "argumentTypes": null, - "id": 370, + "id": 428, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8209:10:0", + "referencedDeclaration": 402, + "src": "8209:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5046,21 +5060,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8196:24:0", + "src": "8196:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 372, + "id": 430, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "8196:30:0", + "referencedDeclaration": 98, + "src": "8196:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5075,18 +5089,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 378, + "id": 436, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8277:3:0", + "referencedDeclaration": 5309, + "src": "8277:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 379, + "id": 437, "isConstant": false, "isLValue": false, "isPure": false, @@ -5094,7 +5108,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8277:9:0", + "src": "8277:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5114,26 +5128,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 373, + "id": 431, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "8229:12:0", + "referencedDeclaration": 133, + "src": "8229:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 375, + "id": 433, "indexExpression": { "argumentTypes": null, - "id": 374, + "id": 432, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8242:10:0", + "referencedDeclaration": 402, + "src": "8242:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5144,41 +5158,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8229:24:0", + "src": "8229:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 376, + "id": 434, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "8229:30:0", + "referencedDeclaration": 98, + "src": "8229:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 377, + "id": 435, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "8229:47:0", + "referencedDeclaration": 4601, + "src": "8229:47:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 380, + "id": 438, "isConstant": false, "isLValue": false, "isPure": false, @@ -5186,21 +5200,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8229:58:0", + "src": "8229:58:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8196:91:0", + "src": "8196:91:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 382, + "id": 440, "nodeType": "ExpressionStatement", - "src": "8196:91:0" + "src": "8196:91:1" }, { "eventCall": { @@ -5208,12 +5222,12 @@ "arguments": [ { "argumentTypes": null, - "id": 384, + "id": 442, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8313:10:0", + "referencedDeclaration": 402, + "src": "8313:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5223,18 +5237,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 385, + "id": 443, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8325:3:0", + "referencedDeclaration": 5309, + "src": "8325:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 386, + "id": 444, "isConstant": false, "isLValue": false, "isPure": false, @@ -5242,7 +5256,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8325:10:0", + "src": "8325:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5252,18 +5266,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 387, + "id": 445, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8337:3:0", + "referencedDeclaration": 5309, + "src": "8337:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 388, + "id": 446, "isConstant": false, "isLValue": false, "isPure": false, @@ -5271,7 +5285,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8337:9:0", + "src": "8337:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5293,18 +5307,18 @@ "typeString": "uint256" } ], - "id": 383, + "id": 441, "name": "FundAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 30, - "src": "8303:9:0", + "referencedDeclaration": 88, + "src": "8303:9:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 389, + "id": 447, "isConstant": false, "isLValue": false, "isPure": false, @@ -5312,20 +5326,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8303:44:0", + "src": "8303:44:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 390, + "id": 448, "nodeType": "EmitStatement", - "src": "8298:49:0" + "src": "8298:49:1" } ] }, "documentation": "@dev Allows buyer of the transaction to add more funds(ether) in the\ntransaction.\nThis will help to cater scenarios wherein initially buyer missed to\nfund transaction as required\n@param scriptHash script hash of the transaction\nOnly buyer of the transaction can invoke this method", - "id": 392, + "id": 450, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -5334,78 +5348,78 @@ "arguments": [ { "argumentTypes": null, - "id": 347, + "id": 405, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "7971:10:0", + "referencedDeclaration": 402, + "src": "7971:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 348, + "id": 406, "modifierName": { "argumentTypes": null, - "id": 346, + "id": 404, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "7953:17:0", + "referencedDeclaration": 157, + "src": "7953:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "7953:29:0" + "src": "7953:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 350, + "id": 408, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8005:10:0", + "referencedDeclaration": 402, + "src": "8005:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 351, + "id": 409, "modifierName": { "argumentTypes": null, - "id": 349, + "id": 407, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "7991:13:0", + "referencedDeclaration": 190, + "src": "7991:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "7991:25:0" + "src": "7991:25:1" }, { "arguments": [ { "argumentTypes": null, - "id": 353, + "id": 411, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8046:10:0", + "referencedDeclaration": 402, + "src": "8046:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5415,18 +5429,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 354, + "id": 412, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "8058:15:0", + "referencedDeclaration": 70, + "src": "8058:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 355, + "id": 413, "isConstant": false, "isLValue": false, "isPure": true, @@ -5434,77 +5448,77 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8058:21:0", + "src": "8058:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } } ], - "id": 356, + "id": 414, "modifierName": { "argumentTypes": null, - "id": 352, + "id": 410, "name": "checkTransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 165, - "src": "8025:20:0", + "referencedDeclaration": 223, + "src": "8025:20:1", "typeDescriptions": { - "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$70_$", "typeString": "modifier (bytes32,enum Escrow_v1_0.TransactionType)" } }, "nodeType": "ModifierInvocation", - "src": "8025:55:0" + "src": "8025:55:1" }, { "arguments": [ { "argumentTypes": null, - "id": 358, + "id": 416, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8099:10:0", + "referencedDeclaration": 402, + "src": "8099:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 359, + "id": 417, "modifierName": { "argumentTypes": null, - "id": 357, + "id": 415, "name": "onlyBuyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 182, - "src": "8089:9:0", + "referencedDeclaration": 240, + "src": "8089:9:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8089:21:0" + "src": "8089:21:1" } ], "name": "addFundsToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 345, + "id": 403, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 344, + "id": 402, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 392, - "src": "7887:18:0", + "scope": 450, + "src": "7887:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5512,10 +5526,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 343, + "id": 401, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7887:7:0", + "src": "7887:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5525,26 +5539,26 @@ "visibility": "internal" } ], - "src": "7877:34:0" + "src": "7877:34:1" }, "payable": true, "returnParameters": { - "id": 360, + "id": 418, "nodeType": "ParameterList", "parameters": [], - "src": "8116:0:0" + "src": "8116:0:1" }, - "scope": 1208, - "src": "7847:507:0", + "scope": 1266, + "src": "7847:507:1", "stateMutability": "payable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 462, + "id": 520, "nodeType": "Block", - "src": "8969:545:0", + "src": "8969:545:1", "statements": [ { "expression": { @@ -5556,19 +5570,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 416, + "id": 474, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 414, + "id": 472, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "8988:5:0", + "referencedDeclaration": 454, + "src": "8988:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5579,14 +5593,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 415, + "id": 473, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8996:1:0", + "src": "8996:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -5594,7 +5608,7 @@ }, "value": "0" }, - "src": "8988:9:0", + "src": "8988:9:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5603,14 +5617,14 @@ { "argumentTypes": null, "hexValue": "56616c7565206d7573742062652067726561746572207468616e207a65726f2e", - "id": 417, + "id": 475, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8999:34:0", + "src": "8999:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_21fbec2be6560b9ccffc4980d43c0d147770168e7aaf24999b418b9010085622", @@ -5630,21 +5644,21 @@ "typeString": "literal_string \"Value must be greater than zero.\"" } ], - "id": 413, + "id": 471, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8980:7:0", + "referencedDeclaration": 5313, + "src": "8980:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 418, + "id": 476, "isConstant": false, "isLValue": false, "isPure": false, @@ -5652,43 +5666,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8980:54:0", + "src": "8980:54:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 419, + "id": 477, "nodeType": "ExpressionStatement", - "src": "8980:54:0" + "src": "8980:54:1" }, { "assignments": [ - 421 + 479 ], "declarations": [ { "constant": false, - "id": 421, + "id": 479, "name": "token", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "9045:20:0", + "scope": 521, + "src": "9045:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 420, + "id": 478, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "9045:14:0", + "referencedDeclaration": 4445, + "src": "9045:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -5696,7 +5710,7 @@ "visibility": "internal" } ], - "id": 428, + "id": 486, "initialValue": { "argumentTypes": null, "arguments": [ @@ -5706,26 +5720,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 423, + "id": 481, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9096:12:0", + "referencedDeclaration": 133, + "src": "9096:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 425, + "id": 483, "indexExpression": { "argumentTypes": null, - "id": 424, + "id": 482, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9109:10:0", + "referencedDeclaration": 452, + "src": "9109:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -5736,21 +5750,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9096:24:0", + "src": "9096:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 426, + "id": 484, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 56, - "src": "9096:37:0", + "referencedDeclaration": 114, + "src": "9096:37:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5764,18 +5778,18 @@ "typeString": "address" } ], - "id": 422, + "id": 480, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "9068:14:0", + "referencedDeclaration": 4445, + "src": "9068:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 427, + "id": 485, "isConstant": false, "isLValue": false, "isPure": false, @@ -5783,14 +5797,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9068:75:0", + "src": "9068:75:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "9045:98:0" + "src": "9045:98:1" }, { "expression": { @@ -5803,18 +5817,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 432, + "id": 490, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "9194:3:0", + "referencedDeclaration": 5309, + "src": "9194:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 433, + "id": 491, "isConstant": false, "isLValue": false, "isPure": false, @@ -5822,7 +5836,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9194:10:0", + "src": "9194:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5833,14 +5847,14 @@ "arguments": [ { "argumentTypes": null, - "id": 435, + "id": 493, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "9214:4:0", + "referencedDeclaration": 5328, + "src": "9214:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -5848,24 +5862,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 434, + "id": 492, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "9206:7:0", + "src": "9206:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 436, + "id": 494, "isConstant": false, "isLValue": false, "isPure": false, @@ -5873,7 +5887,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9206:13:0", + "src": "9206:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5881,12 +5895,12 @@ }, { "argumentTypes": null, - "id": 437, + "id": 495, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9221:5:0", + "referencedDeclaration": 454, + "src": "9221:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5910,32 +5924,32 @@ ], "expression": { "argumentTypes": null, - "id": 430, + "id": 488, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 421, - "src": "9175:5:0", + "referencedDeclaration": 479, + "src": "9175:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 431, + "id": 489, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 2255, - "src": "9175:18:0", + "referencedDeclaration": 4423, + "src": "9175:18:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 438, + "id": 496, "isConstant": false, "isLValue": false, "isPure": false, @@ -5943,7 +5957,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9175:52:0", + "src": "9175:52:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5952,14 +5966,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642c206d6179626520796f7520646964206e6f7420617070726f76652074686520657363726f7720636f6e747261637420746f207370656e64206f6e20626568616c66206f6620746865206275796572", - "id": 439, + "id": 497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "9241:102:0", + "src": "9241:102:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e06258a5dc7e9fc23adefd6ac4d92ff40460664d63b6f526bbacd7feb017989e", @@ -5979,21 +5993,21 @@ "typeString": "literal_string \"Token transfer failed, maybe you did not approve the escrow contract to spend on behalf of the buyer\"" } ], - "id": 429, + "id": 487, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "9154:7:0", + "referencedDeclaration": 5313, + "src": "9154:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 440, + "id": 498, "isConstant": false, "isLValue": false, "isPure": false, @@ -6001,20 +6015,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9154:199:0", + "src": "9154:199:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 441, + "id": 499, "nodeType": "ExpressionStatement", - "src": "9154:199:0" + "src": "9154:199:1" }, { "expression": { "argumentTypes": null, - "id": 453, + "id": 511, "isConstant": false, "isLValue": false, "isPure": false, @@ -6025,26 +6039,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 442, + "id": 500, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9364:12:0", + "referencedDeclaration": 133, + "src": "9364:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 444, + "id": 502, "indexExpression": { "argumentTypes": null, - "id": 443, + "id": 501, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9377:10:0", + "referencedDeclaration": 452, + "src": "9377:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6055,21 +6069,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9364:24:0", + "src": "9364:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 445, + "id": 503, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "9364:30:0", + "referencedDeclaration": 98, + "src": "9364:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6082,12 +6096,12 @@ "arguments": [ { "argumentTypes": null, - "id": 451, + "id": 509, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9445:5:0", + "referencedDeclaration": 454, + "src": "9445:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6107,26 +6121,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 446, + "id": 504, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9397:12:0", + "referencedDeclaration": 133, + "src": "9397:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 448, + "id": 506, "indexExpression": { "argumentTypes": null, - "id": 447, + "id": 505, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9410:10:0", + "referencedDeclaration": 452, + "src": "9410:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6137,41 +6151,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9397:24:0", + "src": "9397:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 449, + "id": 507, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "9397:30:0", + "referencedDeclaration": 98, + "src": "9397:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 450, + "id": 508, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "9397:47:0", + "referencedDeclaration": 4601, + "src": "9397:47:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 452, + "id": 510, "isConstant": false, "isLValue": false, "isPure": false, @@ -6179,21 +6193,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9397:54:0", + "src": "9397:54:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9364:87:0", + "src": "9364:87:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 454, + "id": 512, "nodeType": "ExpressionStatement", - "src": "9364:87:0" + "src": "9364:87:1" }, { "eventCall": { @@ -6201,12 +6215,12 @@ "arguments": [ { "argumentTypes": null, - "id": 456, + "id": 514, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9477:10:0", + "referencedDeclaration": 452, + "src": "9477:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6216,18 +6230,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 457, + "id": 515, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "9489:3:0", + "referencedDeclaration": 5309, + "src": "9489:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 458, + "id": 516, "isConstant": false, "isLValue": false, "isPure": false, @@ -6235,7 +6249,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9489:10:0", + "src": "9489:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6243,12 +6257,12 @@ }, { "argumentTypes": null, - "id": 459, + "id": 517, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9501:5:0", + "referencedDeclaration": 454, + "src": "9501:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6270,18 +6284,18 @@ "typeString": "uint256" } ], - "id": 455, + "id": 513, "name": "FundAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 30, - "src": "9467:9:0", + "referencedDeclaration": 88, + "src": "9467:9:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 460, + "id": 518, "isConstant": false, "isLValue": false, "isPure": false, @@ -6289,20 +6303,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9467:40:0", + "src": "9467:40:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 461, + "id": 519, "nodeType": "EmitStatement", - "src": "9462:45:0" + "src": "9462:45:1" } ] }, "documentation": "@dev Allows buyer of the transaction to add more funds(Tokens) in the\ntransaction.\nThis will help to cater scenarios wherein initially buyer missed to\nfund transaction as required\n@param scriptHash script hash of the transaction\nOnly buyer of the transaction can invoke this method", - "id": 463, + "id": 521, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -6311,78 +6325,78 @@ "arguments": [ { "argumentTypes": null, - "id": 399, + "id": 457, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8825:10:0", + "referencedDeclaration": 452, + "src": "8825:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 400, + "id": 458, "modifierName": { "argumentTypes": null, - "id": 398, + "id": 456, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "8807:17:0", + "referencedDeclaration": 157, + "src": "8807:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8807:29:0" + "src": "8807:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 402, + "id": 460, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8859:10:0", + "referencedDeclaration": 452, + "src": "8859:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 403, + "id": 461, "modifierName": { "argumentTypes": null, - "id": 401, + "id": 459, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "8845:13:0", + "referencedDeclaration": 190, + "src": "8845:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8845:25:0" + "src": "8845:25:1" }, { "arguments": [ { "argumentTypes": null, - "id": 405, + "id": 463, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8900:10:0", + "referencedDeclaration": 452, + "src": "8900:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6392,18 +6406,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 406, + "id": 464, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "8912:15:0", + "referencedDeclaration": 70, + "src": "8912:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 407, + "id": 465, "isConstant": false, "isLValue": false, "isPure": true, @@ -6411,77 +6425,77 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8912:21:0", + "src": "8912:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } } ], - "id": 408, + "id": 466, "modifierName": { "argumentTypes": null, - "id": 404, + "id": 462, "name": "checkTransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 165, - "src": "8879:20:0", + "referencedDeclaration": 223, + "src": "8879:20:1", "typeDescriptions": { - "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$70_$", "typeString": "modifier (bytes32,enum Escrow_v1_0.TransactionType)" } }, "nodeType": "ModifierInvocation", - "src": "8879:55:0" + "src": "8879:55:1" }, { "arguments": [ { "argumentTypes": null, - "id": 410, + "id": 468, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8953:10:0", + "referencedDeclaration": 452, + "src": "8953:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 411, + "id": 469, "modifierName": { "argumentTypes": null, - "id": 409, + "id": 467, "name": "onlyBuyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 182, - "src": "8943:9:0", + "referencedDeclaration": 240, + "src": "8943:9:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8943:21:0" + "src": "8943:21:1" } ], "name": "addTokensToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 397, + "id": 455, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 394, + "id": 452, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "8734:18:0", + "scope": 521, + "src": "8734:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6489,10 +6503,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 393, + "id": 451, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8734:7:0", + "src": "8734:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6503,11 +6517,11 @@ }, { "constant": false, - "id": 396, + "id": 454, "name": "value", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "8762:13:0", + "scope": 521, + "src": "8762:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6515,10 +6529,10 @@ "typeString": "uint256" }, "typeName": { - "id": 395, + "id": 453, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8762:7:0", + "src": "8762:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6528,52 +6542,52 @@ "visibility": "internal" } ], - "src": "8724:57:0" + "src": "8724:57:1" }, "payable": false, "returnParameters": { - "id": 412, + "id": 470, "nodeType": "ParameterList", "parameters": [], - "src": "8969:0:0" + "src": "8969:0:1" }, - "scope": 1208, - "src": "8693:821:0", + "scope": 1266, + "src": "8693:821:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 475, + "id": 533, "nodeType": "Block", - "src": "9765:56:0", + "src": "9765:56:1", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 471, + "id": 529, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "9782:18:0", + "referencedDeclaration": 141, + "src": "9782:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 473, + "id": 531, "indexExpression": { "argumentTypes": null, - "id": 472, + "id": 530, "name": "partyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 465, - "src": "9801:12:0", + "referencedDeclaration": 523, + "src": "9801:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6584,21 +6598,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9782:32:0", + "src": "9782:32:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "functionReturnParameters": 470, - "id": 474, + "functionReturnParameters": 528, + "id": 532, "nodeType": "Return", - "src": "9775:39:0" + "src": "9775:39:1" } ] }, "documentation": "dev Returns all transaction ids for a party\nparam partyAddress Address of the party", - "id": 476, + "id": 534, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -6606,16 +6620,16 @@ "name": "getAllTransactionsForParty", "nodeType": "FunctionDefinition", "parameters": { - "id": 466, + "id": 524, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 465, + "id": 523, "name": "partyAddress", "nodeType": "VariableDeclaration", - "scope": 476, - "src": "9676:20:0", + "scope": 534, + "src": "9676:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6623,10 +6637,10 @@ "typeString": "address" }, "typeName": { - "id": 464, + "id": 522, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9676:7:0", + "src": "9676:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6636,20 +6650,20 @@ "visibility": "internal" } ], - "src": "9666:36:0" + "src": "9666:36:1" }, "payable": false, "returnParameters": { - "id": 470, + "id": 528, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 469, + "id": 527, "name": "", "nodeType": "VariableDeclaration", - "scope": 476, - "src": "9750:9:0", + "scope": 534, + "src": "9750:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6658,19 +6672,19 @@ }, "typeName": { "baseType": { - "id": 467, + "id": 525, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "9750:7:0", + "src": "9750:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 468, + "id": 526, "length": null, "nodeType": "ArrayTypeName", - "src": "9750:9:0", + "src": "9750:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -6680,19 +6694,19 @@ "visibility": "internal" } ], - "src": "9749:11:0" + "src": "9749:11:1" }, - "scope": 1208, - "src": "9631:190:0", + "scope": 1266, + "src": "9631:190:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 564, + "id": 622, "nodeType": "Block", - "src": "10698:916:0", + "src": "10698:916:1", "statements": [ { "expression": { @@ -6704,7 +6718,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 506, + "id": 564, "isConstant": false, "isLValue": false, "isPure": false, @@ -6713,18 +6727,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 503, + "id": 561, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "10730:12:0", + "referencedDeclaration": 548, + "src": "10730:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 504, + "id": 562, "isConstant": false, "isLValue": false, "isPure": false, @@ -6732,7 +6746,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10730:19:0", + "src": "10730:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6743,14 +6757,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 505, + "id": 563, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10752:1:0", + "src": "10752:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6758,7 +6772,7 @@ }, "value": "0" }, - "src": "10730:23:0", + "src": "10730:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6767,14 +6781,14 @@ { "argumentTypes": null, "hexValue": "4e756d626572206f662064657374696e6174696f6e73206d7573742062652067726561746572207468616e2030", - "id": 507, + "id": 565, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "10767:47:0", + "src": "10767:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fbeb58246a6e3ff255a1d618f14d1cced67ffd4784fbc3e1cfbdf71d1f7fbdf9", @@ -6794,21 +6808,21 @@ "typeString": "literal_string \"Number of destinations must be greater than 0\"" } ], - "id": 502, + "id": 560, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "10709:7:0", + "referencedDeclaration": 5313, + "src": "10709:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 508, + "id": 566, "isConstant": false, "isLValue": false, "isPure": false, @@ -6816,15 +6830,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10709:115:0", + "src": "10709:115:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 509, + "id": 567, "nodeType": "ExpressionStatement", - "src": "10709:115:0" + "src": "10709:115:1" }, { "expression": { @@ -6836,7 +6850,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 515, + "id": 573, "isConstant": false, "isLValue": false, "isPure": false, @@ -6845,18 +6859,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 511, + "id": 569, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "10855:12:0", + "referencedDeclaration": 548, + "src": "10855:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 512, + "id": 570, "isConstant": false, "isLValue": false, "isPure": false, @@ -6864,7 +6878,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10855:19:0", + "src": "10855:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6876,18 +6890,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 513, + "id": 571, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "10878:7:0", + "referencedDeclaration": 551, + "src": "10878:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" } }, - "id": 514, + "id": 572, "isConstant": false, "isLValue": false, "isPure": false, @@ -6895,13 +6909,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10878:14:0", + "src": "10878:14:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10855:37:0", + "src": "10855:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6910,14 +6924,14 @@ { "argumentTypes": null, "hexValue": "4e756d626572206f662064657374696e6174696f6e73206d757374206d61746368206e756d626572206f662076616c7565732073656e74", - "id": 516, + "id": 574, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "10906:57:0", + "src": "10906:57:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e70a315a5939ff57e3400503291dbc0af19d18c32f15c80c7c6f5b7c54a6cd3c", @@ -6937,21 +6951,21 @@ "typeString": "literal_string \"Number of destinations must match number of values sent\"" } ], - "id": 510, + "id": 568, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "10834:7:0", + "referencedDeclaration": 5313, + "src": "10834:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 517, + "id": 575, "isConstant": false, "isLValue": false, "isPure": false, @@ -6959,15 +6973,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10834:139:0", + "src": "10834:139:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 518, + "id": 576, "nodeType": "ExpressionStatement", - "src": "10834:139:0" + "src": "10834:139:1" }, { "expression": { @@ -6975,12 +6989,12 @@ "arguments": [ { "argumentTypes": null, - "id": 520, + "id": 578, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 479, - "src": "11016:4:0", + "referencedDeclaration": 537, + "src": "11016:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_calldata_ptr", "typeString": "uint8[] calldata" @@ -6988,12 +7002,12 @@ }, { "argumentTypes": null, - "id": 521, + "id": 579, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 482, - "src": "11034:4:0", + "referencedDeclaration": 540, + "src": "11034:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" @@ -7001,12 +7015,12 @@ }, { "argumentTypes": null, - "id": 522, + "id": 580, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 485, - "src": "11052:4:0", + "referencedDeclaration": 543, + "src": "11052:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" @@ -7014,12 +7028,12 @@ }, { "argumentTypes": null, - "id": 523, + "id": 581, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11070:10:0", + "referencedDeclaration": 545, + "src": "11070:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7027,12 +7041,12 @@ }, { "argumentTypes": null, - "id": 524, + "id": 582, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11094:12:0", + "referencedDeclaration": 548, + "src": "11094:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -7040,12 +7054,12 @@ }, { "argumentTypes": null, - "id": 525, + "id": 583, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11120:7:0", + "referencedDeclaration": 551, + "src": "11120:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -7079,18 +7093,18 @@ "typeString": "uint256[] calldata" } ], - "id": 519, + "id": 577, "name": "_verifyTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 700, - "src": "10984:18:0", + "referencedDeclaration": 758, + "src": "10984:18:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory)" } }, - "id": 526, + "id": 584, "isConstant": false, "isLValue": false, "isPure": false, @@ -7098,20 +7112,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10984:153:0", + "src": "10984:153:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 527, + "id": 585, "nodeType": "ExpressionStatement", - "src": "10984:153:0" + "src": "10984:153:1" }, { "expression": { "argumentTypes": null, - "id": 534, + "id": 592, "isConstant": false, "isLValue": false, "isPure": false, @@ -7122,26 +7136,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 528, + "id": 586, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11148:12:0", + "referencedDeclaration": 133, + "src": "11148:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 530, + "id": 588, "indexExpression": { "argumentTypes": null, - "id": 529, + "id": 587, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11161:10:0", + "referencedDeclaration": 545, + "src": "11161:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7152,23 +7166,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11148:24:0", + "src": "11148:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 531, + "id": 589, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "status", "nodeType": "MemberAccess", - "referencedDeclaration": 44, - "src": "11148:31:0", + "referencedDeclaration": 102, + "src": "11148:31:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -7178,18 +7192,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 532, + "id": 590, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "11182:6:0", + "referencedDeclaration": 67, + "src": "11182:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 533, + "id": 591, "isConstant": false, "isLValue": false, "isPure": true, @@ -7197,26 +7211,26 @@ "memberName": "RELEASED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11182:15:0", + "src": "11182:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "src": "11148:49:0", + "src": "11148:49:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "id": 535, + "id": 593, "nodeType": "ExpressionStatement", - "src": "11148:49:0" + "src": "11148:49:1" }, { "expression": { "argumentTypes": null, - "id": 542, + "id": 600, "isConstant": false, "isLValue": false, "isPure": false, @@ -7227,26 +7241,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 536, + "id": 594, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11281:12:0", + "referencedDeclaration": 133, + "src": "11281:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 538, + "id": 596, "indexExpression": { "argumentTypes": null, - "id": 537, + "id": 595, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11294:10:0", + "referencedDeclaration": 545, + "src": "11294:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7257,21 +7271,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11281:24:0", + "src": "11281:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 539, + "id": 597, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "lastModified", "nodeType": "MemberAccess", - "referencedDeclaration": 42, - "src": "11281:37:0", + "referencedDeclaration": 100, + "src": "11281:37:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7283,18 +7297,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 540, + "id": 598, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "11321:5:0", + "referencedDeclaration": 5299, + "src": "11321:5:1", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 541, + "id": 599, "isConstant": false, "isLValue": false, "isPure": false, @@ -7302,21 +7316,21 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11321:15:0", + "src": "11321:15:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11281:55:0", + "src": "11281:55:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 543, + "id": 601, "nodeType": "ExpressionStatement", - "src": "11281:55:0" + "src": "11281:55:1" }, { "expression": { @@ -7328,7 +7342,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 554, + "id": 612, "isConstant": false, "isLValue": false, "isPure": false, @@ -7338,12 +7352,12 @@ "arguments": [ { "argumentTypes": null, - "id": 546, + "id": 604, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11382:10:0", + "referencedDeclaration": 545, + "src": "11382:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7351,12 +7365,12 @@ }, { "argumentTypes": null, - "id": 547, + "id": 605, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11394:12:0", + "referencedDeclaration": 548, + "src": "11394:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -7364,12 +7378,12 @@ }, { "argumentTypes": null, - "id": 548, + "id": 606, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11408:7:0", + "referencedDeclaration": 551, + "src": "11408:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -7391,18 +7405,18 @@ "typeString": "uint256[] calldata" } ], - "id": 545, + "id": 603, "name": "_transferFunds", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 893, - "src": "11367:14:0", + "referencedDeclaration": 951, + "src": "11367:14:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$_t_uint256_$", "typeString": "function (bytes32,address[] memory,uint256[] memory) returns (uint256)" } }, - "id": 549, + "id": 607, "isConstant": false, "isLValue": false, "isPure": false, @@ -7410,7 +7424,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11367:49:0", + "src": "11367:49:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7424,26 +7438,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 550, + "id": 608, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11420:12:0", + "referencedDeclaration": 133, + "src": "11420:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 552, + "id": 610, "indexExpression": { "argumentTypes": null, - "id": 551, + "id": 609, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11433:10:0", + "referencedDeclaration": 545, + "src": "11433:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7454,27 +7468,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11420:24:0", + "src": "11420:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 553, + "id": 611, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "11420:30:0", + "referencedDeclaration": 98, + "src": "11420:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11367:83:0", + "src": "11367:83:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7483,14 +7497,14 @@ { "argumentTypes": null, "hexValue": "546f74616c2076616c756520746f2062652072656c6561736564206d75737420626520657175616c20746f20746865207472616e73616374696f6e20657363726f772076616c7565", - "id": 555, + "id": 613, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "11464:74:0", + "src": "11464:74:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9e0bdb14e2e0d5e118fd1f547268c6a1fdb5e8facacd614066d4b60bc2c9941d", @@ -7510,21 +7524,21 @@ "typeString": "literal_string \"Total value to be released must be equal to the transaction escrow value\"" } ], - "id": 544, + "id": 602, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "11346:7:0", + "referencedDeclaration": 5313, + "src": "11346:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 556, + "id": 614, "isConstant": false, "isLValue": false, "isPure": false, @@ -7532,15 +7546,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11346:202:0", + "src": "11346:202:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 557, + "id": 615, "nodeType": "ExpressionStatement", - "src": "11346:202:0" + "src": "11346:202:1" }, { "eventCall": { @@ -7548,12 +7562,12 @@ "arguments": [ { "argumentTypes": null, - "id": 559, + "id": 617, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11573:10:0", + "referencedDeclaration": 545, + "src": "11573:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7561,12 +7575,12 @@ }, { "argumentTypes": null, - "id": 560, + "id": 618, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11585:12:0", + "referencedDeclaration": 548, + "src": "11585:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -7574,12 +7588,12 @@ }, { "argumentTypes": null, - "id": 561, + "id": 619, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11599:7:0", + "referencedDeclaration": 551, + "src": "11599:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -7601,18 +7615,18 @@ "typeString": "uint256[] calldata" } ], - "id": 558, + "id": 616, "name": "Executed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 22, - "src": "11564:8:0", + "referencedDeclaration": 80, + "src": "11564:8:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (bytes32,address[] memory,uint256[] memory)" } }, - "id": 562, + "id": 620, "isConstant": false, "isLValue": false, "isPure": false, @@ -7620,20 +7634,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11564:43:0", + "src": "11564:43:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 563, + "id": 621, "nodeType": "EmitStatement", - "src": "11559:48:0" + "src": "11559:48:1" } ] }, "documentation": "dev This method will be used to release funds associated with\nthe transaction\nPlease see specs https://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md\nparam sigV Array containing V component of all the signatures\nparam sigR Array containing R component of all the signatures\nparam signS Array containing S component of all the signatures\nparam scriptHash script hash of the transaction\nparam destinations List of addresses who will receive funds\nparam amounts amount released to each destination", - "id": 565, + "id": 623, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -7642,82 +7656,82 @@ "arguments": [ { "argumentTypes": null, - "id": 496, + "id": 554, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "10648:10:0", + "referencedDeclaration": 545, + "src": "10648:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 497, + "id": 555, "modifierName": { "argumentTypes": null, - "id": 495, + "id": 553, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "10630:17:0", + "referencedDeclaration": 157, + "src": "10630:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "10630:29:0" + "src": "10630:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 499, + "id": 557, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "10682:10:0", + "referencedDeclaration": 545, + "src": "10682:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 500, + "id": 558, "modifierName": { "argumentTypes": null, - "id": 498, + "id": 556, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "10668:13:0", + "referencedDeclaration": 190, + "src": "10668:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "10668:25:0" + "src": "10668:25:1" } ], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 494, + "id": 552, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 479, + "id": 537, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10451:12:0", + "scope": 623, + "src": "10451:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7726,19 +7740,19 @@ }, "typeName": { "baseType": { - "id": 477, + "id": 535, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "10451:5:0", + "src": "10451:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 478, + "id": 536, "length": null, "nodeType": "ArrayTypeName", - "src": "10451:7:0", + "src": "10451:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -7749,11 +7763,11 @@ }, { "constant": false, - "id": 482, + "id": 540, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10473:14:0", + "scope": 623, + "src": "10473:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7762,19 +7776,19 @@ }, "typeName": { "baseType": { - "id": 480, + "id": 538, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10473:7:0", + "src": "10473:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 481, + "id": 539, "length": null, "nodeType": "ArrayTypeName", - "src": "10473:9:0", + "src": "10473:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -7785,11 +7799,11 @@ }, { "constant": false, - "id": 485, + "id": 543, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10497:14:0", + "scope": 623, + "src": "10497:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7798,19 +7812,19 @@ }, "typeName": { "baseType": { - "id": 483, + "id": 541, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10497:7:0", + "src": "10497:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 484, + "id": 542, "length": null, "nodeType": "ArrayTypeName", - "src": "10497:9:0", + "src": "10497:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -7821,11 +7835,11 @@ }, { "constant": false, - "id": 487, + "id": 545, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10521:18:0", + "scope": 623, + "src": "10521:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7833,10 +7847,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 486, + "id": 544, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10521:7:0", + "src": "10521:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7847,11 +7861,11 @@ }, { "constant": false, - "id": 490, + "id": 548, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10549:22:0", + "scope": 623, + "src": "10549:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7860,19 +7874,19 @@ }, "typeName": { "baseType": { - "id": 488, + "id": 546, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10549:7:0", + "src": "10549:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 489, + "id": 547, "length": null, "nodeType": "ArrayTypeName", - "src": "10549:9:0", + "src": "10549:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -7883,11 +7897,11 @@ }, { "constant": false, - "id": 493, + "id": 551, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10581:17:0", + "scope": 623, + "src": "10581:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7896,19 +7910,19 @@ }, "typeName": { "baseType": { - "id": 491, + "id": 549, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "10581:7:0", + "src": "10581:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 492, + "id": 550, "length": null, "nodeType": "ArrayTypeName", - "src": "10581:9:0", + "src": "10581:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -7918,26 +7932,26 @@ "visibility": "internal" } ], - "src": "10441:163:0" + "src": "10441:163:1" }, "payable": false, "returnParameters": { - "id": 501, + "id": 559, "nodeType": "ParameterList", "parameters": [], - "src": "10698:0:0" + "src": "10698:0:1" }, - "scope": 1208, - "src": "10425:1189:0", + "scope": 1266, + "src": "10425:1189:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 623, + "id": 681, "nodeType": "Block", - "src": "12442:734:0", + "src": "12442:734:1", "statements": [ { "condition": { @@ -7946,19 +7960,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 588, + "id": 646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 584, + "id": 642, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 579, - "src": "12456:12:0", + "referencedDeclaration": 637, + "src": "12456:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7972,14 +7986,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 586, + "id": 644, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12480:1:0", + "src": "12480:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -7995,20 +8009,20 @@ "typeString": "int_const 0" } ], - "id": 585, + "id": 643, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "12472:7:0", + "src": "12472:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 587, + "id": 645, "isConstant": false, "isLValue": false, "isPure": true, @@ -8016,22 +8030,22 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12472:10:0", + "src": "12472:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "12456:26:0", + "src": "12456:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 621, + "id": 679, "nodeType": "Block", - "src": "12813:357:0", + "src": "12813:357:1", "statements": [ { "expression": { @@ -8042,12 +8056,12 @@ "arguments": [ { "argumentTypes": null, - "id": 608, + "id": 666, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 567, - "src": "12899:8:0", + "referencedDeclaration": 625, + "src": "12899:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -8055,12 +8069,12 @@ }, { "argumentTypes": null, - "id": 609, + "id": 667, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 569, - "src": "12929:9:0", + "referencedDeclaration": 627, + "src": "12929:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -8068,12 +8082,12 @@ }, { "argumentTypes": null, - "id": 610, + "id": 668, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 571, - "src": "12960:12:0", + "referencedDeclaration": 629, + "src": "12960:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -8081,12 +8095,12 @@ }, { "argumentTypes": null, - "id": 611, + "id": 669, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 573, - "src": "12994:5:0", + "referencedDeclaration": 631, + "src": "12994:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8094,12 +8108,12 @@ }, { "argumentTypes": null, - "id": 612, + "id": 670, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 575, - "src": "13021:6:0", + "referencedDeclaration": 633, + "src": "13021:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8107,12 +8121,12 @@ }, { "argumentTypes": null, - "id": 613, + "id": 671, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 577, - "src": "13049:9:0", + "referencedDeclaration": 635, + "src": "13049:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8123,14 +8137,14 @@ "arguments": [ { "argumentTypes": null, - "id": 615, + "id": 673, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "13088:4:0", + "referencedDeclaration": 5328, + "src": "13088:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -8138,24 +8152,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 614, + "id": 672, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "13080:7:0", + "src": "13080:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 616, + "id": 674, "isConstant": false, "isLValue": false, "isPure": false, @@ -8163,7 +8177,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13080:13:0", + "src": "13080:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8171,12 +8185,12 @@ }, { "argumentTypes": null, - "id": 617, + "id": 675, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 579, - "src": "13115:12:0", + "referencedDeclaration": 637, + "src": "13115:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8220,18 +8234,18 @@ ], "expression": { "argumentTypes": null, - "id": 606, + "id": 664, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "12861:3:0", + "referencedDeclaration": 5296, + "src": "12861:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 607, + "id": 665, "isConstant": false, "isLValue": false, "isPure": true, @@ -8239,13 +8253,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12861:16:0", + "src": "12861:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 618, + "id": 676, "isConstant": false, "isLValue": false, "isPure": false, @@ -8253,7 +8267,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12861:284:0", + "src": "12861:284:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -8267,18 +8281,18 @@ "typeString": "bytes memory" } ], - "id": 605, + "id": 663, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "12834:9:0", + "referencedDeclaration": 5303, + "src": "12834:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 619, + "id": 677, "isConstant": false, "isLValue": false, "isPure": false, @@ -8286,26 +8300,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12834:325:0", + "src": "12834:325:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 583, - "id": 620, + "functionReturnParameters": 641, + "id": 678, "nodeType": "Return", - "src": "12827:332:0" + "src": "12827:332:1" } ] }, - "id": 622, + "id": 680, "nodeType": "IfStatement", - "src": "12452:718:0", + "src": "12452:718:1", "trueBody": { - "id": 604, + "id": 662, "nodeType": "Block", - "src": "12484:323:0", + "src": "12484:323:1", "statements": [ { "expression": { @@ -8316,12 +8330,12 @@ "arguments": [ { "argumentTypes": null, - "id": 592, + "id": 650, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 567, - "src": "12570:8:0", + "referencedDeclaration": 625, + "src": "12570:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -8329,12 +8343,12 @@ }, { "argumentTypes": null, - "id": 593, + "id": 651, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 569, - "src": "12600:9:0", + "referencedDeclaration": 627, + "src": "12600:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -8342,12 +8356,12 @@ }, { "argumentTypes": null, - "id": 594, + "id": 652, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 571, - "src": "12631:12:0", + "referencedDeclaration": 629, + "src": "12631:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -8355,12 +8369,12 @@ }, { "argumentTypes": null, - "id": 595, + "id": 653, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 573, - "src": "12665:5:0", + "referencedDeclaration": 631, + "src": "12665:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8368,12 +8382,12 @@ }, { "argumentTypes": null, - "id": 596, + "id": 654, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 575, - "src": "12692:6:0", + "referencedDeclaration": 633, + "src": "12692:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8381,12 +8395,12 @@ }, { "argumentTypes": null, - "id": 597, + "id": 655, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 577, - "src": "12720:9:0", + "referencedDeclaration": 635, + "src": "12720:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8397,14 +8411,14 @@ "arguments": [ { "argumentTypes": null, - "id": 599, + "id": 657, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "12759:4:0", + "referencedDeclaration": 5328, + "src": "12759:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -8412,24 +8426,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 598, + "id": 656, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "12751:7:0", + "src": "12751:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 600, + "id": 658, "isConstant": false, "isLValue": false, "isPure": false, @@ -8437,7 +8451,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12751:13:0", + "src": "12751:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8477,18 +8491,18 @@ ], "expression": { "argumentTypes": null, - "id": 590, + "id": 648, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "12532:3:0", + "referencedDeclaration": 5296, + "src": "12532:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 591, + "id": 649, "isConstant": false, "isLValue": false, "isPure": true, @@ -8496,13 +8510,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12532:16:0", + "src": "12532:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 601, + "id": 659, "isConstant": false, "isLValue": false, "isPure": false, @@ -8510,7 +8524,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12532:250:0", + "src": "12532:250:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -8524,18 +8538,18 @@ "typeString": "bytes memory" } ], - "id": 589, + "id": 647, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "12505:9:0", + "referencedDeclaration": 5303, + "src": "12505:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 602, + "id": 660, "isConstant": false, "isLValue": false, "isPure": false, @@ -8543,16 +8557,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12505:291:0", + "src": "12505:291:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 583, - "id": 603, + "functionReturnParameters": 641, + "id": 661, "nodeType": "Return", - "src": "12498:298:0" + "src": "12498:298:1" } ] } @@ -8560,7 +8574,7 @@ ] }, "documentation": "dev Method for calculating script hash. Calculation will depend upon\nthe type of transaction\nETHER Type transaction-:\nScript Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\nmoderator, multiSigContractAddress)\nTOKEN Type transaction\nScript Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\nmoderator, multiSigContractAddress, tokenAddress)\nClient can use this method to verify whether it has calculated correct\nscript hash or not", - "id": 624, + "id": 682, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -8568,16 +8582,16 @@ "name": "calculateRedeemScriptHash", "nodeType": "FunctionDefinition", "parameters": { - "id": 580, + "id": 638, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 567, + "id": 625, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12203:16:0", + "scope": 682, + "src": "12203:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8585,10 +8599,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 566, + "id": 624, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "12203:7:0", + "src": "12203:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -8599,11 +8613,11 @@ }, { "constant": false, - "id": 569, + "id": 627, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12229:15:0", + "scope": 682, + "src": "12229:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8611,10 +8625,10 @@ "typeString": "uint8" }, "typeName": { - "id": 568, + "id": 626, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "12229:5:0", + "src": "12229:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -8625,11 +8639,11 @@ }, { "constant": false, - "id": 571, + "id": 629, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12254:19:0", + "scope": 682, + "src": "12254:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8637,10 +8651,10 @@ "typeString": "uint32" }, "typeName": { - "id": 570, + "id": 628, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "12254:6:0", + "src": "12254:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -8651,11 +8665,11 @@ }, { "constant": false, - "id": 573, + "id": 631, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12283:13:0", + "scope": 682, + "src": "12283:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8663,10 +8677,10 @@ "typeString": "address" }, "typeName": { - "id": 572, + "id": 630, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12283:7:0", + "src": "12283:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8677,11 +8691,11 @@ }, { "constant": false, - "id": 575, + "id": 633, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12306:14:0", + "scope": 682, + "src": "12306:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8689,10 +8703,10 @@ "typeString": "address" }, "typeName": { - "id": 574, + "id": 632, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12306:7:0", + "src": "12306:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8703,11 +8717,11 @@ }, { "constant": false, - "id": 577, + "id": 635, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12330:17:0", + "scope": 682, + "src": "12330:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8715,10 +8729,10 @@ "typeString": "address" }, "typeName": { - "id": 576, + "id": 634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12330:7:0", + "src": "12330:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8729,11 +8743,11 @@ }, { "constant": false, - "id": 579, + "id": 637, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12357:20:0", + "scope": 682, + "src": "12357:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8741,10 +8755,10 @@ "typeString": "address" }, "typeName": { - "id": 578, + "id": 636, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12357:7:0", + "src": "12357:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8754,20 +8768,20 @@ "visibility": "internal" } ], - "src": "12193:190:0" + "src": "12193:190:1" }, "payable": false, "returnParameters": { - "id": 583, + "id": 641, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 582, + "id": 640, "name": "", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12429:7:0", + "scope": 682, + "src": "12429:7:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8775,10 +8789,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 581, + "id": 639, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12429:7:0", + "src": "12429:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8788,19 +8802,19 @@ "visibility": "internal" } ], - "src": "12428:9:0" + "src": "12428:9:1" }, - "scope": 1208, - "src": "12159:1017:0", + "scope": 1266, + "src": "12159:1017:1", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 699, + "id": 757, "nodeType": "Block", - "src": "13671:897:0", + "src": "13671:897:1", "statements": [ { "expression": { @@ -8808,12 +8822,12 @@ "arguments": [ { "argumentTypes": null, - "id": 645, + "id": 703, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 627, - "src": "13712:4:0", + "referencedDeclaration": 685, + "src": "13712:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" @@ -8821,12 +8835,12 @@ }, { "argumentTypes": null, - "id": 646, + "id": 704, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 630, - "src": "13730:4:0", + "referencedDeclaration": 688, + "src": "13730:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -8834,12 +8848,12 @@ }, { "argumentTypes": null, - "id": 647, + "id": 705, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 633, - "src": "13748:4:0", + "referencedDeclaration": 691, + "src": "13748:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -8847,12 +8861,12 @@ }, { "argumentTypes": null, - "id": 648, + "id": 706, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13766:10:0", + "referencedDeclaration": 693, + "src": "13766:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8860,12 +8874,12 @@ }, { "argumentTypes": null, - "id": 649, + "id": 707, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 638, - "src": "13790:12:0", + "referencedDeclaration": 696, + "src": "13790:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -8873,12 +8887,12 @@ }, { "argumentTypes": null, - "id": 650, + "id": 708, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 641, - "src": "13816:7:0", + "referencedDeclaration": 699, + "src": "13816:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -8912,18 +8926,18 @@ "typeString": "uint256[] memory" } ], - "id": 644, + "id": 702, "name": "_verifySignatures", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1016, - "src": "13681:17:0", + "referencedDeclaration": 1074, + "src": "13681:17:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory)" } }, - "id": 651, + "id": 709, "isConstant": false, "isLValue": false, "isPure": false, @@ -8931,28 +8945,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13681:152:0", + "src": "13681:152:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 652, + "id": 710, "nodeType": "ExpressionStatement", - "src": "13681:152:0" + "src": "13681:152:1" }, { "assignments": [ - 654 + 712 ], "declarations": [ { "constant": false, - "id": 654, + "id": 712, "name": "timeLockExpired", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13844:20:0", + "scope": 758, + "src": "13844:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8960,10 +8974,10 @@ "typeString": "bool" }, "typeName": { - "id": 653, + "id": 711, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13844:4:0", + "src": "13844:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -8973,7 +8987,7 @@ "visibility": "internal" } ], - "id": 665, + "id": 723, "initialValue": { "argumentTypes": null, "arguments": [ @@ -8983,26 +8997,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 656, + "id": 714, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "13899:12:0", + "referencedDeclaration": 133, + "src": "13899:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 658, + "id": 716, "indexExpression": { "argumentTypes": null, - "id": 657, + "id": 715, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13912:10:0", + "referencedDeclaration": 693, + "src": "13912:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9013,21 +9027,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13899:24:0", + "src": "13899:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 659, + "id": 717, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "timeoutHours", "nodeType": "MemberAccess", - "referencedDeclaration": 50, - "src": "13899:37:0", + "referencedDeclaration": 108, + "src": "13899:37:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -9039,26 +9053,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 660, + "id": 718, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "13950:12:0", + "referencedDeclaration": 133, + "src": "13950:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 662, + "id": 720, "indexExpression": { "argumentTypes": null, - "id": 661, + "id": 719, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13963:10:0", + "referencedDeclaration": 693, + "src": "13963:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9069,21 +9083,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13950:24:0", + "src": "13950:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 663, + "id": 721, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "lastModified", "nodeType": "MemberAccess", - "referencedDeclaration": 42, - "src": "13950:37:0", + "referencedDeclaration": 100, + "src": "13950:37:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9101,18 +9115,18 @@ "typeString": "uint256" } ], - "id": 655, + "id": 713, "name": "_isTimeLockExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1048, - "src": "13867:18:0", + "referencedDeclaration": 1106, + "src": "13867:18:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint32_$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint32,uint256) view returns (bool)" } }, - "id": 664, + "id": 722, "isConstant": false, "isLValue": false, "isPure": false, @@ -9120,14 +9134,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13867:130:0", + "src": "13867:130:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "13844:153:0" + "src": "13844:153:1" }, { "condition": { @@ -9136,7 +9150,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 672, + "id": 730, "isConstant": false, "isLValue": false, "isPure": false, @@ -9145,18 +9159,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 666, + "id": 724, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 627, - "src": "14183:4:0", + "referencedDeclaration": 685, + "src": "14183:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 667, + "id": 725, "isConstant": false, "isLValue": false, "isPure": false, @@ -9164,7 +9178,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14183:11:0", + "src": "14183:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9178,26 +9192,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 668, + "id": 726, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14197:12:0", + "referencedDeclaration": 133, + "src": "14197:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 670, + "id": 728, "indexExpression": { "argumentTypes": null, - "id": 669, + "id": 727, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14210:10:0", + "referencedDeclaration": 693, + "src": "14210:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9208,45 +9222,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14197:24:0", + "src": "14197:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 671, + "id": 729, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "threshold", "nodeType": "MemberAccess", - "referencedDeclaration": 48, - "src": "14197:34:0", + "referencedDeclaration": 106, + "src": "14197:34:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "src": "14183:48:0", + "src": "14183:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 698, + "id": 756, "nodeType": "IfStatement", - "src": "14179:383:0", + "src": "14179:383:1", "trueBody": { - "id": 697, + "id": 755, "nodeType": "Block", - "src": "14233:329:0", + "src": "14233:329:1", "statements": [ { "condition": { "argumentTypes": null, - "id": 674, + "id": 732, "isConstant": false, "isLValue": false, "isPure": false, @@ -9254,15 +9268,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "14251:16:0", + "src": "14251:16:1", "subExpression": { "argumentTypes": null, - "id": 673, + "id": 731, "name": "timeLockExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 654, - "src": "14252:15:0", + "referencedDeclaration": 712, + "src": "14252:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9276,7 +9290,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 689, + "id": 747, "isConstant": false, "isLValue": false, "isPure": false, @@ -9284,7 +9298,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "14389:64:0", + "src": "14389:64:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -9293,26 +9307,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 680, + "id": 738, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14390:12:0", + "referencedDeclaration": 133, + "src": "14390:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 682, + "id": 740, "indexExpression": { "argumentTypes": null, - "id": 681, + "id": 739, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14403:10:0", + "referencedDeclaration": 693, + "src": "14403:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9323,53 +9337,53 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14390:24:0", + "src": "14390:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 683, + "id": 741, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "14390:30:0", + "referencedDeclaration": 124, + "src": "14390:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 688, + "id": 746, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 684, + "id": 742, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14421:12:0", + "referencedDeclaration": 133, + "src": "14421:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 686, + "id": 744, "indexExpression": { "argumentTypes": null, - "id": 685, + "id": 743, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14434:10:0", + "referencedDeclaration": 693, + "src": "14434:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9380,21 +9394,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14421:24:0", + "src": "14421:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 687, + "id": 745, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "seller", "nodeType": "MemberAccess", - "referencedDeclaration": 54, - "src": "14421:31:0", + "referencedDeclaration": 112, + "src": "14421:31:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9405,7 +9419,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14390:63:0", + "src": "14390:63:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9417,13 +9431,13 @@ } }, "falseBody": null, - "id": 695, + "id": 753, "nodeType": "IfStatement", - "src": "14385:167:0", + "src": "14385:167:1", "trueBody": { - "id": 694, + "id": 752, "nodeType": "Block", - "src": "14455:97:0", + "src": "14455:97:1", "statements": [ { "expression": { @@ -9432,14 +9446,14 @@ { "argumentTypes": null, "hexValue": "4d696e206e756d626572206f662073696773206e6f742070726573656e7420616e642073656c6c657220646964206e6f74207369676e", - "id": 691, + "id": 749, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14480:56:0", + "src": "14480:56:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3b322ca30262369c4d65a8630eaee7e951f7a52d78fe30e6f9c7b31754058a3e", @@ -9455,21 +9469,21 @@ "typeString": "literal_string \"Min number of sigs not present and seller did not sign\"" } ], - "id": 690, + "id": 748, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 2534, - 2535 + 5314, + 5315 ], - "referencedDeclaration": 2535, - "src": "14473:6:0", + "referencedDeclaration": 5315, + "src": "14473:6:1", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory) pure" } }, - "id": 692, + "id": 750, "isConstant": false, "isLValue": false, "isPure": false, @@ -9477,26 +9491,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14473:64:0", + "src": "14473:64:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 693, + "id": 751, "nodeType": "ExpressionStatement", - "src": "14473:64:0" + "src": "14473:64:1" } ] } }, - "id": 696, + "id": 754, "nodeType": "IfStatement", - "src": "14247:305:0", + "src": "14247:305:1", "trueBody": { - "id": 679, + "id": 737, "nodeType": "Block", - "src": "14269:98:0", + "src": "14269:98:1", "statements": [ { "expression": { @@ -9505,14 +9519,14 @@ { "argumentTypes": null, "hexValue": "4d696e206e756d626572206f662073696773206e6f742070726573656e7420616e642074696d656c6f636b206e6f742065787069726564", - "id": 676, + "id": 734, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14294:57:0", + "src": "14294:57:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_0fd9b9a5d87d84ac3970eddd40be2f966b50dd97cbeb9401eba72b84fb57995c", @@ -9528,21 +9542,21 @@ "typeString": "literal_string \"Min number of sigs not present and timelock not expired\"" } ], - "id": 675, + "id": 733, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 2534, - 2535 + 5314, + 5315 ], - "referencedDeclaration": 2535, - "src": "14287:6:0", + "referencedDeclaration": 5315, + "src": "14287:6:1", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory) pure" } }, - "id": 677, + "id": 735, "isConstant": false, "isLValue": false, "isPure": false, @@ -9550,15 +9564,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14287:65:0", + "src": "14287:65:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 678, + "id": 736, "nodeType": "ExpressionStatement", - "src": "14287:65:0" + "src": "14287:65:1" } ] } @@ -9569,7 +9583,7 @@ ] }, "documentation": "@dev This methods checks validity of transaction\n1. Verify Signatures\n2. Check if minimum number of signatures has been acquired\n3. If above condition is false, check if timelock is expired or if the\n execution is signed by seller", - "id": 700, + "id": 758, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -9577,16 +9591,16 @@ "name": "_verifyTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 642, + "id": 700, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 627, + "id": 685, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13497:12:0", + "scope": 758, + "src": "13497:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9595,19 +9609,19 @@ }, "typeName": { "baseType": { - "id": 625, + "id": 683, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "13497:5:0", + "src": "13497:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 626, + "id": 684, "length": null, "nodeType": "ArrayTypeName", - "src": "13497:7:0", + "src": "13497:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -9618,11 +9632,11 @@ }, { "constant": false, - "id": 630, + "id": 688, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13519:14:0", + "scope": 758, + "src": "13519:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9631,19 +9645,19 @@ }, "typeName": { "baseType": { - "id": 628, + "id": 686, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13519:7:0", + "src": "13519:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 629, + "id": 687, "length": null, "nodeType": "ArrayTypeName", - "src": "13519:9:0", + "src": "13519:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -9654,11 +9668,11 @@ }, { "constant": false, - "id": 633, + "id": 691, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13543:14:0", + "scope": 758, + "src": "13543:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9667,19 +9681,19 @@ }, "typeName": { "baseType": { - "id": 631, + "id": 689, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13543:7:0", + "src": "13543:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 632, + "id": 690, "length": null, "nodeType": "ArrayTypeName", - "src": "13543:9:0", + "src": "13543:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -9690,11 +9704,11 @@ }, { "constant": false, - "id": 635, + "id": 693, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13567:18:0", + "scope": 758, + "src": "13567:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9702,10 +9716,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 634, + "id": 692, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13567:7:0", + "src": "13567:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9716,11 +9730,11 @@ }, { "constant": false, - "id": 638, + "id": 696, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13595:22:0", + "scope": 758, + "src": "13595:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9729,19 +9743,19 @@ }, "typeName": { "baseType": { - "id": 636, + "id": 694, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13595:7:0", + "src": "13595:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 637, + "id": 695, "length": null, "nodeType": "ArrayTypeName", - "src": "13595:9:0", + "src": "13595:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -9752,11 +9766,11 @@ }, { "constant": false, - "id": 641, + "id": 699, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13627:17:0", + "scope": 758, + "src": "13627:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9765,19 +9779,19 @@ }, "typeName": { "baseType": { - "id": 639, + "id": 697, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "13627:7:0", + "src": "13627:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 640, + "id": 698, "length": null, "nodeType": "ArrayTypeName", - "src": "13627:9:0", + "src": "13627:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -9787,54 +9801,54 @@ "visibility": "internal" } ], - "src": "13487:163:0" + "src": "13487:163:1" }, "payable": false, "returnParameters": { - "id": 643, + "id": 701, "nodeType": "ParameterList", "parameters": [], - "src": "13671:0:0" + "src": "13671:0:1" }, - "scope": 1208, - "src": "13460:1108:0", + "scope": 1266, + "src": "13460:1108:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 892, + "id": 950, "nodeType": "Block", - "src": "14861:2002:0", + "src": "14861:2002:1", "statements": [ { "assignments": [ - 714 + 772 ], "declarations": [ { "constant": false, - "id": 714, + "id": 772, "name": "t", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14871:21:0", + "scope": 951, + "src": "14871:21:1", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" }, "typeName": { "contractScope": null, - "id": 713, + "id": 771, "name": "Transaction", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 71, - "src": "14871:11:0", + "referencedDeclaration": 129, + "src": "14871:11:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" } }, @@ -9842,31 +9856,31 @@ "visibility": "internal" } ], - "id": 718, + "id": 776, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 715, + "id": 773, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14895:12:0", + "referencedDeclaration": 133, + "src": "14895:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 717, + "id": 775, "indexExpression": { "argumentTypes": null, - "id": 716, + "id": 774, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 702, - "src": "14908:10:0", + "referencedDeclaration": 760, + "src": "14908:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9877,27 +9891,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14895:24:0", + "src": "14895:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "14871:48:0" + "src": "14871:48:1" }, { "assignments": [ - 720 + 778 ], "declarations": [ { "constant": false, - "id": 720, + "id": 778, "name": "valueTransferred", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14930:24:0", + "scope": 951, + "src": "14930:24:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9905,10 +9919,10 @@ "typeString": "uint256" }, "typeName": { - "id": 719, + "id": 777, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14930:7:0", + "src": "14930:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9918,18 +9932,18 @@ "visibility": "internal" } ], - "id": 722, + "id": 780, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 721, + "id": 779, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14957:1:0", + "src": "14957:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -9938,16 +9952,16 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "14930:28:0" + "src": "14930:28:1" }, { "condition": { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 727, + "id": 785, "isConstant": false, "isLValue": false, "isPure": false, @@ -9956,28 +9970,28 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 723, + "id": 781, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "14973:1:0", + "referencedDeclaration": 772, + "src": "14973:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 724, + "id": 782, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "14973:17:0", + "referencedDeclaration": 104, + "src": "14973:17:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -9987,18 +10001,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 725, + "id": 783, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "14994:15:0", + "referencedDeclaration": 70, + "src": "14994:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 726, + "id": 784, "isConstant": false, "isLValue": false, "isPure": true, @@ -10006,13 +10020,13 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14994:21:0", + "src": "14994:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "14973:42:0", + "src": "14973:42:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10022,10 +10036,10 @@ "condition": { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 804, + "id": 862, "isConstant": false, "isLValue": false, "isPure": false, @@ -10034,28 +10048,28 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 800, + "id": 858, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15820:1:0", + "referencedDeclaration": 772, + "src": "15820:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 801, + "id": 859, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "15820:17:0", + "referencedDeclaration": 104, + "src": "15820:17:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -10065,18 +10079,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 802, + "id": 860, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "15841:15:0", + "referencedDeclaration": 70, + "src": "15841:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 803, + "id": 861, "isConstant": false, "isLValue": false, "isPure": true, @@ -10084,54 +10098,54 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15841:21:0", + "src": "15841:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "15820:42:0", + "src": "15820:42:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 888, + "id": 946, "nodeType": "IfStatement", - "src": "15816:1008:0", + "src": "15816:1008:1", "trueBody": { - "id": 887, + "id": 945, "nodeType": "Block", - "src": "15864:960:0", + "src": "15864:960:1", "statements": [ { "assignments": [ - 806 + 864 ], "declarations": [ { "constant": false, - "id": 806, + "id": 864, "name": "token", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15879:20:0", + "scope": 951, + "src": "15879:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 805, + "id": 863, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "15879:14:0", + "referencedDeclaration": 4445, + "src": "15879:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -10139,7 +10153,7 @@ "visibility": "internal" } ], - "id": 811, + "id": 869, "initialValue": { "argumentTypes": null, "arguments": [ @@ -10147,26 +10161,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 808, + "id": 866, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15917:1:0", + "referencedDeclaration": 772, + "src": "15917:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 809, + "id": 867, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 56, - "src": "15917:14:0", + "referencedDeclaration": 114, + "src": "15917:14:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10180,18 +10194,18 @@ "typeString": "address" } ], - "id": 807, + "id": 865, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "15902:14:0", + "referencedDeclaration": 4445, + "src": "15902:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 810, + "id": 868, "isConstant": false, "isLValue": false, "isPure": false, @@ -10199,20 +10213,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15902:30:0", + "src": "15902:30:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "15879:53:0" + "src": "15879:53:1" }, { "body": { - "id": 885, + "id": 943, "nodeType": "Block", - "src": "15995:819:0", + "src": "15995:819:1", "statements": [ { "expression": { @@ -10224,7 +10238,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 830, + "id": 888, "isConstant": false, "isLValue": false, "isPure": false, @@ -10233,26 +10247,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 824, + "id": 882, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16043:12:0", + "referencedDeclaration": 763, + "src": "16043:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 826, + "id": 884, "indexExpression": { "argumentTypes": null, - "id": 825, + "id": 883, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16056:1:0", + "referencedDeclaration": 871, + "src": "16056:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10263,7 +10277,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16043:15:0", + "src": "16043:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10277,14 +10291,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 828, + "id": 886, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16070:1:0", + "src": "16070:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -10300,20 +10314,20 @@ "typeString": "int_const 0" } ], - "id": 827, + "id": 885, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "16062:7:0", + "src": "16062:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 829, + "id": 887, "isConstant": false, "isLValue": false, "isPure": true, @@ -10321,13 +10335,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16062:10:0", + "src": "16062:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "16043:29:0", + "src": "16043:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10336,14 +10350,14 @@ { "argumentTypes": null, "hexValue": "7a65726f2061646472657373206973206e6f7420616c6c6f7765642061732064657374696e6174696f6e2061646472657373", - "id": 831, + "id": 889, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16094:52:0", + "src": "16094:52:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_587fbb5a9b8e6d4cc482f236066ac51bcf007ae6026eab186437d2f1b22fc139", @@ -10363,21 +10377,21 @@ "typeString": "literal_string \"zero address is not allowed as destination address\"" } ], - "id": 823, + "id": 881, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16014:7:0", + "referencedDeclaration": 5313, + "src": "16014:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 832, + "id": 890, "isConstant": false, "isLValue": false, "isPure": false, @@ -10385,15 +10399,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16014:150:0", + "src": "16014:150:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 833, + "id": 891, "nodeType": "ExpressionStatement", - "src": "16014:150:0" + "src": "16014:150:1" }, { "expression": { @@ -10405,56 +10419,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 835, + "id": 893, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "16212:1:0", + "referencedDeclaration": 772, + "src": "16212:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 836, + "id": 894, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "16212:9:0", + "referencedDeclaration": 120, + "src": "16212:9:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 840, + "id": 898, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 837, + "id": 895, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16222:12:0", + "referencedDeclaration": 763, + "src": "16222:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 839, + "id": 897, "indexExpression": { "argumentTypes": null, - "id": 838, + "id": 896, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16235:1:0", + "referencedDeclaration": 871, + "src": "16235:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10465,7 +10479,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16222:15:0", + "src": "16222:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10476,7 +10490,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16212:26:0", + "src": "16212:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10485,14 +10499,14 @@ { "argumentTypes": null, "hexValue": "44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f6620746865206f776e657273", - "id": 841, + "id": 899, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16260:46:0", + "src": "16260:46:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5ccbe9d117aeeb4b3546dfe6a12f083cb37039367b3ec38b60873b8650bc846f", @@ -10512,21 +10526,21 @@ "typeString": "literal_string \"Destination address is not one of the owners\"" } ], - "id": 834, + "id": 892, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16183:7:0", + "referencedDeclaration": 5313, + "src": "16183:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 842, + "id": 900, "isConstant": false, "isLValue": false, "isPure": false, @@ -10534,15 +10548,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16183:141:0", + "src": "16183:141:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 843, + "id": 901, "nodeType": "ExpressionStatement", - "src": "16183:141:0" + "src": "16183:141:1" }, { "expression": { @@ -10554,7 +10568,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 849, + "id": 907, "isConstant": false, "isLValue": false, "isPure": false, @@ -10563,26 +10577,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 845, + "id": 903, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16372:7:0", + "referencedDeclaration": 766, + "src": "16372:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 847, + "id": 905, "indexExpression": { "argumentTypes": null, - "id": 846, + "id": 904, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16380:1:0", + "referencedDeclaration": 871, + "src": "16380:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10593,7 +10607,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16372:10:0", + "src": "16372:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10604,14 +10618,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 848, + "id": 906, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16385:1:0", + "src": "16385:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -10619,7 +10633,7 @@ }, "value": "0" }, - "src": "16372:14:0", + "src": "16372:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10628,14 +10642,14 @@ { "argumentTypes": null, "hexValue": "416d6f756e7420746f2062652073656e742073686f756c642062652067726561746572207468616e2030", - "id": 850, + "id": 908, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16408:44:0", + "src": "16408:44:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5e1271a09dbb64ae031de288deb0ad8d707df7db51d6e827931dc8fa6642a71e", @@ -10655,21 +10669,21 @@ "typeString": "literal_string \"Amount to be sent should be greater than 0\"" } ], - "id": 844, + "id": 902, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16343:7:0", + "referencedDeclaration": 5313, + "src": "16343:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 851, + "id": 909, "isConstant": false, "isLValue": false, "isPure": false, @@ -10677,32 +10691,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16343:127:0", + "src": "16343:127:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 852, + "id": 910, "nodeType": "ExpressionStatement", - "src": "16343:127:0" + "src": "16343:127:1" }, { "expression": { "argumentTypes": null, - "id": 860, + "id": 918, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 853, + "id": 911, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16489:16:0", + "referencedDeclaration": 778, + "src": "16489:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10717,26 +10731,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 856, + "id": 914, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16529:7:0", + "referencedDeclaration": 766, + "src": "16529:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 858, + "id": 916, "indexExpression": { "argumentTypes": null, - "id": 857, + "id": 915, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16537:1:0", + "referencedDeclaration": 871, + "src": "16537:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10747,7 +10761,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16529:10:0", + "src": "16529:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10763,32 +10777,32 @@ ], "expression": { "argumentTypes": null, - "id": 854, + "id": 912, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16508:16:0", + "referencedDeclaration": 778, + "src": "16508:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 855, + "id": 913, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "16508:20:0", + "referencedDeclaration": 4601, + "src": "16508:20:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 859, + "id": 917, "isConstant": false, "isLValue": false, "isPure": false, @@ -10796,26 +10810,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16508:32:0", + "src": "16508:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16489:51:0", + "src": "16489:51:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 861, + "id": 919, "nodeType": "ExpressionStatement", - "src": "16489:51:0" + "src": "16489:51:1" }, { "expression": { "argumentTypes": null, - "id": 870, + "id": 928, "isConstant": false, "isLValue": false, "isPure": false, @@ -10826,56 +10840,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 862, + "id": 920, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "16605:1:0", + "referencedDeclaration": 772, + "src": "16605:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 867, + "id": 925, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "16605:15:0", + "referencedDeclaration": 128, + "src": "16605:15:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 868, + "id": 926, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 864, + "id": 922, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16621:12:0", + "referencedDeclaration": 763, + "src": "16621:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 866, + "id": 924, "indexExpression": { "argumentTypes": null, - "id": 865, + "id": 923, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16634:1:0", + "referencedDeclaration": 871, + "src": "16634:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10886,7 +10900,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16621:15:0", + "src": "16621:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10897,7 +10911,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "16605:32:0", + "src": "16605:32:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10908,14 +10922,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 869, + "id": 927, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16640:4:0", + "src": "16640:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10923,15 +10937,15 @@ }, "value": "true" }, - "src": "16605:39:0", + "src": "16605:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 871, + "id": 929, "nodeType": "ExpressionStatement", - "src": "16605:39:0" + "src": "16605:39:1" }, { "expression": { @@ -10944,26 +10958,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 875, + "id": 933, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16707:12:0", + "referencedDeclaration": 763, + "src": "16707:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 877, + "id": 935, "indexExpression": { "argumentTypes": null, - "id": 876, + "id": 934, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16720:1:0", + "referencedDeclaration": 871, + "src": "16720:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10974,7 +10988,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16707:15:0", + "src": "16707:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10984,26 +10998,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 878, + "id": 936, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16724:7:0", + "referencedDeclaration": 766, + "src": "16724:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 880, + "id": 938, "indexExpression": { "argumentTypes": null, - "id": 879, + "id": 937, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16732:1:0", + "referencedDeclaration": 871, + "src": "16732:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11014,7 +11028,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16724:10:0", + "src": "16724:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11034,32 +11048,32 @@ ], "expression": { "argumentTypes": null, - "id": 873, + "id": 931, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 806, - "src": "16692:5:0", + "referencedDeclaration": 864, + "src": "16692:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 874, + "id": 932, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "16692:14:0", + "referencedDeclaration": 4412, + "src": "16692:14:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 881, + "id": 939, "isConstant": false, "isLValue": false, "isPure": false, @@ -11067,7 +11081,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16692:43:0", + "src": "16692:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11076,14 +11090,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642e", - "id": 882, + "id": 940, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16757:24:0", + "src": "16757:24:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e545223bb79d8456d66fa5a98897abb42bb4807111f004a120200da3b7e292c5", @@ -11103,21 +11117,21 @@ "typeString": "literal_string \"Token transfer failed.\"" } ], - "id": 872, + "id": 930, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16663:7:0", + "referencedDeclaration": 5313, + "src": "16663:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 883, + "id": 941, "isConstant": false, "isLValue": false, "isPure": false, @@ -11125,15 +11139,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16663:136:0", + "src": "16663:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 884, + "id": 942, "nodeType": "ExpressionStatement", - "src": "16663:136:0" + "src": "16663:136:1" } ] }, @@ -11143,19 +11157,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 819, + "id": 877, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 816, + "id": 874, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "15967:1:0", + "referencedDeclaration": 871, + "src": "15967:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11167,18 +11181,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 817, + "id": 875, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15969:12:0", + "referencedDeclaration": 763, + "src": "15969:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 818, + "id": 876, "isConstant": false, "isLValue": false, "isPure": false, @@ -11186,31 +11200,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15969:19:0", + "src": "15969:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15967:21:0", + "src": "15967:21:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 886, + "id": 944, "initializationExpression": { "assignments": [ - 813 + 871 ], "declarations": [ { "constant": false, - "id": 813, + "id": 871, "name": "j", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15952:9:0", + "scope": 951, + "src": "15952:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11218,10 +11232,10 @@ "typeString": "uint256" }, "typeName": { - "id": 812, + "id": 870, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "15952:7:0", + "src": "15952:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11231,18 +11245,18 @@ "visibility": "internal" } ], - "id": 815, + "id": 873, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 814, + "id": 872, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15964:1:0", + "src": "15964:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11251,12 +11265,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "15952:13:0" + "src": "15952:13:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 821, + "id": 879, "isConstant": false, "isLValue": false, "isPure": false, @@ -11264,15 +11278,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "15990:3:0", + "src": "15990:3:1", "subExpression": { "argumentTypes": null, - "id": 820, + "id": 878, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "15990:1:0", + "referencedDeclaration": 871, + "src": "15990:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11283,29 +11297,29 @@ "typeString": "uint256" } }, - "id": 822, + "id": 880, "nodeType": "ExpressionStatement", - "src": "15990:3:0" + "src": "15990:3:1" }, "nodeType": "ForStatement", - "src": "15947:867:0" + "src": "15947:867:1" } ] } }, - "id": 889, + "id": 947, "nodeType": "IfStatement", - "src": "14969:1855:0", + "src": "14969:1855:1", "trueBody": { - "id": 799, + "id": 857, "nodeType": "Block", - "src": "15017:793:0", + "src": "15017:793:1", "statements": [ { "body": { - "id": 797, + "id": 855, "nodeType": "Block", - "src": "15081:718:0", + "src": "15081:718:1", "statements": [ { "expression": { @@ -11317,7 +11331,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 746, + "id": 804, "isConstant": false, "isLValue": false, "isPure": false, @@ -11326,26 +11340,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 740, + "id": 798, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15129:12:0", + "referencedDeclaration": 763, + "src": "15129:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 742, + "id": 800, "indexExpression": { "argumentTypes": null, - "id": 741, + "id": 799, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15142:1:0", + "referencedDeclaration": 787, + "src": "15142:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11356,7 +11370,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15129:15:0", + "src": "15129:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11370,14 +11384,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 744, + "id": 802, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15156:1:0", + "src": "15156:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11393,20 +11407,20 @@ "typeString": "int_const 0" } ], - "id": 743, + "id": 801, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "15148:7:0", + "src": "15148:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 745, + "id": 803, "isConstant": false, "isLValue": false, "isPure": true, @@ -11414,13 +11428,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15148:10:0", + "src": "15148:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "15129:29:0", + "src": "15129:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11429,14 +11443,14 @@ { "argumentTypes": null, "hexValue": "7a65726f2061646472657373206973206e6f7420616c6c6f7765642061732064657374696e6174696f6e2061646472657373", - "id": 747, + "id": 805, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15180:52:0", + "src": "15180:52:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_587fbb5a9b8e6d4cc482f236066ac51bcf007ae6026eab186437d2f1b22fc139", @@ -11456,21 +11470,21 @@ "typeString": "literal_string \"zero address is not allowed as destination address\"" } ], - "id": 739, + "id": 797, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15100:7:0", + "referencedDeclaration": 5313, + "src": "15100:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 748, + "id": 806, "isConstant": false, "isLValue": false, "isPure": false, @@ -11478,15 +11492,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15100:150:0", + "src": "15100:150:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 749, + "id": 807, "nodeType": "ExpressionStatement", - "src": "15100:150:0" + "src": "15100:150:1" }, { "expression": { @@ -11498,56 +11512,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 751, + "id": 809, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15298:1:0", + "referencedDeclaration": 772, + "src": "15298:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 752, + "id": 810, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "15298:9:0", + "referencedDeclaration": 120, + "src": "15298:9:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 756, + "id": 814, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 753, + "id": 811, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15308:12:0", + "referencedDeclaration": 763, + "src": "15308:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 755, + "id": 813, "indexExpression": { "argumentTypes": null, - "id": 754, + "id": 812, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15321:1:0", + "referencedDeclaration": 787, + "src": "15321:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11558,7 +11572,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15308:15:0", + "src": "15308:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11569,7 +11583,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15298:26:0", + "src": "15298:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11578,14 +11592,14 @@ { "argumentTypes": null, "hexValue": "44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f6620746865206f776e657273", - "id": 757, + "id": 815, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15346:46:0", + "src": "15346:46:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5ccbe9d117aeeb4b3546dfe6a12f083cb37039367b3ec38b60873b8650bc846f", @@ -11605,21 +11619,21 @@ "typeString": "literal_string \"Destination address is not one of the owners\"" } ], - "id": 750, + "id": 808, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15269:7:0", + "referencedDeclaration": 5313, + "src": "15269:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 758, + "id": 816, "isConstant": false, "isLValue": false, "isPure": false, @@ -11627,15 +11641,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15269:141:0", + "src": "15269:141:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 759, + "id": 817, "nodeType": "ExpressionStatement", - "src": "15269:141:0" + "src": "15269:141:1" }, { "expression": { @@ -11647,7 +11661,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 765, + "id": 823, "isConstant": false, "isLValue": false, "isPure": false, @@ -11656,26 +11670,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 761, + "id": 819, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15458:7:0", + "referencedDeclaration": 766, + "src": "15458:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 763, + "id": 821, "indexExpression": { "argumentTypes": null, - "id": 762, + "id": 820, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15466:1:0", + "referencedDeclaration": 787, + "src": "15466:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11686,7 +11700,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15458:10:0", + "src": "15458:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11697,14 +11711,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 764, + "id": 822, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15471:1:0", + "src": "15471:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11712,7 +11726,7 @@ }, "value": "0" }, - "src": "15458:14:0", + "src": "15458:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11721,14 +11735,14 @@ { "argumentTypes": null, "hexValue": "416d6f756e7420746f2062652073656e742073686f756c642062652067726561746572207468616e2030", - "id": 766, + "id": 824, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15494:44:0", + "src": "15494:44:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5e1271a09dbb64ae031de288deb0ad8d707df7db51d6e827931dc8fa6642a71e", @@ -11748,21 +11762,21 @@ "typeString": "literal_string \"Amount to be sent should be greater than 0\"" } ], - "id": 760, + "id": 818, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15429:7:0", + "referencedDeclaration": 5313, + "src": "15429:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 767, + "id": 825, "isConstant": false, "isLValue": false, "isPure": false, @@ -11770,32 +11784,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15429:127:0", + "src": "15429:127:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 768, + "id": 826, "nodeType": "ExpressionStatement", - "src": "15429:127:0" + "src": "15429:127:1" }, { "expression": { "argumentTypes": null, - "id": 776, + "id": 834, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 769, + "id": 827, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "15575:16:0", + "referencedDeclaration": 778, + "src": "15575:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11810,26 +11824,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 772, + "id": 830, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15615:7:0", + "referencedDeclaration": 766, + "src": "15615:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 774, + "id": 832, "indexExpression": { "argumentTypes": null, - "id": 773, + "id": 831, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15623:1:0", + "referencedDeclaration": 787, + "src": "15623:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11840,7 +11854,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15615:10:0", + "src": "15615:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11856,32 +11870,32 @@ ], "expression": { "argumentTypes": null, - "id": 770, + "id": 828, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "15594:16:0", + "referencedDeclaration": 778, + "src": "15594:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 771, + "id": 829, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "15594:20:0", + "referencedDeclaration": 4601, + "src": "15594:20:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 775, + "id": 833, "isConstant": false, "isLValue": false, "isPure": false, @@ -11889,26 +11903,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15594:32:0", + "src": "15594:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15575:51:0", + "src": "15575:51:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 777, + "id": 835, "nodeType": "ExpressionStatement", - "src": "15575:51:0" + "src": "15575:51:1" }, { "expression": { "argumentTypes": null, - "id": 786, + "id": 844, "isConstant": false, "isLValue": false, "isPure": false, @@ -11919,56 +11933,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 778, + "id": 836, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15691:1:0", + "referencedDeclaration": 772, + "src": "15691:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 783, + "id": 841, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "15691:15:0", + "referencedDeclaration": 128, + "src": "15691:15:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 784, + "id": 842, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 780, + "id": 838, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15707:12:0", + "referencedDeclaration": 763, + "src": "15707:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 782, + "id": 840, "indexExpression": { "argumentTypes": null, - "id": 781, + "id": 839, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15720:1:0", + "referencedDeclaration": 787, + "src": "15720:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11979,7 +11993,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15707:15:0", + "src": "15707:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11990,7 +12004,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "15691:32:0", + "src": "15691:32:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12001,14 +12015,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 785, + "id": 843, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15726:4:0", + "src": "15726:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -12016,15 +12030,15 @@ }, "value": "true" }, - "src": "15691:39:0", + "src": "15691:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 787, + "id": 845, "nodeType": "ExpressionStatement", - "src": "15691:39:0" + "src": "15691:39:1" }, { "expression": { @@ -12034,26 +12048,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 792, + "id": 850, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15773:7:0", + "referencedDeclaration": 766, + "src": "15773:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 794, + "id": 852, "indexExpression": { "argumentTypes": null, - "id": 793, + "id": 851, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15781:1:0", + "referencedDeclaration": 787, + "src": "15781:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12064,7 +12078,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15773:10:0", + "src": "15773:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12082,26 +12096,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 788, + "id": 846, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15748:12:0", + "referencedDeclaration": 763, + "src": "15748:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 790, + "id": 848, "indexExpression": { "argumentTypes": null, - "id": 789, + "id": 847, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15761:1:0", + "referencedDeclaration": 787, + "src": "15761:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12112,13 +12126,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15748:15:0", + "src": "15748:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 791, + "id": 849, "isConstant": false, "isLValue": false, "isPure": false, @@ -12126,13 +12140,13 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15748:24:0", + "src": "15748:24:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" } }, - "id": 795, + "id": 853, "isConstant": false, "isLValue": false, "isPure": false, @@ -12140,15 +12154,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15748:36:0", + "src": "15748:36:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 796, + "id": 854, "nodeType": "ExpressionStatement", - "src": "15748:36:0" + "src": "15748:36:1" } ] }, @@ -12158,19 +12172,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 735, + "id": 793, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 732, + "id": 790, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15051:1:0", + "referencedDeclaration": 787, + "src": "15051:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12182,18 +12196,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 733, + "id": 791, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15055:12:0", + "referencedDeclaration": 763, + "src": "15055:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 734, + "id": 792, "isConstant": false, "isLValue": false, "isPure": false, @@ -12201,31 +12215,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15055:19:0", + "src": "15055:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15051:23:0", + "src": "15051:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 798, + "id": 856, "initializationExpression": { "assignments": [ - 729 + 787 ], "declarations": [ { "constant": false, - "id": 729, + "id": 787, "name": "i", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15036:9:0", + "scope": 951, + "src": "15036:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12233,10 +12247,10 @@ "typeString": "uint256" }, "typeName": { - "id": 728, + "id": 786, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "15036:7:0", + "src": "15036:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12246,18 +12260,18 @@ "visibility": "internal" } ], - "id": 731, + "id": 789, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 730, + "id": 788, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15048:1:0", + "src": "15048:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12266,12 +12280,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "15036:13:0" + "src": "15036:13:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 737, + "id": 795, "isConstant": false, "isLValue": false, "isPure": false, @@ -12279,15 +12293,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "15076:3:0", + "src": "15076:3:1", "subExpression": { "argumentTypes": null, - "id": 736, + "id": 794, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15076:1:0", + "referencedDeclaration": 787, + "src": "15076:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12298,12 +12312,12 @@ "typeString": "uint256" } }, - "id": 738, + "id": 796, "nodeType": "ExpressionStatement", - "src": "15076:3:0" + "src": "15076:3:1" }, "nodeType": "ForStatement", - "src": "15031:768:0" + "src": "15031:768:1" } ] } @@ -12311,26 +12325,26 @@ { "expression": { "argumentTypes": null, - "id": 890, + "id": 948, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16840:16:0", + "referencedDeclaration": 778, + "src": "16840:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 712, - "id": 891, + "functionReturnParameters": 770, + "id": 949, "nodeType": "Return", - "src": "16833:23:0" + "src": "16833:23:1" } ] }, "documentation": "dev Private method to transfer funds to the destination addresses on\nthe basis of transaction type", - "id": 893, + "id": 951, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -12338,16 +12352,16 @@ "name": "_transferFunds", "nodeType": "FunctionDefinition", "parameters": { - "id": 709, + "id": 767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 702, + "id": 760, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14733:18:0", + "scope": 951, + "src": "14733:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12355,10 +12369,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 701, + "id": 759, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14733:7:0", + "src": "14733:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12369,11 +12383,11 @@ }, { "constant": false, - "id": 705, + "id": 763, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14761:21:0", + "scope": 951, + "src": "14761:21:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12382,19 +12396,19 @@ }, "typeName": { "baseType": { - "id": 703, + "id": 761, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14761:7:0", + "src": "14761:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 704, + "id": 762, "length": null, "nodeType": "ArrayTypeName", - "src": "14761:9:0", + "src": "14761:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12405,11 +12419,11 @@ }, { "constant": false, - "id": 708, + "id": 766, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14792:16:0", + "scope": 951, + "src": "14792:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12418,19 +12432,19 @@ }, "typeName": { "baseType": { - "id": 706, + "id": 764, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14792:7:0", + "src": "14792:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 707, + "id": 765, "length": null, "nodeType": "ArrayTypeName", - "src": "14792:9:0", + "src": "14792:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -12440,20 +12454,20 @@ "visibility": "internal" } ], - "src": "14723:91:0" + "src": "14723:91:1" }, "payable": false, "returnParameters": { - "id": 712, + "id": 770, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 711, + "id": 769, "name": "", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14848:7:0", + "scope": 951, + "src": "14848:7:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12461,10 +12475,10 @@ "typeString": "uint256" }, "typeName": { - "id": 710, + "id": 768, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14848:7:0", + "src": "14848:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12474,19 +12488,19 @@ "visibility": "internal" } ], - "src": "14847:9:0" + "src": "14847:9:1" }, - "scope": 1208, - "src": "14700:2163:0", + "scope": 1266, + "src": "14700:2163:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1015, + "id": 1073, "nodeType": "Block", - "src": "17194:1247:0", + "src": "17194:1247:1", "statements": [ { "expression": { @@ -12498,7 +12512,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 918, + "id": 976, "isConstant": false, "isLValue": false, "isPure": false, @@ -12507,18 +12521,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 914, + "id": 972, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17212:4:0", + "referencedDeclaration": 957, + "src": "17212:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 915, + "id": 973, "isConstant": false, "isLValue": false, "isPure": false, @@ -12526,7 +12540,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17212:11:0", + "src": "17212:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12538,18 +12552,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 916, + "id": 974, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 902, - "src": "17227:4:0", + "referencedDeclaration": 960, + "src": "17227:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 917, + "id": 975, "isConstant": false, "isLValue": false, "isPure": false, @@ -12557,13 +12571,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17227:11:0", + "src": "17227:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17212:26:0", + "src": "17212:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12572,14 +12586,14 @@ { "argumentTypes": null, "hexValue": "522c53206c656e677468206d69736d61746368", - "id": 919, + "id": 977, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17240:21:0", + "src": "17240:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6415df2de68c580f51a6899dccdc1deed9e5baa5c08f3141a1c35737fb161e1b", @@ -12599,21 +12613,21 @@ "typeString": "literal_string \"R,S length mismatch\"" } ], - "id": 913, + "id": 971, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "17204:7:0", + "referencedDeclaration": 5313, + "src": "17204:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 920, + "id": 978, "isConstant": false, "isLValue": false, "isPure": false, @@ -12621,15 +12635,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17204:58:0", + "src": "17204:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 921, + "id": 979, "nodeType": "ExpressionStatement", - "src": "17204:58:0" + "src": "17204:58:1" }, { "expression": { @@ -12641,7 +12655,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 927, + "id": 985, "isConstant": false, "isLValue": false, "isPure": false, @@ -12650,18 +12664,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 923, + "id": 981, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17280:4:0", + "referencedDeclaration": 957, + "src": "17280:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 924, + "id": 982, "isConstant": false, "isLValue": false, "isPure": false, @@ -12669,7 +12683,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17280:11:0", + "src": "17280:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12681,18 +12695,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 925, + "id": 983, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 896, - "src": "17295:4:0", + "referencedDeclaration": 954, + "src": "17295:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 926, + "id": 984, "isConstant": false, "isLValue": false, "isPure": false, @@ -12700,13 +12714,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17295:11:0", + "src": "17295:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17280:26:0", + "src": "17280:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12715,14 +12729,14 @@ { "argumentTypes": null, "hexValue": "522c56206c656e677468206d69736d61746368", - "id": 928, + "id": 986, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17308:21:0", + "src": "17308:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_70841a86b203e1f3584f84f108ae7ab8a08aeb80ef39e5239bead52625ba25a2", @@ -12742,21 +12756,21 @@ "typeString": "literal_string \"R,V length mismatch\"" } ], - "id": 922, + "id": 980, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "17272:7:0", + "referencedDeclaration": 5313, + "src": "17272:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 929, + "id": 987, "isConstant": false, "isLValue": false, "isPure": false, @@ -12764,28 +12778,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17272:58:0", + "src": "17272:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 930, + "id": 988, "nodeType": "ExpressionStatement", - "src": "17272:58:0" + "src": "17272:58:1" }, { "assignments": [ - 932 + 990 ], "declarations": [ { "constant": false, - "id": 932, + "id": 990, "name": "txHash", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17429:14:0", + "scope": 1074, + "src": "17429:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12793,10 +12807,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 931, + "id": 989, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17429:7:0", + "src": "17429:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12806,7 +12820,7 @@ "visibility": "internal" } ], - "id": 956, + "id": 1014, "initialValue": { "argumentTypes": null, "arguments": [ @@ -12816,14 +12830,14 @@ { "argumentTypes": null, "hexValue": "19457468657265756d205369676e6564204d6573736167653a0a3332", - "id": 936, + "id": 994, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17503:34:0", + "src": "17503:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73", @@ -12843,14 +12857,14 @@ { "argumentTypes": null, "hexValue": "30783139", - "id": 941, + "id": 999, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17633:4:0", + "src": "17633:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_25_by_1", @@ -12866,20 +12880,20 @@ "typeString": "int_const 25" } ], - "id": 940, + "id": 998, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17628:4:0", + "src": "17628:4:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes1_$", "typeString": "type(bytes1)" }, "typeName": "byte" }, - "id": 942, + "id": 1000, "isConstant": false, "isLValue": false, "isPure": true, @@ -12887,7 +12901,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17628:10:0", + "src": "17628:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes1", "typeString": "bytes1" @@ -12899,14 +12913,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 944, + "id": 1002, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17669:1:0", + "src": "17669:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12922,20 +12936,20 @@ "typeString": "int_const 0" } ], - "id": 943, + "id": 1001, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17664:4:0", + "src": "17664:4:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes1_$", "typeString": "type(bytes1)" }, "typeName": "byte" }, - "id": 945, + "id": 1003, "isConstant": false, "isLValue": false, "isPure": true, @@ -12943,7 +12957,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17664:7:0", + "src": "17664:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes1", "typeString": "bytes1" @@ -12954,14 +12968,14 @@ "arguments": [ { "argumentTypes": null, - "id": 947, + "id": 1005, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "17705:4:0", + "referencedDeclaration": 5328, + "src": "17705:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -12969,24 +12983,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 946, + "id": 1004, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17697:7:0", + "src": "17697:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 948, + "id": 1006, "isConstant": false, "isLValue": false, "isPure": false, @@ -12994,7 +13008,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17697:13:0", + "src": "17697:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13002,12 +13016,12 @@ }, { "argumentTypes": null, - "id": 949, + "id": 1007, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 907, - "src": "17736:12:0", + "referencedDeclaration": 965, + "src": "17736:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -13015,12 +13029,12 @@ }, { "argumentTypes": null, - "id": 950, + "id": 1008, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 910, - "src": "17774:7:0", + "referencedDeclaration": 968, + "src": "17774:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -13028,12 +13042,12 @@ }, { "argumentTypes": null, - "id": 951, + "id": 1009, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "17807:10:0", + "referencedDeclaration": 962, + "src": "17807:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13069,18 +13083,18 @@ ], "expression": { "argumentTypes": null, - "id": 938, + "id": 996, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "17586:3:0", + "referencedDeclaration": 5296, + "src": "17586:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 939, + "id": 997, "isConstant": false, "isLValue": false, "isPure": true, @@ -13088,13 +13102,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17586:16:0", + "src": "17586:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 952, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -13102,7 +13116,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17586:253:0", + "src": "17586:253:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -13116,18 +13130,18 @@ "typeString": "bytes memory" } ], - "id": 937, + "id": 995, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "17555:9:0", + "referencedDeclaration": 5303, + "src": "17555:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 953, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": false, @@ -13135,7 +13149,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17555:302:0", + "src": "17555:302:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13155,18 +13169,18 @@ ], "expression": { "argumentTypes": null, - "id": 934, + "id": 992, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "17469:3:0", + "referencedDeclaration": 5296, + "src": "17469:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 935, + "id": 993, "isConstant": false, "isLValue": false, "isPure": true, @@ -13174,13 +13188,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17469:16:0", + "src": "17469:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 954, + "id": 1012, "isConstant": false, "isLValue": false, "isPure": false, @@ -13188,7 +13202,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17469:402:0", + "src": "17469:402:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -13202,18 +13216,18 @@ "typeString": "bytes memory" } ], - "id": 933, + "id": 991, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "17446:9:0", + "referencedDeclaration": 5303, + "src": "17446:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 955, + "id": 1013, "isConstant": false, "isLValue": false, "isPure": false, @@ -13221,33 +13235,33 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17446:435:0", + "src": "17446:435:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "17429:452:0" + "src": "17429:452:1" }, { "body": { - "id": 1013, + "id": 1071, "nodeType": "Block", - "src": "17931:504:0", + "src": "17931:504:1", "statements": [ { "assignments": [ - 969 + 1027 ], "declarations": [ { "constant": false, - "id": 969, + "id": 1027, "name": "recovered", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17946:17:0", + "scope": 1074, + "src": "17946:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13255,10 +13269,10 @@ "typeString": "address" }, "typeName": { - "id": 968, + "id": 1026, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17946:7:0", + "src": "17946:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13268,18 +13282,18 @@ "visibility": "internal" } ], - "id": 982, + "id": 1040, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 971, + "id": 1029, "name": "txHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 932, - "src": "17993:6:0", + "referencedDeclaration": 990, + "src": "17993:6:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13289,26 +13303,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 972, + "id": 1030, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 896, - "src": "18017:4:0", + "referencedDeclaration": 954, + "src": "18017:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 974, + "id": 1032, "indexExpression": { "argumentTypes": null, - "id": 973, + "id": 1031, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18022:1:0", + "referencedDeclaration": 1016, + "src": "18022:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13319,7 +13333,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18017:7:0", + "src": "18017:7:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -13329,26 +13343,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 975, + "id": 1033, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "18042:4:0", + "referencedDeclaration": 957, + "src": "18042:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 977, + "id": 1035, "indexExpression": { "argumentTypes": null, - "id": 976, + "id": 1034, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18047:1:0", + "referencedDeclaration": 1016, + "src": "18047:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13359,7 +13373,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18042:7:0", + "src": "18042:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13369,26 +13383,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 978, + "id": 1036, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 902, - "src": "18067:4:0", + "referencedDeclaration": 960, + "src": "18067:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 980, + "id": 1038, "indexExpression": { "argumentTypes": null, - "id": 979, + "id": 1037, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18072:1:0", + "referencedDeclaration": 1016, + "src": "18072:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13399,7 +13413,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18067:7:0", + "src": "18067:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13425,18 +13439,18 @@ "typeString": "bytes32" } ], - "id": 970, + "id": 1028, "name": "ecrecover", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "17966:9:0", + "referencedDeclaration": 5301, + "src": "17966:9:1", "typeDescriptions": { "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$", "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)" } }, - "id": 981, + "id": 1039, "isConstant": false, "isLValue": false, "isPure": false, @@ -13444,14 +13458,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17966:122:0", + "src": "17966:122:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "17946:142:0" + "src": "17946:142:1" }, { "expression": { @@ -13465,26 +13479,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 984, + "id": 1042, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18128:12:0", + "referencedDeclaration": 133, + "src": "18128:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 986, + "id": 1044, "indexExpression": { "argumentTypes": null, - "id": 985, + "id": 1043, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18141:10:0", + "referencedDeclaration": 962, + "src": "18141:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13495,35 +13509,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18128:24:0", + "src": "18128:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 987, + "id": 1045, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "18128:32:0", + "referencedDeclaration": 120, + "src": "18128:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 989, + "id": 1047, "indexExpression": { "argumentTypes": null, - "id": 988, + "id": 1046, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18161:9:0", + "referencedDeclaration": 1027, + "src": "18161:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13534,7 +13548,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18128:43:0", + "src": "18128:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13543,14 +13557,14 @@ { "argumentTypes": null, "hexValue": "496e76616c6964207369676e6174757265", - "id": 990, + "id": 1048, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "18189:19:0", + "src": "18189:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_4f2d7dfcb27c0aafa13ae8c400de482c7832204d194018b6e45bd2bf244c74e7", @@ -13570,21 +13584,21 @@ "typeString": "literal_string \"Invalid signature\"" } ], - "id": 983, + "id": 1041, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "18103:7:0", + "referencedDeclaration": 5313, + "src": "18103:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 991, + "id": 1049, "isConstant": false, "isLValue": false, "isPure": false, @@ -13592,15 +13606,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18103:119:0", + "src": "18103:119:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 992, + "id": 1050, "nodeType": "ExpressionStatement", - "src": "18103:119:0" + "src": "18103:119:1" }, { "expression": { @@ -13608,7 +13622,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1000, + "id": 1058, "isConstant": false, "isLValue": false, "isPure": false, @@ -13616,7 +13630,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "18261:42:0", + "src": "18261:42:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -13625,26 +13639,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 994, + "id": 1052, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18262:12:0", + "referencedDeclaration": 133, + "src": "18262:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 996, + "id": 1054, "indexExpression": { "argumentTypes": null, - "id": 995, + "id": 1053, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18275:10:0", + "referencedDeclaration": 962, + "src": "18275:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13655,35 +13669,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18262:24:0", + "src": "18262:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 997, + "id": 1055, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "18262:30:0", + "referencedDeclaration": 124, + "src": "18262:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 999, + "id": 1057, "indexExpression": { "argumentTypes": null, - "id": 998, + "id": 1056, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18293:9:0", + "referencedDeclaration": 1027, + "src": "18293:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13694,7 +13708,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18262:41:0", + "src": "18262:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13708,14 +13722,14 @@ { "argumentTypes": null, "hexValue": "53616d65207369676e61747572652073656e74207477696365", - "id": 1001, + "id": 1059, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "18321:27:0", + "src": "18321:27:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb2c7e49d5ec7ce36fa812cf15ee7fa946942f931d04fe3ae970516007b2a543", @@ -13735,21 +13749,21 @@ "typeString": "literal_string \"Same signature sent twice\"" } ], - "id": 993, + "id": 1051, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "18236:7:0", + "referencedDeclaration": 5313, + "src": "18236:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1002, + "id": 1060, "isConstant": false, "isLValue": false, "isPure": false, @@ -13757,20 +13771,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18236:126:0", + "src": "18236:126:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1003, + "id": 1061, "nodeType": "ExpressionStatement", - "src": "18236:126:0" + "src": "18236:126:1" }, { "expression": { "argumentTypes": null, - "id": 1011, + "id": 1069, "isConstant": false, "isLValue": false, "isPure": false, @@ -13783,26 +13797,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1004, + "id": 1062, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18376:12:0", + "referencedDeclaration": 133, + "src": "18376:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1006, + "id": 1064, "indexExpression": { "argumentTypes": null, - "id": 1005, + "id": 1063, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18389:10:0", + "referencedDeclaration": 962, + "src": "18389:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -13813,35 +13827,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18376:24:0", + "src": "18376:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1007, + "id": 1065, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "18376:30:0", + "referencedDeclaration": 124, + "src": "18376:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1009, + "id": 1067, "indexExpression": { "argumentTypes": null, - "id": 1008, + "id": 1066, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18407:9:0", + "referencedDeclaration": 1027, + "src": "18407:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13852,7 +13866,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "18376:41:0", + "src": "18376:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13863,14 +13877,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1010, + "id": 1068, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "18420:4:0", + "src": "18420:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -13878,15 +13892,15 @@ }, "value": "true" }, - "src": "18376:48:0", + "src": "18376:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1012, + "id": 1070, "nodeType": "ExpressionStatement", - "src": "18376:48:0" + "src": "18376:48:1" } ] }, @@ -13896,19 +13910,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 964, + "id": 1022, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 961, + "id": 1019, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "17909:1:0", + "referencedDeclaration": 1016, + "src": "17909:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13920,18 +13934,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 962, + "id": 1020, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17913:4:0", + "referencedDeclaration": 957, + "src": "17913:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 963, + "id": 1021, "isConstant": false, "isLValue": false, "isPure": false, @@ -13939,31 +13953,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17913:11:0", + "src": "17913:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17909:15:0", + "src": "17909:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1014, + "id": 1072, "initializationExpression": { "assignments": [ - 958 + 1016 ], "declarations": [ { "constant": false, - "id": 958, + "id": 1016, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17897:6:0", + "scope": 1074, + "src": "17897:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13971,10 +13985,10 @@ "typeString": "uint256" }, "typeName": { - "id": 957, + "id": 1015, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17897:4:0", + "src": "17897:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13984,18 +13998,18 @@ "visibility": "internal" } ], - "id": 960, + "id": 1018, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 959, + "id": 1017, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17906:1:0", + "src": "17906:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14004,12 +14018,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "17897:10:0" + "src": "17897:10:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 966, + "id": 1024, "isConstant": false, "isLValue": false, "isPure": false, @@ -14017,15 +14031,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "17926:3:0", + "src": "17926:3:1", "subExpression": { "argumentTypes": null, - "id": 965, + "id": 1023, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "17926:1:0", + "referencedDeclaration": 1016, + "src": "17926:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14036,17 +14050,17 @@ "typeString": "uint256" } }, - "id": 967, + "id": 1025, "nodeType": "ExpressionStatement", - "src": "17926:3:0" + "src": "17926:3:1" }, "nodeType": "ForStatement", - "src": "17892:543:0" + "src": "17892:543:1" } ] }, "documentation": "dev Checks whether the signatures are valid or not and marks signers as\nhaving \"voted\".", - "id": 1016, + "id": 1074, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -14054,16 +14068,16 @@ "name": "_verifySignatures", "nodeType": "FunctionDefinition", "parameters": { - "id": 911, + "id": 969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 896, + "id": 954, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17021:12:0", + "scope": 1074, + "src": "17021:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14072,19 +14086,19 @@ }, "typeName": { "baseType": { - "id": 894, + "id": 952, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "17021:5:0", + "src": "17021:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 895, + "id": 953, "length": null, "nodeType": "ArrayTypeName", - "src": "17021:7:0", + "src": "17021:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -14095,11 +14109,11 @@ }, { "constant": false, - "id": 899, + "id": 957, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17043:14:0", + "scope": 1074, + "src": "17043:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14108,19 +14122,19 @@ }, "typeName": { "baseType": { - "id": 897, + "id": 955, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17043:7:0", + "src": "17043:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 898, + "id": 956, "length": null, "nodeType": "ArrayTypeName", - "src": "17043:9:0", + "src": "17043:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -14131,11 +14145,11 @@ }, { "constant": false, - "id": 902, + "id": 960, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17067:14:0", + "scope": 1074, + "src": "17067:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14144,19 +14158,19 @@ }, "typeName": { "baseType": { - "id": 900, + "id": 958, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17067:7:0", + "src": "17067:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 901, + "id": 959, "length": null, "nodeType": "ArrayTypeName", - "src": "17067:9:0", + "src": "17067:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -14167,11 +14181,11 @@ }, { "constant": false, - "id": 904, + "id": 962, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17091:18:0", + "scope": 1074, + "src": "17091:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14179,10 +14193,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 903, + "id": 961, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17091:7:0", + "src": "17091:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -14193,11 +14207,11 @@ }, { "constant": false, - "id": 907, + "id": 965, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17119:22:0", + "scope": 1074, + "src": "17119:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14206,19 +14220,19 @@ }, "typeName": { "baseType": { - "id": 905, + "id": 963, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17119:7:0", + "src": "17119:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 906, + "id": 964, "length": null, "nodeType": "ArrayTypeName", - "src": "17119:9:0", + "src": "17119:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -14229,11 +14243,11 @@ }, { "constant": false, - "id": 910, + "id": 968, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17151:16:0", + "scope": 1074, + "src": "17151:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14242,19 +14256,19 @@ }, "typeName": { "baseType": { - "id": 908, + "id": 966, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "17151:7:0", + "src": "17151:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 909, + "id": 967, "length": null, "nodeType": "ArrayTypeName", - "src": "17151:9:0", + "src": "17151:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -14264,39 +14278,39 @@ "visibility": "internal" } ], - "src": "17011:162:0" + "src": "17011:162:1" }, "payable": false, "returnParameters": { - "id": 912, + "id": 970, "nodeType": "ParameterList", "parameters": [], - "src": "17194:0:0" + "src": "17194:0:1" }, - "scope": 1208, - "src": "16985:1456:0", + "scope": 1266, + "src": "16985:1456:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1047, + "id": 1105, "nodeType": "Block", - "src": "18596:170:0", + "src": "18596:170:1", "statements": [ { "assignments": [ - 1026 + 1084 ], "declarations": [ { "constant": false, - "id": 1026, + "id": 1084, "name": "timeSince", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18606:17:0", + "scope": 1106, + "src": "18606:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14304,10 +14318,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1025, + "id": 1083, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "18606:7:0", + "src": "18606:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14317,18 +14331,18 @@ "visibility": "internal" } ], - "id": 1031, + "id": 1089, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1029, + "id": 1087, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1020, - "src": "18634:12:0", + "referencedDeclaration": 1078, + "src": "18634:12:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14344,32 +14358,32 @@ ], "expression": { "argumentTypes": null, - "id": 1027, + "id": 1085, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2531, - "src": "18626:3:0", + "referencedDeclaration": 5311, + "src": "18626:3:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1028, + "id": 1086, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "18626:7:0", + "referencedDeclaration": 4577, + "src": "18626:7:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1030, + "id": 1088, "isConstant": false, "isLValue": false, "isPure": false, @@ -14377,14 +14391,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18626:21:0", + "src": "18626:21:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "18606:41:0" + "src": "18606:41:1" }, { "expression": { @@ -14398,19 +14412,19 @@ "typeIdentifier": "t_uint32", "typeString": "uint32" }, - "id": 1034, + "id": 1092, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1032, + "id": 1090, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1018, - "src": "18678:12:0", + "referencedDeclaration": 1076, + "src": "18678:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -14421,14 +14435,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1033, + "id": 1091, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "18694:1:0", + "src": "18694:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14436,7 +14450,7 @@ }, "value": "0" }, - "src": "18678:17:0", + "src": "18678:17:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14448,19 +14462,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1043, + "id": 1101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1036, + "id": 1094, "name": "timeSince", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1026, - "src": "18706:9:0", + "referencedDeclaration": 1084, + "src": "18706:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14474,14 +14488,14 @@ { "argumentTypes": null, "hexValue": "33363030", - "id": 1041, + "id": 1099, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "18744:4:0", + "src": "18744:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_3600_by_1", @@ -14502,12 +14516,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1038, + "id": 1096, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1018, - "src": "18726:12:0", + "referencedDeclaration": 1076, + "src": "18726:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -14521,20 +14535,20 @@ "typeString": "uint32" } ], - "id": 1037, + "id": 1095, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "18718:7:0", + "src": "18718:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1039, + "id": 1097, "isConstant": false, "isLValue": false, "isPure": false, @@ -14542,27 +14556,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18718:21:0", + "src": "18718:21:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1040, + "id": 1098, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 2312, - "src": "18718:25:0", + "referencedDeclaration": 4529, + "src": "18718:25:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1042, + "id": 1100, "isConstant": false, "isLValue": false, "isPure": false, @@ -14570,36 +14584,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18718:31:0", + "src": "18718:31:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "18706:43:0", + "src": "18706:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1044, + "id": 1102, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "18678:71:0", + "src": "18678:71:1", "trueExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1035, + "id": 1093, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "18698:5:0", + "src": "18698:5:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -14613,28 +14627,28 @@ } } ], - "id": 1045, + "id": 1103, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "18664:95:0", + "src": "18664:95:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1024, - "id": 1046, + "functionReturnParameters": 1082, + "id": 1104, "nodeType": "Return", - "src": "18657:102:0" + "src": "18657:102:1" } ] }, "documentation": null, - "id": 1048, + "id": 1106, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -14642,16 +14656,16 @@ "name": "_isTimeLockExpired", "nodeType": "FunctionDefinition", "parameters": { - "id": 1021, + "id": 1079, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1018, + "id": 1076, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18484:19:0", + "scope": 1106, + "src": "18484:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14659,10 +14673,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1017, + "id": 1075, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "18484:6:0", + "src": "18484:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -14673,11 +14687,11 @@ }, { "constant": false, - "id": 1020, + "id": 1078, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18513:20:0", + "scope": 1106, + "src": "18513:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14685,10 +14699,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1019, + "id": 1077, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "18513:7:0", + "src": "18513:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14698,20 +14712,20 @@ "visibility": "internal" } ], - "src": "18474:65:0" + "src": "18474:65:1" }, "payable": false, "returnParameters": { - "id": 1024, + "id": 1082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1023, + "id": 1081, "name": "", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18586:4:0", + "scope": 1106, + "src": "18586:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14719,10 +14733,10 @@ "typeString": "bool" }, "typeName": { - "id": 1022, + "id": 1080, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "18586:4:0", + "src": "18586:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14732,19 +14746,19 @@ "visibility": "internal" } ], - "src": "18585:6:0" + "src": "18585:6:1" }, - "scope": 1208, - "src": "18447:319:0", + "scope": 1266, + "src": "18447:319:1", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1206, + "id": 1264, "nodeType": "Block", - "src": "19180:2156:0", + "src": "19180:2156:1", "statements": [ { "expression": { @@ -14756,19 +14770,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1074, + "id": 1132, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1072, + "id": 1130, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "19198:5:0", + "referencedDeclaration": 1108, + "src": "19198:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14778,18 +14792,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 1073, + "id": 1131, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "19207:6:0", + "referencedDeclaration": 1110, + "src": "19207:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "19198:15:0", + "src": "19198:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14798,14 +14812,14 @@ { "argumentTypes": null, "hexValue": "427579657220616e642073656c6c6572206172652073616d65", - "id": 1075, + "id": 1133, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19215:27:0", + "src": "19215:27:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6141441751234d42e9a73d96317794195c7ff57b8f16ac15725a10f10763f824", @@ -14825,21 +14839,21 @@ "typeString": "literal_string \"Buyer and seller are same\"" } ], - "id": 1071, + "id": 1129, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19190:7:0", + "referencedDeclaration": 5313, + "src": "19190:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1076, + "id": 1134, "isConstant": false, "isLValue": false, "isPure": false, @@ -14847,15 +14861,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19190:53:0", + "src": "19190:53:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1077, + "id": 1135, "nodeType": "ExpressionStatement", - "src": "19190:53:0" + "src": "19190:53:1" }, { "expression": { @@ -14867,19 +14881,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1081, + "id": 1139, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1079, + "id": 1137, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "19310:5:0", + "referencedDeclaration": 1120, + "src": "19310:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14890,14 +14904,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1080, + "id": 1138, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19318:1:0", + "src": "19318:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14905,7 +14919,7 @@ }, "value": "0" }, - "src": "19310:9:0", + "src": "19310:9:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14914,14 +14928,14 @@ { "argumentTypes": null, "hexValue": "56616c7565207061737365642069732030", - "id": 1082, + "id": 1140, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19321:19:0", + "src": "19321:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3686f87c4804517ea83323ccf1a3b5b5ff52ed144b19e6fc56abe8fcd182e747", @@ -14941,21 +14955,21 @@ "typeString": "literal_string \"Value passed is 0\"" } ], - "id": 1078, + "id": 1136, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19302:7:0", + "referencedDeclaration": 5313, + "src": "19302:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1083, + "id": 1141, "isConstant": false, "isLValue": false, "isPure": false, @@ -14963,15 +14977,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19302:39:0", + "src": "19302:39:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1084, + "id": 1142, "nodeType": "ExpressionStatement", - "src": "19302:39:0" + "src": "19302:39:1" }, { "expression": { @@ -14983,19 +14997,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1088, + "id": 1146, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1086, + "id": 1144, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19431:9:0", + "referencedDeclaration": 1114, + "src": "19431:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -15006,14 +15020,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1087, + "id": 1145, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19443:1:0", + "src": "19443:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15021,7 +15035,7 @@ }, "value": "0" }, - "src": "19431:13:0", + "src": "19431:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15030,14 +15044,14 @@ { "argumentTypes": null, "hexValue": "5468726573686f6c64206d7573742062652067726561746572207468616e2030", - "id": 1089, + "id": 1147, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19446:34:0", + "src": "19446:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_af363176b249b5431721df37c18f3ec7aee88ba5c53fea51e5672c2aa170b42e", @@ -15057,21 +15071,21 @@ "typeString": "literal_string \"Threshold must be greater than 0\"" } ], - "id": 1085, + "id": 1143, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19423:7:0", + "referencedDeclaration": 5313, + "src": "19423:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1090, + "id": 1148, "isConstant": false, "isLValue": false, "isPure": false, @@ -15079,15 +15093,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19423:58:0", + "src": "19423:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1091, + "id": 1149, "nodeType": "ExpressionStatement", - "src": "19423:58:0" + "src": "19423:58:1" }, { "expression": { @@ -15099,19 +15113,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1095, + "id": 1153, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1093, + "id": 1151, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19499:9:0", + "referencedDeclaration": 1114, + "src": "19499:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -15122,14 +15136,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "33", - "id": 1094, + "id": 1152, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19512:1:0", + "src": "19512:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_3_by_1", @@ -15137,7 +15151,7 @@ }, "value": "3" }, - "src": "19499:14:0", + "src": "19499:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15146,14 +15160,14 @@ { "argumentTypes": null, "hexValue": "5468726573686f6c64206d757374206e6f742062652067726561746572207468616e2033", - "id": 1096, + "id": 1154, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19515:38:0", + "src": "19515:38:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_788126a9367c6f683c74efd2399169e00771f5f0605bb406f99558c1c45363a0", @@ -15173,21 +15187,21 @@ "typeString": "literal_string \"Threshold must not be greater than 3\"" } ], - "id": 1092, + "id": 1150, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19491:7:0", + "referencedDeclaration": 5313, + "src": "19491:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1097, + "id": 1155, "isConstant": false, "isLValue": false, "isPure": false, @@ -15195,15 +15209,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19491:63:0", + "src": "19491:63:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1098, + "id": 1156, "nodeType": "ExpressionStatement", - "src": "19491:63:0" + "src": "19491:63:1" }, { "expression": { @@ -15215,7 +15229,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1108, + "id": 1166, "isConstant": false, "isLValue": false, "isPure": false, @@ -15226,19 +15240,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1102, + "id": 1160, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1100, + "id": 1158, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19704:9:0", + "referencedDeclaration": 1114, + "src": "19704:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -15249,14 +15263,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1101, + "id": 1159, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19717:1:0", + "src": "19717:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -15264,7 +15278,7 @@ }, "value": "1" }, - "src": "19704:14:0", + "src": "19704:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15278,19 +15292,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1107, + "id": 1165, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1103, + "id": 1161, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "19722:9:0", + "referencedDeclaration": 1112, + "src": "19722:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15304,14 +15318,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1105, + "id": 1163, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19743:1:0", + "src": "19743:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15327,20 +15341,20 @@ "typeString": "int_const 0" } ], - "id": 1104, + "id": 1162, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "19735:7:0", + "src": "19735:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 1106, + "id": 1164, "isConstant": false, "isLValue": false, "isPure": true, @@ -15348,19 +15362,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19735:10:0", + "src": "19735:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "19722:23:0", + "src": "19722:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "19704:41:0", + "src": "19704:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15369,14 +15383,14 @@ { "argumentTypes": null, "hexValue": "456974686572207468726573686f6c642073686f756c642062652031206f722076616c6964206d6f64657261746f7220616464726573732073686f756c6420626520706173736564", - "id": 1109, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19759:74:0", + "src": "19759:74:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2056db168725d2fabb8aaf14efad7a3fc12ef6bc7132f0596ea09b041b71cb25", @@ -15396,21 +15410,21 @@ "typeString": "literal_string \"Either threshold should be 1 or valid moderator address should be passed\"" } ], - "id": 1099, + "id": 1157, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19683:7:0", + "referencedDeclaration": 5313, + "src": "19683:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1110, + "id": 1168, "isConstant": false, "isLValue": false, "isPure": false, @@ -15418,15 +15432,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19683:160:0", + "src": "19683:160:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1111, + "id": 1169, "nodeType": "ExpressionStatement", - "src": "19683:160:0" + "src": "19683:160:1" }, { "expression": { @@ -15438,19 +15452,19 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1123, + "id": 1181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1113, + "id": 1171, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "19875:10:0", + "referencedDeclaration": 1118, + "src": "19875:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15463,12 +15477,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1115, + "id": 1173, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1064, - "src": "19932:8:0", + "referencedDeclaration": 1122, + "src": "19932:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -15476,12 +15490,12 @@ }, { "argumentTypes": null, - "id": 1116, + "id": 1174, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19958:9:0", + "referencedDeclaration": 1114, + "src": "19958:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -15489,12 +15503,12 @@ }, { "argumentTypes": null, - "id": 1117, + "id": 1175, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "19985:12:0", + "referencedDeclaration": 1116, + "src": "19985:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -15502,12 +15516,12 @@ }, { "argumentTypes": null, - "id": 1118, + "id": 1176, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20015:5:0", + "referencedDeclaration": 1108, + "src": "20015:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15515,12 +15529,12 @@ }, { "argumentTypes": null, - "id": 1119, + "id": 1177, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20038:6:0", + "referencedDeclaration": 1110, + "src": "20038:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15528,12 +15542,12 @@ }, { "argumentTypes": null, - "id": 1120, + "id": 1178, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20062:9:0", + "referencedDeclaration": 1112, + "src": "20062:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15541,12 +15555,12 @@ }, { "argumentTypes": null, - "id": 1121, + "id": 1179, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "20089:12:0", + "referencedDeclaration": 1126, + "src": "20089:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15584,18 +15598,18 @@ "typeString": "address" } ], - "id": 1114, + "id": 1172, "name": "calculateRedeemScriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 624, - "src": "19889:25:0", + "referencedDeclaration": 682, + "src": "19889:25:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes20_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$_t_address_$returns$_t_bytes32_$", "typeString": "function (bytes20,uint8,uint32,address,address,address,address) view returns (bytes32)" } }, - "id": 1122, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": false, @@ -15603,13 +15617,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19889:226:0", + "src": "19889:226:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "19875:240:0", + "src": "19875:240:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15618,14 +15632,14 @@ { "argumentTypes": null, "hexValue": "43616c63756c6174656420736372697074206861736820646f6573206e6f74206d61746368207061737365642073637269707420686173682e", - "id": 1124, + "id": 1182, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "20129:59:0", + "src": "20129:59:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_0c041e0c58e6b0e01d338d852a5abb639065eabeb0aee05e0ce3e5f0e52b4f51", @@ -15645,21 +15659,21 @@ "typeString": "literal_string \"Calculated script hash does not match passed script hash.\"" } ], - "id": 1112, + "id": 1170, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19854:7:0", + "referencedDeclaration": 5313, + "src": "19854:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1125, + "id": 1183, "isConstant": false, "isLValue": false, "isPure": false, @@ -15667,20 +15681,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19854:344:0", + "src": "19854:344:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1126, + "id": 1184, "nodeType": "ExpressionStatement", - "src": "19854:344:0" + "src": "19854:344:1" }, { "expression": { "argumentTypes": null, - "id": 1144, + "id": 1202, "isConstant": false, "isLValue": false, "isPure": false, @@ -15689,26 +15703,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1127, + "id": 1185, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20209:12:0", + "referencedDeclaration": 133, + "src": "20209:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1129, + "id": 1187, "indexExpression": { "argumentTypes": null, - "id": 1128, + "id": 1186, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20222:10:0", + "referencedDeclaration": 1118, + "src": "20222:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15719,9 +15733,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20209:24:0", + "src": "20209:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, @@ -15732,12 +15746,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1131, + "id": 1189, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20269:5:0", + "referencedDeclaration": 1108, + "src": "20269:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15745,12 +15759,12 @@ }, { "argumentTypes": null, - "id": 1132, + "id": 1190, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20296:6:0", + "referencedDeclaration": 1110, + "src": "20296:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15758,12 +15772,12 @@ }, { "argumentTypes": null, - "id": 1133, + "id": 1191, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20327:9:0", + "referencedDeclaration": 1112, + "src": "20327:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15771,12 +15785,12 @@ }, { "argumentTypes": null, - "id": 1134, + "id": 1192, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "20357:5:0", + "referencedDeclaration": 1120, + "src": "20357:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15786,18 +15800,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1135, + "id": 1193, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "20384:6:0", + "referencedDeclaration": 67, + "src": "20384:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 1136, + "id": 1194, "isConstant": false, "isLValue": false, "isPure": true, @@ -15805,9 +15819,9 @@ "memberName": "FUNDED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "20384:13:0", + "src": "20384:13:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -15815,18 +15829,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1137, + "id": 1195, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "20425:5:0", + "referencedDeclaration": 5299, + "src": "20425:5:1", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1138, + "id": 1196, "isConstant": false, "isLValue": false, "isPure": false, @@ -15834,7 +15848,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "20425:15:0", + "src": "20425:15:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15842,12 +15856,12 @@ }, { "argumentTypes": null, - "id": 1139, + "id": 1197, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "20465:9:0", + "referencedDeclaration": 1114, + "src": "20465:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -15855,12 +15869,12 @@ }, { "argumentTypes": null, - "id": 1140, + "id": 1198, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "20502:12:0", + "referencedDeclaration": 1116, + "src": "20502:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -15868,25 +15882,25 @@ }, { "argumentTypes": null, - "id": 1141, + "id": 1199, "name": "transactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "20544:15:0", + "referencedDeclaration": 1124, + "src": "20544:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, { "argumentTypes": null, - "id": 1142, + "id": 1200, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "20586:12:0", + "referencedDeclaration": 1126, + "src": "20586:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15895,18 +15909,18 @@ ], "expression": { "argumentTypes": null, - "id": 1130, + "id": 1188, "name": "Transaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, - "src": "20236:11:0", + "referencedDeclaration": 129, + "src": "20236:11:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Transaction_$71_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Transaction_$129_storage_ptr_$", "typeString": "type(struct Escrow_v1_0.Transaction storage pointer)" } }, - "id": 1143, + "id": 1201, "isConstant": false, "isLValue": false, "isPure": false, @@ -15925,26 +15939,26 @@ "tokenAddress" ], "nodeType": "FunctionCall", - "src": "20236:373:0", + "src": "20236:373:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_memory", + "typeIdentifier": "t_struct$_Transaction_$129_memory", "typeString": "struct Escrow_v1_0.Transaction memory" } }, - "src": "20209:400:0", + "src": "20209:400:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1145, + "id": 1203, "nodeType": "ExpressionStatement", - "src": "20209:400:0" + "src": "20209:400:1" }, { "expression": { "argumentTypes": null, - "id": 1153, + "id": 1211, "isConstant": false, "isLValue": false, "isPure": false, @@ -15957,26 +15971,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1146, + "id": 1204, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20620:12:0", + "referencedDeclaration": 133, + "src": "20620:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1148, + "id": 1206, "indexExpression": { "argumentTypes": null, - "id": 1147, + "id": 1205, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20633:10:0", + "referencedDeclaration": 1118, + "src": "20633:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -15987,35 +16001,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20620:24:0", + "src": "20620:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1149, + "id": 1207, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20620:32:0", + "referencedDeclaration": 120, + "src": "20620:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1151, + "id": 1209, "indexExpression": { "argumentTypes": null, - "id": 1150, + "id": 1208, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20653:6:0", + "referencedDeclaration": 1110, + "src": "20653:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16026,7 +16040,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20620:40:0", + "src": "20620:40:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16037,14 +16051,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1152, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "20663:4:0", + "src": "20663:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -16052,20 +16066,20 @@ }, "value": "true" }, - "src": "20620:47:0", + "src": "20620:47:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1154, + "id": 1212, "nodeType": "ExpressionStatement", - "src": "20620:47:0" + "src": "20620:47:1" }, { "expression": { "argumentTypes": null, - "id": 1162, + "id": 1220, "isConstant": false, "isLValue": false, "isPure": false, @@ -16078,26 +16092,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1155, + "id": 1213, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20677:12:0", + "referencedDeclaration": 133, + "src": "20677:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1157, + "id": 1215, "indexExpression": { "argumentTypes": null, - "id": 1156, + "id": 1214, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20690:10:0", + "referencedDeclaration": 1118, + "src": "20690:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16108,35 +16122,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20677:24:0", + "src": "20677:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1158, + "id": 1216, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20677:32:0", + "referencedDeclaration": 120, + "src": "20677:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1160, + "id": 1218, "indexExpression": { "argumentTypes": null, - "id": 1159, + "id": 1217, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20710:5:0", + "referencedDeclaration": 1108, + "src": "20710:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16147,7 +16161,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20677:39:0", + "src": "20677:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16158,14 +16172,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1161, + "id": 1219, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "20719:4:0", + "src": "20719:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -16173,15 +16187,15 @@ }, "value": "true" }, - "src": "20677:46:0", + "src": "20677:46:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1163, + "id": 1221, "nodeType": "ExpressionStatement", - "src": "20677:46:0" + "src": "20677:46:1" }, { "expression": { @@ -16189,7 +16203,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1171, + "id": 1229, "isConstant": false, "isLValue": false, "isPure": false, @@ -16197,7 +16211,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "20818:44:0", + "src": "20818:44:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -16206,26 +16220,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1165, + "id": 1223, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20819:12:0", + "referencedDeclaration": 133, + "src": "20819:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1167, + "id": 1225, "indexExpression": { "argumentTypes": null, - "id": 1166, + "id": 1224, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20832:10:0", + "referencedDeclaration": 1118, + "src": "20832:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16236,35 +16250,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20819:24:0", + "src": "20819:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1168, + "id": 1226, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20819:32:0", + "referencedDeclaration": 120, + "src": "20819:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1170, + "id": 1228, "indexExpression": { "argumentTypes": null, - "id": 1169, + "id": 1227, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20852:9:0", + "referencedDeclaration": 1112, + "src": "20852:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16275,7 +16289,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20819:43:0", + "src": "20819:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16289,14 +16303,14 @@ { "argumentTypes": null, "hexValue": "456974686572206275796572206f722073656c6c657220697320706173736564206173206d6f64657261746f72", - "id": 1172, + "id": 1230, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "20876:47:0", + "src": "20876:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_313b391557427937e7bdb85c7561d47c5b9c985755a448dd33a92026ffb38f8d", @@ -16316,21 +16330,21 @@ "typeString": "literal_string \"Either buyer or seller is passed as moderator\"" } ], - "id": 1164, + "id": 1222, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "20797:7:0", + "referencedDeclaration": 5313, + "src": "20797:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1173, + "id": 1231, "isConstant": false, "isLValue": false, "isPure": false, @@ -16338,15 +16352,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "20797:136:0", + "src": "20797:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1174, + "id": 1232, "nodeType": "ExpressionStatement", - "src": "20797:136:0" + "src": "20797:136:1" }, { "condition": { @@ -16355,19 +16369,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1177, + "id": 1235, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1175, + "id": 1233, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "21104:9:0", + "referencedDeclaration": 1114, + "src": "21104:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -16378,14 +16392,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1176, + "id": 1234, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "21116:1:0", + "src": "21116:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -16393,25 +16407,25 @@ }, "value": "1" }, - "src": "21104:13:0", + "src": "21104:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1188, + "id": 1246, "nodeType": "IfStatement", - "src": "21100:94:0", + "src": "21100:94:1", "trueBody": { - "id": 1187, + "id": 1245, "nodeType": "Block", - "src": "21119:75:0", + "src": "21119:75:1", "statements": [ { "expression": { "argumentTypes": null, - "id": 1185, + "id": 1243, "isConstant": false, "isLValue": false, "isPure": false, @@ -16424,26 +16438,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1178, + "id": 1236, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "21133:12:0", + "referencedDeclaration": 133, + "src": "21133:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1180, + "id": 1238, "indexExpression": { "argumentTypes": null, - "id": 1179, + "id": 1237, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21146:10:0", + "referencedDeclaration": 1118, + "src": "21146:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16454,35 +16468,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21133:24:0", + "src": "21133:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1181, + "id": 1239, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "21133:32:0", + "referencedDeclaration": 120, + "src": "21133:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1183, + "id": 1241, "indexExpression": { "argumentTypes": null, - "id": 1182, + "id": 1240, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "21166:9:0", + "referencedDeclaration": 1112, + "src": "21166:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16493,7 +16507,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "21133:43:0", + "src": "21133:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16504,14 +16518,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1184, + "id": 1242, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "21179:4:0", + "src": "21179:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -16519,15 +16533,15 @@ }, "value": "true" }, - "src": "21133:50:0", + "src": "21133:50:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1186, + "id": 1244, "nodeType": "ExpressionStatement", - "src": "21133:50:0" + "src": "21133:50:1" } ] } @@ -16535,7 +16549,7 @@ { "expression": { "argumentTypes": null, - "id": 1190, + "id": 1248, "isConstant": false, "isLValue": false, "isPure": false, @@ -16543,15 +16557,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "21205:18:0", + "src": "21205:18:1", "subExpression": { "argumentTypes": null, - "id": 1189, + "id": 1247, "name": "transactionCount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 78, - "src": "21205:16:0", + "referencedDeclaration": 136, + "src": "21205:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16562,9 +16576,9 @@ "typeString": "uint256" } }, - "id": 1191, + "id": 1249, "nodeType": "ExpressionStatement", - "src": "21205:18:0" + "src": "21205:18:1" }, { "expression": { @@ -16572,12 +16586,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1196, + "id": 1254, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21265:10:0", + "referencedDeclaration": 1118, + "src": "21265:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16595,26 +16609,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1192, + "id": 1250, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "21234:18:0", + "referencedDeclaration": 141, + "src": "21234:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 1194, + "id": 1252, "indexExpression": { "argumentTypes": null, - "id": 1193, + "id": 1251, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "21253:5:0", + "referencedDeclaration": 1108, + "src": "21253:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16625,13 +16639,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21234:25:0", + "src": "21234:25:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "id": 1195, + "id": 1253, "isConstant": false, "isLValue": false, "isPure": false, @@ -16639,13 +16653,13 @@ "memberName": "push", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "21234:30:0", + "src": "21234:30:1", "typeDescriptions": { "typeIdentifier": "t_function_arraypush_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) returns (uint256)" } }, - "id": 1197, + "id": 1255, "isConstant": false, "isLValue": false, "isPure": false, @@ -16653,15 +16667,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "21234:42:0", + "src": "21234:42:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1198, + "id": 1256, "nodeType": "ExpressionStatement", - "src": "21234:42:0" + "src": "21234:42:1" }, { "expression": { @@ -16669,12 +16683,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1203, + "id": 1261, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21318:10:0", + "referencedDeclaration": 1118, + "src": "21318:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16692,26 +16706,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1199, + "id": 1257, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "21286:18:0", + "referencedDeclaration": 141, + "src": "21286:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 1201, + "id": 1259, "indexExpression": { "argumentTypes": null, - "id": 1200, + "id": 1258, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "21305:6:0", + "referencedDeclaration": 1110, + "src": "21305:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16722,13 +16736,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21286:26:0", + "src": "21286:26:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "id": 1202, + "id": 1260, "isConstant": false, "isLValue": false, "isPure": false, @@ -16736,13 +16750,13 @@ "memberName": "push", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "21286:31:0", + "src": "21286:31:1", "typeDescriptions": { "typeIdentifier": "t_function_arraypush_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) returns (uint256)" } }, - "id": 1204, + "id": 1262, "isConstant": false, "isLValue": false, "isPure": false, @@ -16750,20 +16764,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "21286:43:0", + "src": "21286:43:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1205, + "id": 1263, "nodeType": "ExpressionStatement", - "src": "21286:43:0" + "src": "21286:43:1" } ] }, "documentation": "Private method to add transaction to reduce code redundancy", - "id": 1207, + "id": 1265, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -16771,16 +16785,16 @@ "name": "_addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1069, + "id": 1127, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1050, + "id": 1108, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18887:13:0", + "scope": 1265, + "src": "18887:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16788,10 +16802,10 @@ "typeString": "address" }, "typeName": { - "id": 1049, + "id": 1107, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18887:7:0", + "src": "18887:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16802,11 +16816,11 @@ }, { "constant": false, - "id": 1052, + "id": 1110, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18910:14:0", + "scope": 1265, + "src": "18910:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16814,10 +16828,10 @@ "typeString": "address" }, "typeName": { - "id": 1051, + "id": 1109, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18910:7:0", + "src": "18910:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16828,11 +16842,11 @@ }, { "constant": false, - "id": 1054, + "id": 1112, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18934:17:0", + "scope": 1265, + "src": "18934:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16840,10 +16854,10 @@ "typeString": "address" }, "typeName": { - "id": 1053, + "id": 1111, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18934:7:0", + "src": "18934:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16854,11 +16868,11 @@ }, { "constant": false, - "id": 1056, + "id": 1114, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18961:15:0", + "scope": 1265, + "src": "18961:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16866,10 +16880,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1055, + "id": 1113, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "18961:5:0", + "src": "18961:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -16880,11 +16894,11 @@ }, { "constant": false, - "id": 1058, + "id": 1116, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18986:19:0", + "scope": 1265, + "src": "18986:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16892,10 +16906,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1057, + "id": 1115, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "18986:6:0", + "src": "18986:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -16906,11 +16920,11 @@ }, { "constant": false, - "id": 1060, + "id": 1118, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19015:18:0", + "scope": 1265, + "src": "19015:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16918,10 +16932,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1059, + "id": 1117, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "19015:7:0", + "src": "19015:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -16932,11 +16946,11 @@ }, { "constant": false, - "id": 1062, + "id": 1120, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19043:13:0", + "scope": 1265, + "src": "19043:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16944,10 +16958,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1061, + "id": 1119, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "19043:7:0", + "src": "19043:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16958,11 +16972,11 @@ }, { "constant": false, - "id": 1064, + "id": 1122, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19066:16:0", + "scope": 1265, + "src": "19066:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16970,10 +16984,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1063, + "id": 1121, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "19066:7:0", + "src": "19066:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -16984,26 +16998,26 @@ }, { "constant": false, - "id": 1066, + "id": 1124, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19092:31:0", + "scope": 1265, + "src": "19092:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 1065, + "id": 1123, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "19092:15:0", + "referencedDeclaration": 70, + "src": "19092:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -17012,11 +17026,11 @@ }, { "constant": false, - "id": 1068, + "id": 1126, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19133:20:0", + "scope": 1265, + "src": "19133:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17024,10 +17038,10 @@ "typeString": "address" }, "typeName": { - "id": 1067, + "id": 1125, "name": "address", "nodeType": "ElementaryTypeName", - "src": "19133:7:0", + "src": "19133:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17037,67 +17051,67 @@ "visibility": "internal" } ], - "src": "18877:282:0" + "src": "18877:282:1" }, "payable": false, "returnParameters": { - "id": 1070, + "id": 1128, "nodeType": "ParameterList", "parameters": [], - "src": "19180:0:0" + "src": "19180:0:1" }, - "scope": 1208, - "src": "18853:2483:0", + "scope": 1266, + "src": "18853:2483:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 1209, - "src": "603:20735:0" + "scope": 1267, + "src": "603:20735:1" } ], - "src": "0:21339:0" + "src": "0:21339:1" }, "legacyAST": { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/Escrow_v1_0.sol", "exportedSymbols": { "Escrow_v1_0": [ - 1208 + 1266 ] }, - "id": 1209, + "id": 1267, "nodeType": "SourceUnit", "nodes": [ { - "id": 1, + "id": 59, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:0" + "src": "0:23:1" }, { "absolutePath": "openzeppelin-solidity/contracts/math/SafeMath.sol", "file": "openzeppelin-solidity/contracts/math/SafeMath.sol", - "id": 2, + "id": 60, "nodeType": "ImportDirective", - "scope": 1209, - "sourceUnit": 2406, - "src": "25:59:0", + "scope": 1267, + "sourceUnit": 4623, + "src": "25:59:1", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/token/ITokenContract.sol", "file": "../token/ITokenContract.sol", - "id": 3, + "id": 61, "nodeType": "ImportDirective", - "scope": 1209, - "sourceUnit": 2278, - "src": "86:37:0", + "scope": 1267, + "sourceUnit": 4446, + "src": "86:37:1", "symbolAliases": [], "unitAlias": "" }, @@ -17107,34 +17121,34 @@ "contractKind": "contract", "documentation": "@dev Supports ERC20 tokens\nThe escrow smart contract for the OpenBazaar trades in Ethereum\nThe smart contract is designed keeping in mind the current wallet interface\nof OB-core:\nhttps://github.com/OpenBazaar/wallet-interface/blob/master/wallet.go\nCurrent wallet interface strictly adheres to UTXO(bitcoin) model\nPlease read below mentioned link for detailed specs\nhttps://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md", "fullyImplemented": true, - "id": 1208, + "id": 1266, "linearizedBaseContracts": [ - 1208 + 1266 ], "name": "Escrow_v1_0", "nodeType": "ContractDefinition", "nodes": [ { - "id": 6, + "id": 64, "libraryName": { "contractScope": null, - "id": 4, + "id": 62, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2405, - "src": "637:8:0", + "referencedDeclaration": 4622, + "src": "637:8:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$2405", + "typeIdentifier": "t_contract$_SafeMath_$4622", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "631:27:0", + "src": "631:27:1", "typeName": { - "id": 5, + "id": 63, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "650:7:0", + "src": "650:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17143,64 +17157,64 @@ }, { "canonicalName": "Escrow_v1_0.Status", - "id": 9, + "id": 67, "members": [ { - "id": 7, + "id": 65, "name": "FUNDED", "nodeType": "EnumValue", - "src": "677:6:0" + "src": "677:6:1" }, { - "id": 8, + "id": 66, "name": "RELEASED", "nodeType": "EnumValue", - "src": "685:8:0" + "src": "685:8:1" } ], "name": "Status", "nodeType": "EnumDefinition", - "src": "664:30:0" + "src": "664:30:1" }, { "canonicalName": "Escrow_v1_0.TransactionType", - "id": 12, + "id": 70, "members": [ { - "id": 10, + "id": 68, "name": "ETHER", "nodeType": "EnumValue", - "src": "722:5:0" + "src": "722:5:1" }, { - "id": 11, + "id": 69, "name": "TOKEN", "nodeType": "EnumValue", - "src": "729:5:0" + "src": "729:5:1" } ], "name": "TransactionType", "nodeType": "EnumDefinition", - "src": "700:35:0" + "src": "700:35:1" }, { "anonymous": false, "documentation": null, - "id": 22, + "id": 80, "name": "Executed", "nodeType": "EventDefinition", "parameters": { - "id": 21, + "id": 79, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 14, + "id": 72, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "765:26:0", + "scope": 80, + "src": "765:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17208,10 +17222,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 13, + "id": 71, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "765:7:0", + "src": "765:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17222,12 +17236,12 @@ }, { "constant": false, - "id": 17, + "id": 75, "indexed": false, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "801:22:0", + "scope": 80, + "src": "801:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17236,19 +17250,19 @@ }, "typeName": { "baseType": { - "id": 15, + "id": 73, "name": "address", "nodeType": "ElementaryTypeName", - "src": "801:7:0", + "src": "801:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 16, + "id": 74, "length": null, "nodeType": "ArrayTypeName", - "src": "801:9:0", + "src": "801:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -17259,12 +17273,12 @@ }, { "constant": false, - "id": 20, + "id": 78, "indexed": false, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 22, - "src": "833:17:0", + "scope": 80, + "src": "833:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17273,19 +17287,19 @@ }, "typeName": { "baseType": { - "id": 18, + "id": 76, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "833:7:0", + "src": "833:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 19, + "id": 77, "length": null, "nodeType": "ArrayTypeName", - "src": "833:9:0", + "src": "833:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -17295,28 +17309,28 @@ "visibility": "internal" } ], - "src": "755:101:0" + "src": "755:101:1" }, - "src": "741:116:0" + "src": "741:116:1" }, { "anonymous": false, "documentation": null, - "id": 30, + "id": 88, "name": "FundAdded", "nodeType": "EventDefinition", "parameters": { - "id": 29, + "id": 87, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 24, + "id": 82, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "888:26:0", + "scope": 88, + "src": "888:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17324,10 +17338,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 23, + "id": 81, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "888:7:0", + "src": "888:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17338,12 +17352,12 @@ }, { "constant": false, - "id": 26, + "id": 84, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "924:20:0", + "scope": 88, + "src": "924:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17351,10 +17365,10 @@ "typeString": "address" }, "typeName": { - "id": 25, + "id": 83, "name": "address", "nodeType": "ElementaryTypeName", - "src": "924:7:0", + "src": "924:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17365,12 +17379,12 @@ }, { "constant": false, - "id": 28, + "id": 86, "indexed": false, "name": "valueAdded", "nodeType": "VariableDeclaration", - "scope": 30, - "src": "954:18:0", + "scope": 88, + "src": "954:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17378,10 +17392,10 @@ "typeString": "uint256" }, "typeName": { - "id": 27, + "id": 85, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "954:7:0", + "src": "954:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17391,28 +17405,28 @@ "visibility": "internal" } ], - "src": "878:100:0" + "src": "878:100:1" }, - "src": "863:116:0" + "src": "863:116:1" }, { "anonymous": false, "documentation": null, - "id": 38, + "id": 96, "name": "Funded", "nodeType": "EventDefinition", "parameters": { - "id": 37, + "id": 95, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 32, + "id": 90, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1007:26:0", + "scope": 96, + "src": "1007:26:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17420,10 +17434,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 31, + "id": 89, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1007:7:0", + "src": "1007:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17434,12 +17448,12 @@ }, { "constant": false, - "id": 34, + "id": 92, "indexed": true, "name": "from", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1043:20:0", + "scope": 96, + "src": "1043:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17447,10 +17461,10 @@ "typeString": "address" }, "typeName": { - "id": 33, + "id": 91, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1043:7:0", + "src": "1043:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17461,12 +17475,12 @@ }, { "constant": false, - "id": 36, + "id": 94, "indexed": false, "name": "value", "nodeType": "VariableDeclaration", - "scope": 38, - "src": "1073:13:0", + "scope": 96, + "src": "1073:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17474,10 +17488,10 @@ "typeString": "uint256" }, "typeName": { - "id": 35, + "id": 93, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1073:7:0", + "src": "1073:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17487,21 +17501,21 @@ "visibility": "internal" } ], - "src": "997:95:0" + "src": "997:95:1" }, - "src": "985:108:0" + "src": "985:108:1" }, { "canonicalName": "Escrow_v1_0.Transaction", - "id": 71, + "id": 129, "members": [ { "constant": false, - "id": 40, + "id": 98, "name": "value", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1128:13:0", + "scope": 129, + "src": "1128:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17509,10 +17523,10 @@ "typeString": "uint256" }, "typeName": { - "id": 39, + "id": 97, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1128:7:0", + "src": "1128:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17523,11 +17537,11 @@ }, { "constant": false, - "id": 42, + "id": 100, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1151:20:0", + "scope": 129, + "src": "1151:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17535,10 +17549,10 @@ "typeString": "uint256" }, "typeName": { - "id": 41, + "id": 99, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1151:7:0", + "src": "1151:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17549,26 +17563,26 @@ }, { "constant": false, - "id": 44, + "id": 102, "name": "status", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1223:13:0", + "scope": 129, + "src": "1223:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" }, "typeName": { "contractScope": null, - "id": 43, + "id": 101, "name": "Status", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 9, - "src": "1223:6:0", + "referencedDeclaration": 67, + "src": "1223:6:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -17577,26 +17591,26 @@ }, { "constant": false, - "id": 46, + "id": 104, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1246:31:0", + "scope": 129, + "src": "1246:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 45, + "id": 103, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "1246:15:0", + "referencedDeclaration": 70, + "src": "1246:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -17605,11 +17619,11 @@ }, { "constant": false, - "id": 48, + "id": 106, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1287:15:0", + "scope": 129, + "src": "1287:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17617,10 +17631,10 @@ "typeString": "uint8" }, "typeName": { - "id": 47, + "id": 105, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "1287:5:0", + "src": "1287:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -17631,11 +17645,11 @@ }, { "constant": false, - "id": 50, + "id": 108, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1312:19:0", + "scope": 129, + "src": "1312:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17643,10 +17657,10 @@ "typeString": "uint32" }, "typeName": { - "id": 49, + "id": 107, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1312:6:0", + "src": "1312:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -17657,11 +17671,11 @@ }, { "constant": false, - "id": 52, + "id": 110, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1341:13:0", + "scope": 129, + "src": "1341:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17669,10 +17683,10 @@ "typeString": "address" }, "typeName": { - "id": 51, + "id": 109, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1341:7:0", + "src": "1341:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17683,11 +17697,11 @@ }, { "constant": false, - "id": 54, + "id": 112, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1364:14:0", + "scope": 129, + "src": "1364:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17695,10 +17709,10 @@ "typeString": "address" }, "typeName": { - "id": 53, + "id": 111, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1364:7:0", + "src": "1364:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17709,11 +17723,11 @@ }, { "constant": false, - "id": 56, + "id": 114, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1388:20:0", + "scope": 129, + "src": "1388:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17721,10 +17735,10 @@ "typeString": "address" }, "typeName": { - "id": 55, + "id": 113, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1388:7:0", + "src": "1388:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17735,11 +17749,11 @@ }, { "constant": false, - "id": 58, + "id": 116, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1460:17:0", + "scope": 129, + "src": "1460:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17747,10 +17761,10 @@ "typeString": "address" }, "typeName": { - "id": 57, + "id": 115, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1460:7:0", + "src": "1460:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17761,11 +17775,11 @@ }, { "constant": false, - "id": 62, + "id": 120, "name": "isOwner", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1487:32:0", + "scope": 129, + "src": "1487:32:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17773,28 +17787,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 61, + "id": 119, "keyType": { - "id": 59, + "id": 117, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1495:7:0", + "src": "1495:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1487:24:0", + "src": "1487:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 60, + "id": 118, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1506:4:0", + "src": "1506:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17806,11 +17820,11 @@ }, { "constant": false, - "id": 66, + "id": 124, "name": "voted", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1556:30:0", + "scope": 129, + "src": "1556:30:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17818,28 +17832,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 65, + "id": 123, "keyType": { - "id": 63, + "id": 121, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1564:7:0", + "src": "1564:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1556:24:0", + "src": "1556:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 64, + "id": 122, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1575:4:0", + "src": "1575:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17851,11 +17865,11 @@ }, { "constant": false, - "id": 70, + "id": 128, "name": "beneficiaries", "nodeType": "VariableDeclaration", - "scope": 71, - "src": "1629:38:0", + "scope": 129, + "src": "1629:38:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17863,28 +17877,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 69, + "id": 127, "keyType": { - "id": 67, + "id": 125, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1637:7:0", + "src": "1637:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1629:24:0", + "src": "1629:24:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 68, + "id": 126, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1648:4:0", + "src": "1648:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17897,50 +17911,50 @@ ], "name": "Transaction", "nodeType": "StructDefinition", - "scope": 1208, - "src": "1099:604:0", + "scope": 1266, + "src": "1099:604:1", "visibility": "public" }, { "constant": false, - "id": 75, + "id": 133, "name": "transactions", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1709:51:0", + "scope": 1266, + "src": "1709:51:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction)" }, "typeName": { - "id": 74, + "id": 132, "keyType": { - "id": 72, + "id": 130, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1717:7:0", + "src": "1717:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "1709:31:0", + "src": "1709:31:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction)" }, "valueType": { "contractScope": null, - "id": 73, + "id": 131, "name": "Transaction", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 71, - "src": "1728:11:0", + "referencedDeclaration": 129, + "src": "1728:11:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" } } @@ -17950,11 +17964,11 @@ }, { "constant": false, - "id": 78, + "id": 136, "name": "transactionCount", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1767:35:0", + "scope": 1266, + "src": "1767:35:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -17962,10 +17976,10 @@ "typeString": "uint256" }, "typeName": { - "id": 76, + "id": 134, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1767:7:0", + "src": "1767:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17974,14 +17988,14 @@ "value": { "argumentTypes": null, "hexValue": "30", - "id": 77, + "id": 135, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1801:1:0", + "src": "1801:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -17993,11 +18007,11 @@ }, { "constant": false, - "id": 83, + "id": 141, "name": "partyVsTransaction", "nodeType": "VariableDeclaration", - "scope": 1208, - "src": "1881:56:0", + "scope": 1266, + "src": "1881:56:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -18005,38 +18019,38 @@ "typeString": "mapping(address => bytes32[])" }, "typeName": { - "id": 82, + "id": 140, "keyType": { - "id": 79, + "id": 137, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1889:7:0", + "src": "1889:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1881:29:0", + "src": "1881:29:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[])" }, "valueType": { "baseType": { - "id": 80, + "id": 138, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1900:7:0", + "src": "1900:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 81, + "id": 139, "length": null, "nodeType": "ArrayTypeName", - "src": "1900:9:0", + "src": "1900:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -18048,9 +18062,9 @@ }, { "body": { - "id": 98, + "id": 156, "nodeType": "Block", - "src": "1991:124:0", + "src": "1991:124:1", "statements": [ { "expression": { @@ -18062,7 +18076,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 93, + "id": 151, "isConstant": false, "isLValue": false, "isPure": false, @@ -18073,26 +18087,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 88, + "id": 146, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2022:12:0", + "referencedDeclaration": 133, + "src": "2022:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 90, + "id": 148, "indexExpression": { "argumentTypes": null, - "id": 89, + "id": 147, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 85, - "src": "2035:10:0", + "referencedDeclaration": 143, + "src": "2035:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18103,21 +18117,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2022:24:0", + "src": "2022:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 91, + "id": 149, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "2022:30:0", + "referencedDeclaration": 98, + "src": "2022:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18128,14 +18142,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 92, + "id": 150, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2056:1:0", + "src": "2056:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18143,7 +18157,7 @@ }, "value": "0" }, - "src": "2022:35:0", + "src": "2022:35:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18152,14 +18166,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e20646f6573206e6f74206578697374", - "id": 94, + "id": 152, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2059:28:0", + "src": "2059:28:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_cb323e46bbcca91e157c2b50ad4ce2acbe1153338b838c84372d5723b8995ef0", @@ -18179,21 +18193,21 @@ "typeString": "literal_string \"Transaction does not exist\"" } ], - "id": 87, + "id": 145, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2001:7:0", + "referencedDeclaration": 5313, + "src": "2001:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 95, + "id": 153, "isConstant": false, "isLValue": false, "isPure": false, @@ -18201,38 +18215,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2001:96:0", + "src": "2001:96:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 96, + "id": 154, "nodeType": "ExpressionStatement", - "src": "2001:96:0" + "src": "2001:96:1" }, { - "id": 97, + "id": 155, "nodeType": "PlaceholderStatement", - "src": "2107:1:0" + "src": "2107:1:1" } ] }, "documentation": null, - "id": 99, + "id": 157, "name": "transactionExists", "nodeType": "ModifierDefinition", "parameters": { - "id": 86, + "id": 144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 85, + "id": 143, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 99, - "src": "1971:18:0", + "scope": 157, + "src": "1971:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18240,10 +18254,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 84, + "id": 142, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1971:7:0", + "src": "1971:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18253,16 +18267,16 @@ "visibility": "internal" } ], - "src": "1970:20:0" + "src": "1970:20:1" }, - "src": "1944:171:0", + "src": "1944:171:1", "visibility": "internal" }, { "body": { - "id": 114, + "id": 172, "nodeType": "Block", - "src": "2174:94:0", + "src": "2174:94:1", "statements": [ { "expression": { @@ -18274,7 +18288,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 109, + "id": 167, "isConstant": false, "isLValue": false, "isPure": false, @@ -18285,26 +18299,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 104, + "id": 162, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2192:12:0", + "referencedDeclaration": 133, + "src": "2192:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 106, + "id": 164, "indexExpression": { "argumentTypes": null, - "id": 105, + "id": 163, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 101, - "src": "2205:10:0", + "referencedDeclaration": 159, + "src": "2205:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18315,21 +18329,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2192:24:0", + "src": "2192:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 107, + "id": 165, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "2192:30:0", + "referencedDeclaration": 98, + "src": "2192:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18340,14 +18354,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 108, + "id": 166, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2226:1:0", + "src": "2226:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18355,7 +18369,7 @@ }, "value": "0" }, - "src": "2192:35:0", + "src": "2192:35:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18364,14 +18378,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e20657869737473", - "id": 110, + "id": 168, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2229:20:0", + "src": "2229:20:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_64ff8d63c933e41af18e90354a9e9e0a94a0877b0dd96b73b67df48f68d00e8a", @@ -18391,21 +18405,21 @@ "typeString": "literal_string \"Transaction exists\"" } ], - "id": 103, + "id": 161, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2184:7:0", + "referencedDeclaration": 5313, + "src": "2184:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 111, + "id": 169, "isConstant": false, "isLValue": false, "isPure": false, @@ -18413,38 +18427,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2184:66:0", + "src": "2184:66:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 112, + "id": 170, "nodeType": "ExpressionStatement", - "src": "2184:66:0" + "src": "2184:66:1" }, { - "id": 113, + "id": 171, "nodeType": "PlaceholderStatement", - "src": "2260:1:0" + "src": "2260:1:1" } ] }, "documentation": null, - "id": 115, + "id": 173, "name": "transactionDoesNotExist", "nodeType": "ModifierDefinition", "parameters": { - "id": 102, + "id": 160, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 101, + "id": 159, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 115, - "src": "2154:18:0", + "scope": 173, + "src": "2154:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18452,10 +18466,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 100, + "id": 158, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2154:7:0", + "src": "2154:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18465,16 +18479,16 @@ "visibility": "internal" } ], - "src": "2153:20:0" + "src": "2153:20:1" }, - "src": "2121:147:0", + "src": "2121:147:1", "visibility": "internal" }, { "body": { - "id": 131, + "id": 189, "nodeType": "Block", - "src": "2317:157:0", + "src": "2317:157:1", "statements": [ { "expression": { @@ -18483,10 +18497,10 @@ { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" }, - "id": 126, + "id": 184, "isConstant": false, "isLValue": false, "isPure": false, @@ -18497,26 +18511,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 120, + "id": 178, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2348:12:0", + "referencedDeclaration": 133, + "src": "2348:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 122, + "id": 180, "indexExpression": { "argumentTypes": null, - "id": 121, + "id": 179, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 117, - "src": "2361:10:0", + "referencedDeclaration": 175, + "src": "2361:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18527,23 +18541,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2348:24:0", + "src": "2348:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 123, + "id": 181, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "status", "nodeType": "MemberAccess", - "referencedDeclaration": 44, - "src": "2348:31:0", + "referencedDeclaration": 102, + "src": "2348:31:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -18553,18 +18567,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 124, + "id": 182, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "2383:6:0", + "referencedDeclaration": 67, + "src": "2383:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 125, + "id": 183, "isConstant": false, "isLValue": false, "isPure": true, @@ -18572,13 +18586,13 @@ "memberName": "FUNDED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2383:13:0", + "src": "2383:13:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "src": "2348:48:0", + "src": "2348:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18587,14 +18601,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e206973206e6f7420696e2046554e444544207374617465", - "id": 127, + "id": 185, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2410:36:0", + "src": "2410:36:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5244efce1630cfae7257c0817c921ae75135c1043344a4cf9a1988c03337f39d", @@ -18614,21 +18628,21 @@ "typeString": "literal_string \"Transaction is not in FUNDED state\"" } ], - "id": 119, + "id": 177, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2327:7:0", + "referencedDeclaration": 5313, + "src": "2327:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 128, + "id": 186, "isConstant": false, "isLValue": false, "isPure": false, @@ -18636,38 +18650,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2327:129:0", + "src": "2327:129:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 129, + "id": 187, "nodeType": "ExpressionStatement", - "src": "2327:129:0" + "src": "2327:129:1" }, { - "id": 130, + "id": 188, "nodeType": "PlaceholderStatement", - "src": "2466:1:0" + "src": "2466:1:1" } ] }, "documentation": null, - "id": 132, + "id": 190, "name": "inFundedState", "nodeType": "ModifierDefinition", "parameters": { - "id": 118, + "id": 176, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 117, + "id": 175, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 132, - "src": "2297:18:0", + "scope": 190, + "src": "2297:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18675,10 +18689,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 116, + "id": 174, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2297:7:0", + "src": "2297:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18688,16 +18702,16 @@ "visibility": "internal" } ], - "src": "2296:20:0" + "src": "2296:20:1" }, - "src": "2274:200:0", + "src": "2274:200:1", "visibility": "internal" }, { "body": { - "id": 146, + "id": 204, "nodeType": "Block", - "src": "2528:88:0", + "src": "2528:88:1", "statements": [ { "expression": { @@ -18709,19 +18723,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 141, + "id": 199, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 137, + "id": 195, "name": "addressToCheck", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 134, - "src": "2546:14:0", + "referencedDeclaration": 192, + "src": "2546:14:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18735,14 +18749,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 139, + "id": 197, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2572:1:0", + "src": "2572:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18758,20 +18772,20 @@ "typeString": "int_const 0" } ], - "id": 138, + "id": 196, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2564:7:0", + "src": "2564:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 140, + "id": 198, "isConstant": false, "isLValue": false, "isPure": true, @@ -18779,13 +18793,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2564:10:0", + "src": "2564:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2546:28:0", + "src": "2546:28:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18794,14 +18808,14 @@ { "argumentTypes": null, "hexValue": "5a65726f206164647265737320706173736564", - "id": 142, + "id": 200, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2576:21:0", + "src": "2576:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_93e85f37f73cf8e1b855512ab7e00aab2b791117712ecb476daeb6c2c0a27a67", @@ -18821,21 +18835,21 @@ "typeString": "literal_string \"Zero address passed\"" } ], - "id": 136, + "id": 194, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2538:7:0", + "referencedDeclaration": 5313, + "src": "2538:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 143, + "id": 201, "isConstant": false, "isLValue": false, "isPure": false, @@ -18843,38 +18857,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2538:60:0", + "src": "2538:60:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 144, + "id": 202, "nodeType": "ExpressionStatement", - "src": "2538:60:0" + "src": "2538:60:1" }, { - "id": 145, + "id": 203, "nodeType": "PlaceholderStatement", - "src": "2608:1:0" + "src": "2608:1:1" } ] }, "documentation": null, - "id": 147, + "id": 205, "name": "nonZeroAddress", "nodeType": "ModifierDefinition", "parameters": { - "id": 135, + "id": 193, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 134, + "id": 192, "name": "addressToCheck", "nodeType": "VariableDeclaration", - "scope": 147, - "src": "2504:22:0", + "scope": 205, + "src": "2504:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18882,10 +18896,10 @@ "typeString": "address" }, "typeName": { - "id": 133, + "id": 191, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2504:7:0", + "src": "2504:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18895,16 +18909,16 @@ "visibility": "internal" } ], - "src": "2503:24:0" + "src": "2503:24:1" }, - "src": "2480:136:0", + "src": "2480:136:1", "visibility": "internal" }, { "body": { - "id": 164, + "id": 222, "nodeType": "Block", - "src": "2731:165:0", + "src": "2731:165:1", "statements": [ { "expression": { @@ -18913,10 +18927,10 @@ { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 159, + "id": 217, "isConstant": false, "isLValue": false, "isPure": false, @@ -18927,26 +18941,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 154, + "id": 212, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2762:12:0", + "referencedDeclaration": 133, + "src": "2762:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 156, + "id": 214, "indexExpression": { "argumentTypes": null, - "id": 155, + "id": 213, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 149, - "src": "2775:10:0", + "referencedDeclaration": 207, + "src": "2775:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18957,23 +18971,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2762:24:0", + "src": "2762:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 157, + "id": 215, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "2762:40:0", + "referencedDeclaration": 104, + "src": "2762:40:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -18981,18 +18995,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 158, + "id": 216, "name": "transactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 151, - "src": "2806:15:0", + "referencedDeclaration": 209, + "src": "2806:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "2762:59:0", + "src": "2762:59:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19001,14 +19015,14 @@ { "argumentTypes": null, "hexValue": "5472616e73616374696f6e207479706520646f6573206e6f74206d61746368", - "id": 160, + "id": 218, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2835:33:0", + "src": "2835:33:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_c798eb33a8bd5d4c22212d5c8611219bb87da2d82aefe8e88b1f970a0f133cc3", @@ -19028,21 +19042,21 @@ "typeString": "literal_string \"Transaction type does not match\"" } ], - "id": 153, + "id": 211, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2741:7:0", + "referencedDeclaration": 5313, + "src": "2741:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 161, + "id": 219, "isConstant": false, "isLValue": false, "isPure": false, @@ -19050,38 +19064,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2741:137:0", + "src": "2741:137:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 162, + "id": 220, "nodeType": "ExpressionStatement", - "src": "2741:137:0" + "src": "2741:137:1" }, { - "id": 163, + "id": 221, "nodeType": "PlaceholderStatement", - "src": "2888:1:0" + "src": "2888:1:1" } ] }, "documentation": null, - "id": 165, + "id": 223, "name": "checkTransactionType", "nodeType": "ModifierDefinition", "parameters": { - "id": 152, + "id": 210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 149, + "id": 207, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 165, - "src": "2661:18:0", + "scope": 223, + "src": "2661:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19089,10 +19103,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 148, + "id": 206, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2661:7:0", + "src": "2661:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19103,26 +19117,26 @@ }, { "constant": false, - "id": 151, + "id": 209, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 165, - "src": "2689:31:0", + "scope": 223, + "src": "2689:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 150, + "id": 208, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "2689:15:0", + "referencedDeclaration": 70, + "src": "2689:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -19130,16 +19144,16 @@ "visibility": "internal" } ], - "src": "2651:75:0" + "src": "2651:75:1" }, - "src": "2622:274:0", + "src": "2622:274:1", "visibility": "internal" }, { "body": { - "id": 181, + "id": 239, "nodeType": "Block", - "src": "2941:164:0", + "src": "2941:164:1", "statements": [ { "expression": { @@ -19151,7 +19165,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 176, + "id": 234, "isConstant": false, "isLValue": false, "isPure": false, @@ -19160,18 +19174,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 170, + "id": 228, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "2972:3:0", + "referencedDeclaration": 5309, + "src": "2972:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 171, + "id": 229, "isConstant": false, "isLValue": false, "isPure": false, @@ -19179,7 +19193,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2972:10:0", + "src": "2972:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19193,26 +19207,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 172, + "id": 230, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "2986:12:0", + "referencedDeclaration": 133, + "src": "2986:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 174, + "id": 232, "indexExpression": { "argumentTypes": null, - "id": 173, + "id": 231, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 167, - "src": "2999:10:0", + "referencedDeclaration": 225, + "src": "2999:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19223,27 +19237,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2986:24:0", + "src": "2986:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 175, + "id": 233, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "buyer", "nodeType": "MemberAccess", - "referencedDeclaration": 52, - "src": "2986:30:0", + "referencedDeclaration": 110, + "src": "2986:30:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2972:44:0", + "src": "2972:44:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19252,14 +19266,14 @@ { "argumentTypes": null, "hexValue": "54686520696e69746961746f72206f6620746865207472616e73616374696f6e206973206e6f74206275796572", - "id": 177, + "id": 235, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3030:47:0", + "src": "3030:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_b4fc72d2373e6fc668b2bc10a6c84713d84de5f4dc58bb69053e1a18ae67c2f9", @@ -19279,21 +19293,21 @@ "typeString": "literal_string \"The initiator of the transaction is not buyer\"" } ], - "id": 169, + "id": 227, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2951:7:0", + "referencedDeclaration": 5313, + "src": "2951:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 178, + "id": 236, "isConstant": false, "isLValue": false, "isPure": false, @@ -19301,38 +19315,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2951:136:0", + "src": "2951:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 179, + "id": 237, "nodeType": "ExpressionStatement", - "src": "2951:136:0" + "src": "2951:136:1" }, { - "id": 180, + "id": 238, "nodeType": "PlaceholderStatement", - "src": "3097:1:0" + "src": "3097:1:1" } ] }, "documentation": null, - "id": 182, + "id": 240, "name": "onlyBuyer", "nodeType": "ModifierDefinition", "parameters": { - "id": 168, + "id": 226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 167, + "id": 225, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 182, - "src": "2921:18:0", + "scope": 240, + "src": "2921:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19340,10 +19354,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 166, + "id": 224, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2921:7:0", + "src": "2921:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19353,16 +19367,16 @@ "visibility": "internal" } ], - "src": "2920:20:0" + "src": "2920:20:1" }, - "src": "2902:203:0", + "src": "2902:203:1", "visibility": "internal" }, { "body": { - "id": 233, + "id": 291, "nodeType": "Block", - "src": "4270:339:0", + "src": "4270:339:1", "statements": [ { "expression": { @@ -19370,12 +19384,12 @@ "arguments": [ { "argumentTypes": null, - "id": 209, + "id": 267, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 184, - "src": "4309:5:0", + "referencedDeclaration": 242, + "src": "4309:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19383,12 +19397,12 @@ }, { "argumentTypes": null, - "id": 210, + "id": 268, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 186, - "src": "4328:6:0", + "referencedDeclaration": 244, + "src": "4328:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19396,12 +19410,12 @@ }, { "argumentTypes": null, - "id": 211, + "id": 269, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 188, - "src": "4348:9:0", + "referencedDeclaration": 246, + "src": "4348:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19409,12 +19423,12 @@ }, { "argumentTypes": null, - "id": 212, + "id": 270, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 190, - "src": "4371:9:0", + "referencedDeclaration": 248, + "src": "4371:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -19422,12 +19436,12 @@ }, { "argumentTypes": null, - "id": 213, + "id": 271, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 192, - "src": "4394:12:0", + "referencedDeclaration": 250, + "src": "4394:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -19435,12 +19449,12 @@ }, { "argumentTypes": null, - "id": 214, + "id": 272, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4420:10:0", + "referencedDeclaration": 252, + "src": "4420:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19450,18 +19464,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 215, + "id": 273, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4444:3:0", + "referencedDeclaration": 5309, + "src": "4444:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 216, + "id": 274, "isConstant": false, "isLValue": false, "isPure": false, @@ -19469,7 +19483,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4444:9:0", + "src": "4444:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19477,12 +19491,12 @@ }, { "argumentTypes": null, - "id": 217, + "id": 275, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 196, - "src": "4467:8:0", + "referencedDeclaration": 254, + "src": "4467:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -19492,18 +19506,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 218, + "id": 276, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "4489:15:0", + "referencedDeclaration": 70, + "src": "4489:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 219, + "id": 277, "isConstant": false, "isLValue": false, "isPure": true, @@ -19511,9 +19525,9 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4489:21:0", + "src": "4489:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -19523,14 +19537,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 221, + "id": 279, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4532:1:0", + "src": "4532:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -19546,20 +19560,20 @@ "typeString": "int_const 0" } ], - "id": 220, + "id": 278, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4524:7:0", + "src": "4524:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 222, + "id": 280, "isConstant": false, "isLValue": false, "isPure": true, @@ -19567,7 +19581,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4524:10:0", + "src": "4524:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19609,7 +19623,7 @@ "typeString": "bytes20" }, { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, { @@ -19617,18 +19631,18 @@ "typeString": "address" } ], - "id": 208, + "id": 266, "name": "_addTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1207, - "src": "4280:15:0", + "referencedDeclaration": 1265, + "src": "4280:15:1", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$12_$_t_address_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$70_$_t_address_$returns$__$", "typeString": "function (address,address,address,uint8,uint32,bytes32,uint256,bytes20,enum Escrow_v1_0.TransactionType,address)" } }, - "id": 223, + "id": 281, "isConstant": false, "isLValue": false, "isPure": false, @@ -19636,15 +19650,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4280:264:0", + "src": "4280:264:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 224, + "id": 282, "nodeType": "ExpressionStatement", - "src": "4280:264:0" + "src": "4280:264:1" }, { "eventCall": { @@ -19652,12 +19666,12 @@ "arguments": [ { "argumentTypes": null, - "id": 226, + "id": 284, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4567:10:0", + "referencedDeclaration": 252, + "src": "4567:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19667,18 +19681,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 227, + "id": 285, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4579:3:0", + "referencedDeclaration": 5309, + "src": "4579:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 228, + "id": 286, "isConstant": false, "isLValue": false, "isPure": false, @@ -19686,7 +19700,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4579:10:0", + "src": "4579:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19696,18 +19710,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 229, + "id": 287, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "4591:3:0", + "referencedDeclaration": 5309, + "src": "4591:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 230, + "id": 288, "isConstant": false, "isLValue": false, "isPure": false, @@ -19715,7 +19729,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4591:9:0", + "src": "4591:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19737,18 +19751,18 @@ "typeString": "uint256" } ], - "id": 225, + "id": 283, "name": "Funded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 38, - "src": "4560:6:0", + "referencedDeclaration": 96, + "src": "4560:6:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 231, + "id": 289, "isConstant": false, "isLValue": false, "isPure": false, @@ -19756,20 +19770,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4560:41:0", + "src": "4560:41:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 232, + "id": 290, "nodeType": "EmitStatement", - "src": "4555:46:0" + "src": "4555:46:1" } ] }, "documentation": "@dev Add new transaction in the contract\n@param buyer The buyer of the transaction\n@param seller The seller of the listing associated with the transaction\n@param moderator Moderator for this transaction\n@param threshold Minimum number of signatures required to released funds\n@param timeoutHours Hours after which seller can release funds into his\nfavour by signing transaction unilaterally\n@param scriptHash keccak256 hash of the redeem script\n@param uniqueId bytes20 unique id for the transaction, generated by\nETH wallet\nRedeem Script format will be following\n\n\nPass amount of the ETH to be put in escrow", - "id": 234, + "id": 292, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -19778,115 +19792,115 @@ "arguments": [ { "argumentTypes": null, - "id": 199, + "id": 257, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 194, - "src": "4193:10:0", + "referencedDeclaration": 252, + "src": "4193:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 200, + "id": 258, "modifierName": { "argumentTypes": null, - "id": 198, + "id": 256, "name": "transactionDoesNotExist", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 115, - "src": "4169:23:0", + "referencedDeclaration": 173, + "src": "4169:23:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "4169:35:0" + "src": "4169:35:1" }, { "arguments": [ { "argumentTypes": null, - "id": 202, + "id": 260, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 184, - "src": "4228:5:0", + "referencedDeclaration": 242, + "src": "4228:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 203, + "id": 261, "modifierName": { "argumentTypes": null, - "id": 201, + "id": 259, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "4213:14:0", + "referencedDeclaration": 205, + "src": "4213:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "4213:21:0" + "src": "4213:21:1" }, { "arguments": [ { "argumentTypes": null, - "id": 205, + "id": 263, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 186, - "src": "4258:6:0", + "referencedDeclaration": 244, + "src": "4258:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 206, + "id": 264, "modifierName": { "argumentTypes": null, - "id": 204, + "id": 262, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "4243:14:0", + "referencedDeclaration": 205, + "src": "4243:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "4243:22:0" + "src": "4243:22:1" } ], "name": "addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 197, + "id": 255, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 184, + "id": 242, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3949:13:0", + "scope": 292, + "src": "3949:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19894,10 +19908,10 @@ "typeString": "address" }, "typeName": { - "id": 183, + "id": 241, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3949:7:0", + "src": "3949:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19908,11 +19922,11 @@ }, { "constant": false, - "id": 186, + "id": 244, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3972:14:0", + "scope": 292, + "src": "3972:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19920,10 +19934,10 @@ "typeString": "address" }, "typeName": { - "id": 185, + "id": 243, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3972:7:0", + "src": "3972:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19934,11 +19948,11 @@ }, { "constant": false, - "id": 188, + "id": 246, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "3996:17:0", + "scope": 292, + "src": "3996:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19946,10 +19960,10 @@ "typeString": "address" }, "typeName": { - "id": 187, + "id": 245, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3996:7:0", + "src": "3996:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19960,11 +19974,11 @@ }, { "constant": false, - "id": 190, + "id": 248, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4023:15:0", + "scope": 292, + "src": "4023:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19972,10 +19986,10 @@ "typeString": "uint8" }, "typeName": { - "id": 189, + "id": 247, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "4023:5:0", + "src": "4023:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -19986,11 +20000,11 @@ }, { "constant": false, - "id": 192, + "id": 250, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4048:19:0", + "scope": 292, + "src": "4048:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19998,10 +20012,10 @@ "typeString": "uint32" }, "typeName": { - "id": 191, + "id": 249, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "4048:6:0", + "src": "4048:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -20012,11 +20026,11 @@ }, { "constant": false, - "id": 194, + "id": 252, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4077:18:0", + "scope": 292, + "src": "4077:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20024,10 +20038,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 193, + "id": 251, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4077:7:0", + "src": "4077:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20038,11 +20052,11 @@ }, { "constant": false, - "id": 196, + "id": 254, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 234, - "src": "4105:16:0", + "scope": 292, + "src": "4105:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20050,10 +20064,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 195, + "id": 253, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "4105:7:0", + "src": "4105:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -20063,26 +20077,26 @@ "visibility": "internal" } ], - "src": "3939:188:0" + "src": "3939:188:1" }, "payable": true, "returnParameters": { - "id": 207, + "id": 265, "nodeType": "ParameterList", "parameters": [], - "src": "4270:0:0" + "src": "4270:0:1" }, - "scope": 1208, - "src": "3916:693:0", + "scope": 1266, + "src": "3916:693:1", "stateMutability": "payable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 307, + "id": 365, "nodeType": "Block", - "src": "6010:597:0", + "src": "6010:597:1", "statements": [ { "expression": { @@ -20090,12 +20104,12 @@ "arguments": [ { "argumentTypes": null, - "id": 268, + "id": 326, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 236, - "src": "6050:5:0", + "referencedDeclaration": 294, + "src": "6050:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20103,12 +20117,12 @@ }, { "argumentTypes": null, - "id": 269, + "id": 327, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 238, - "src": "6069:6:0", + "referencedDeclaration": 296, + "src": "6069:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20116,12 +20130,12 @@ }, { "argumentTypes": null, - "id": 270, + "id": 328, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 240, - "src": "6089:9:0", + "referencedDeclaration": 298, + "src": "6089:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20129,12 +20143,12 @@ }, { "argumentTypes": null, - "id": 271, + "id": 329, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 242, - "src": "6112:9:0", + "referencedDeclaration": 300, + "src": "6112:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -20142,12 +20156,12 @@ }, { "argumentTypes": null, - "id": 272, + "id": 330, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 244, - "src": "6135:12:0", + "referencedDeclaration": 302, + "src": "6135:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -20155,12 +20169,12 @@ }, { "argumentTypes": null, - "id": 273, + "id": 331, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "6161:10:0", + "referencedDeclaration": 304, + "src": "6161:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20168,12 +20182,12 @@ }, { "argumentTypes": null, - "id": 274, + "id": 332, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6185:5:0", + "referencedDeclaration": 306, + "src": "6185:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20181,12 +20195,12 @@ }, { "argumentTypes": null, - "id": 275, + "id": 333, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 250, - "src": "6204:8:0", + "referencedDeclaration": 308, + "src": "6204:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -20196,18 +20210,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 276, + "id": 334, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "6226:15:0", + "referencedDeclaration": 70, + "src": "6226:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 277, + "id": 335, "isConstant": false, "isLValue": false, "isPure": true, @@ -20215,20 +20229,20 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6226:21:0", + "src": "6226:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, { "argumentTypes": null, - "id": 278, + "id": 336, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "6261:12:0", + "referencedDeclaration": 310, + "src": "6261:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20270,7 +20284,7 @@ "typeString": "bytes20" }, { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, { @@ -20278,18 +20292,18 @@ "typeString": "address" } ], - "id": 267, + "id": 325, "name": "_addTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1207, - "src": "6021:15:0", + "referencedDeclaration": 1265, + "src": "6021:15:1", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$12_$_t_address_$returns$__$", + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint8_$_t_uint32_$_t_bytes32_$_t_uint256_$_t_bytes20_$_t_enum$_TransactionType_$70_$_t_address_$returns$__$", "typeString": "function (address,address,address,uint8,uint32,bytes32,uint256,bytes20,enum Escrow_v1_0.TransactionType,address)" } }, - "id": 279, + "id": 337, "isConstant": false, "isLValue": false, "isPure": false, @@ -20297,43 +20311,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6021:262:0", + "src": "6021:262:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 280, + "id": 338, "nodeType": "ExpressionStatement", - "src": "6021:262:0" + "src": "6021:262:1" }, { "assignments": [ - 282 + 340 ], "declarations": [ { "constant": false, - "id": 282, + "id": 340, "name": "token", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "6294:20:0", + "scope": 366, + "src": "6294:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 281, + "id": 339, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "6294:14:0", + "referencedDeclaration": 4445, + "src": "6294:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -20341,18 +20355,18 @@ "visibility": "internal" } ], - "id": 286, + "id": 344, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 284, + "id": 342, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "6332:12:0", + "referencedDeclaration": 310, + "src": "6332:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20366,18 +20380,18 @@ "typeString": "address" } ], - "id": 283, + "id": 341, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "6317:14:0", + "referencedDeclaration": 4445, + "src": "6317:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 285, + "id": 343, "isConstant": false, "isLValue": false, "isPure": false, @@ -20385,14 +20399,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6317:28:0", + "src": "6317:28:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "6294:51:0" + "src": "6294:51:1" }, { "expression": { @@ -20405,18 +20419,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 290, + "id": 348, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "6396:3:0", + "referencedDeclaration": 5309, + "src": "6396:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 291, + "id": 349, "isConstant": false, "isLValue": false, "isPure": false, @@ -20424,7 +20438,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6396:10:0", + "src": "6396:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20435,14 +20449,14 @@ "arguments": [ { "argumentTypes": null, - "id": 293, + "id": 351, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "6416:4:0", + "referencedDeclaration": 5328, + "src": "6416:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -20450,24 +20464,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 292, + "id": 350, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6408:7:0", + "src": "6408:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 294, + "id": 352, "isConstant": false, "isLValue": false, "isPure": false, @@ -20475,7 +20489,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6408:13:0", + "src": "6408:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20483,12 +20497,12 @@ }, { "argumentTypes": null, - "id": 295, + "id": 353, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6423:5:0", + "referencedDeclaration": 306, + "src": "6423:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20512,32 +20526,32 @@ ], "expression": { "argumentTypes": null, - "id": 288, + "id": 346, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 282, - "src": "6377:5:0", + "referencedDeclaration": 340, + "src": "6377:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 289, + "id": 347, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 2255, - "src": "6377:18:0", + "referencedDeclaration": 4423, + "src": "6377:18:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 296, + "id": 354, "isConstant": false, "isLValue": false, "isPure": false, @@ -20545,7 +20559,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6377:52:0", + "src": "6377:52:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -20554,14 +20568,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642c206d6179626520796f7520646964206e6f7420617070726f766520657363726f7720636f6e747261637420746f207370656e64206f6e20626568616c66206f662073656e646572", - "id": 297, + "id": 355, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "6443:95:0", + "src": "6443:95:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_d81b627ac67759234197a5bdf4d9f7d33298e824ce7bd47e08ce9919cd96c696", @@ -20581,21 +20595,21 @@ "typeString": "literal_string \"Token transfer failed, maybe you did not approve escrow contract to spend on behalf of sender\"" } ], - "id": 287, + "id": 345, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "6356:7:0", + "referencedDeclaration": 5313, + "src": "6356:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 298, + "id": 356, "isConstant": false, "isLValue": false, "isPure": false, @@ -20603,15 +20617,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6356:192:0", + "src": "6356:192:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 299, + "id": 357, "nodeType": "ExpressionStatement", - "src": "6356:192:0" + "src": "6356:192:1" }, { "eventCall": { @@ -20619,12 +20633,12 @@ "arguments": [ { "argumentTypes": null, - "id": 301, + "id": 359, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "6570:10:0", + "referencedDeclaration": 304, + "src": "6570:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20634,18 +20648,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 302, + "id": 360, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "6582:3:0", + "referencedDeclaration": 5309, + "src": "6582:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 303, + "id": 361, "isConstant": false, "isLValue": false, "isPure": false, @@ -20653,7 +20667,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6582:10:0", + "src": "6582:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20661,12 +20675,12 @@ }, { "argumentTypes": null, - "id": 304, + "id": 362, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 248, - "src": "6594:5:0", + "referencedDeclaration": 306, + "src": "6594:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20688,18 +20702,18 @@ "typeString": "uint256" } ], - "id": 300, + "id": 358, "name": "Funded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 38, - "src": "6563:6:0", + "referencedDeclaration": 96, + "src": "6563:6:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 305, + "id": 363, "isConstant": false, "isLValue": false, "isPure": false, @@ -20707,20 +20721,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6563:37:0", + "src": "6563:37:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 306, + "id": 364, "nodeType": "EmitStatement", - "src": "6558:42:0" + "src": "6558:42:1" } ] }, "documentation": "@dev Add new transaction in the contract\n@param buyer The buyer of the transaction\n@param seller The seller of the listing associated with the transaction\n@param moderator Moderator for this transaction\n@param threshold Minimum number of signatures required to released funds\n@param timeoutHours Hours after which seller can release funds into his\nfavour by signing transaction unilaterally\n@param scriptHash keccak256 hash of the redeem script\n@param value Amount of tokens to be put in escrow\n@param uniqueId bytes20 unique id for the transaction, generated by\nETH wallet\n@param tokenAddress Address of the token to be used\nRedeem Script format will be following:\n\n\nApprove escrow contract to spend amount of token on sender's behalf", - "id": 308, + "id": 366, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -20729,148 +20743,148 @@ "arguments": [ { "argumentTypes": null, - "id": 255, + "id": 313, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 246, - "src": "5896:10:0", + "referencedDeclaration": 304, + "src": "5896:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 256, + "id": 314, "modifierName": { "argumentTypes": null, - "id": 254, + "id": 312, "name": "transactionDoesNotExist", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 115, - "src": "5872:23:0", + "referencedDeclaration": 173, + "src": "5872:23:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "5872:35:0" + "src": "5872:35:1" }, { "arguments": [ { "argumentTypes": null, - "id": 258, + "id": 316, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 236, - "src": "5931:5:0", + "referencedDeclaration": 294, + "src": "5931:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 259, + "id": 317, "modifierName": { "argumentTypes": null, - "id": 257, + "id": 315, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5916:14:0", + "referencedDeclaration": 205, + "src": "5916:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5916:21:0" + "src": "5916:21:1" }, { "arguments": [ { "argumentTypes": null, - "id": 261, + "id": 319, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 238, - "src": "5961:6:0", + "referencedDeclaration": 296, + "src": "5961:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 262, + "id": 320, "modifierName": { "argumentTypes": null, - "id": 260, + "id": 318, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5946:14:0", + "referencedDeclaration": 205, + "src": "5946:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5946:22:0" + "src": "5946:22:1" }, { "arguments": [ { "argumentTypes": null, - "id": 264, + "id": 322, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 252, - "src": "5992:12:0", + "referencedDeclaration": 310, + "src": "5992:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 265, + "id": 323, "modifierName": { "argumentTypes": null, - "id": 263, + "id": 321, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 147, - "src": "5977:14:0", + "referencedDeclaration": 205, + "src": "5977:14:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "5977:28:0" + "src": "5977:28:1" } ], "name": "addTokenTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 253, + "id": 311, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 236, + "id": 294, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5615:13:0", + "scope": 366, + "src": "5615:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20878,10 +20892,10 @@ "typeString": "address" }, "typeName": { - "id": 235, + "id": 293, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5615:7:0", + "src": "5615:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20892,11 +20906,11 @@ }, { "constant": false, - "id": 238, + "id": 296, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5638:14:0", + "scope": 366, + "src": "5638:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20904,10 +20918,10 @@ "typeString": "address" }, "typeName": { - "id": 237, + "id": 295, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5638:7:0", + "src": "5638:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20918,11 +20932,11 @@ }, { "constant": false, - "id": 240, + "id": 298, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5662:17:0", + "scope": 366, + "src": "5662:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20930,10 +20944,10 @@ "typeString": "address" }, "typeName": { - "id": 239, + "id": 297, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5662:7:0", + "src": "5662:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20944,11 +20958,11 @@ }, { "constant": false, - "id": 242, + "id": 300, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5689:15:0", + "scope": 366, + "src": "5689:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20956,10 +20970,10 @@ "typeString": "uint8" }, "typeName": { - "id": 241, + "id": 299, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "5689:5:0", + "src": "5689:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -20970,11 +20984,11 @@ }, { "constant": false, - "id": 244, + "id": 302, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5714:19:0", + "scope": 366, + "src": "5714:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20982,10 +20996,10 @@ "typeString": "uint32" }, "typeName": { - "id": 243, + "id": 301, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "5714:6:0", + "src": "5714:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -20996,11 +21010,11 @@ }, { "constant": false, - "id": 246, + "id": 304, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5743:18:0", + "scope": 366, + "src": "5743:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21008,10 +21022,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 245, + "id": 303, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "5743:7:0", + "src": "5743:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21022,11 +21036,11 @@ }, { "constant": false, - "id": 248, + "id": 306, "name": "value", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5771:13:0", + "scope": 366, + "src": "5771:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21034,10 +21048,10 @@ "typeString": "uint256" }, "typeName": { - "id": 247, + "id": 305, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5771:7:0", + "src": "5771:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21048,11 +21062,11 @@ }, { "constant": false, - "id": 250, + "id": 308, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5794:16:0", + "scope": 366, + "src": "5794:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21060,10 +21074,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 249, + "id": 307, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "5794:7:0", + "src": "5794:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -21074,11 +21088,11 @@ }, { "constant": false, - "id": 252, + "id": 310, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 308, - "src": "5820:20:0", + "scope": 366, + "src": "5820:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21086,10 +21100,10 @@ "typeString": "address" }, "typeName": { - "id": 251, + "id": 309, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5820:7:0", + "src": "5820:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21099,26 +21113,26 @@ "visibility": "internal" } ], - "src": "5605:241:0" + "src": "5605:241:1" }, "payable": false, "returnParameters": { - "id": 266, + "id": 324, "nodeType": "ParameterList", "parameters": [], - "src": "6010:0:0" + "src": "6010:0:1" }, - "scope": 1208, - "src": "5577:1030:0", + "scope": 1266, + "src": "5577:1030:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 324, + "id": 382, "nodeType": "Block", - "src": "7000:75:0", + "src": "7000:75:1", "statements": [ { "expression": { @@ -21129,26 +21143,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 317, + "id": 375, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "7017:12:0", + "referencedDeclaration": 133, + "src": "7017:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 319, + "id": 377, "indexExpression": { "argumentTypes": null, - "id": 318, + "id": 376, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 310, - "src": "7030:10:0", + "referencedDeclaration": 368, + "src": "7030:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21159,35 +21173,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7017:24:0", + "src": "7017:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 320, + "id": 378, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "7017:38:0", + "referencedDeclaration": 128, + "src": "7017:38:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 322, + "id": 380, "indexExpression": { "argumentTypes": null, - "id": 321, + "id": 379, "name": "beneficiary", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 312, - "src": "7056:11:0", + "referencedDeclaration": 370, + "src": "7056:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21198,21 +21212,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7017:51:0", + "src": "7017:51:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 316, - "id": 323, + "functionReturnParameters": 374, + "id": 381, "nodeType": "Return", - "src": "7010:58:0" + "src": "7010:58:1" } ] }, "documentation": "@dev This method will check whether given address was a beneficiary of\ntransaction execution or not\n@param scriptHash script hash of the transaction\n@param beneficiary Beneficiary address to be checked", - "id": 325, + "id": 383, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -21220,16 +21234,16 @@ "name": "checkBeneficiary", "nodeType": "FunctionDefinition", "parameters": { - "id": 313, + "id": 371, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 310, + "id": 368, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6889:18:0", + "scope": 383, + "src": "6889:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21237,10 +21251,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 309, + "id": 367, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "6889:7:0", + "src": "6889:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21251,11 +21265,11 @@ }, { "constant": false, - "id": 312, + "id": 370, "name": "beneficiary", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6917:19:0", + "scope": 383, + "src": "6917:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21263,10 +21277,10 @@ "typeString": "address" }, "typeName": { - "id": 311, + "id": 369, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6917:7:0", + "src": "6917:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21276,20 +21290,20 @@ "visibility": "internal" } ], - "src": "6879:63:0" + "src": "6879:63:1" }, "payable": false, "returnParameters": { - "id": 316, + "id": 374, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 315, + "id": 373, "name": "", "nodeType": "VariableDeclaration", - "scope": 325, - "src": "6990:4:0", + "scope": 383, + "src": "6990:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21297,10 +21311,10 @@ "typeString": "bool" }, "typeName": { - "id": 314, + "id": 372, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "6990:4:0", + "src": "6990:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21310,19 +21324,19 @@ "visibility": "internal" } ], - "src": "6989:6:0" + "src": "6989:6:1" }, - "scope": 1208, - "src": "6854:221:0", + "scope": 1266, + "src": "6854:221:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 341, + "id": 399, "nodeType": "Block", - "src": "7448:61:0", + "src": "7448:61:1", "statements": [ { "expression": { @@ -21333,26 +21347,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 334, + "id": 392, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "7465:12:0", + "referencedDeclaration": 133, + "src": "7465:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 336, + "id": 394, "indexExpression": { "argumentTypes": null, - "id": 335, + "id": 393, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 327, - "src": "7478:10:0", + "referencedDeclaration": 385, + "src": "7478:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21363,35 +21377,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7465:24:0", + "src": "7465:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 337, + "id": 395, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "7465:30:0", + "referencedDeclaration": 124, + "src": "7465:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 339, + "id": 397, "indexExpression": { "argumentTypes": null, - "id": 338, + "id": 396, "name": "party", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 329, - "src": "7496:5:0", + "referencedDeclaration": 387, + "src": "7496:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21402,21 +21416,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7465:37:0", + "src": "7465:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 333, - "id": 340, + "functionReturnParameters": 391, + "id": 398, "nodeType": "Return", - "src": "7458:44:0" + "src": "7458:44:1" } ] }, "documentation": "@dev This method will check whether given party has voted or not\n@param scriptHash script hash of the transaction\n@param party Address of the party whose vote has to be checked\n@return bool vote", - "id": 342, + "id": 400, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -21424,16 +21438,16 @@ "name": "checkVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 330, + "id": 388, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 327, + "id": 385, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7343:18:0", + "scope": 400, + "src": "7343:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21441,10 +21455,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 326, + "id": 384, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7343:7:0", + "src": "7343:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21455,11 +21469,11 @@ }, { "constant": false, - "id": 329, + "id": 387, "name": "party", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7371:13:0", + "scope": 400, + "src": "7371:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21467,10 +21481,10 @@ "typeString": "address" }, "typeName": { - "id": 328, + "id": 386, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7371:7:0", + "src": "7371:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21480,20 +21494,20 @@ "visibility": "internal" } ], - "src": "7333:57:0" + "src": "7333:57:1" }, "payable": false, "returnParameters": { - "id": 333, + "id": 391, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 332, + "id": 390, "name": "", "nodeType": "VariableDeclaration", - "scope": 342, - "src": "7438:4:0", + "scope": 400, + "src": "7438:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21501,10 +21515,10 @@ "typeString": "bool" }, "typeName": { - "id": 331, + "id": 389, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "7438:4:0", + "src": "7438:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21514,19 +21528,19 @@ "visibility": "internal" } ], - "src": "7437:6:0" + "src": "7437:6:1" }, - "scope": 1208, - "src": "7315:194:0", + "scope": 1266, + "src": "7315:194:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 391, + "id": 449, "nodeType": "Block", - "src": "8116:238:0", + "src": "8116:238:1", "statements": [ { "expression": { @@ -21538,7 +21552,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 365, + "id": 423, "isConstant": false, "isLValue": false, "isPure": false, @@ -21547,18 +21561,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 362, + "id": 420, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8135:3:0", + "referencedDeclaration": 5309, + "src": "8135:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 363, + "id": 421, "isConstant": false, "isLValue": false, "isPure": false, @@ -21566,7 +21580,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8135:9:0", + "src": "8135:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21577,14 +21591,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 364, + "id": 422, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8147:1:0", + "src": "8147:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -21592,7 +21606,7 @@ }, "value": "0" }, - "src": "8135:13:0", + "src": "8135:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21601,14 +21615,14 @@ { "argumentTypes": null, "hexValue": "56616c7565206d7573742062652067726561746572207468616e207a65726f2e", - "id": 366, + "id": 424, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8150:34:0", + "src": "8150:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_21fbec2be6560b9ccffc4980d43c0d147770168e7aaf24999b418b9010085622", @@ -21628,21 +21642,21 @@ "typeString": "literal_string \"Value must be greater than zero.\"" } ], - "id": 361, + "id": 419, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8127:7:0", + "referencedDeclaration": 5313, + "src": "8127:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 367, + "id": 425, "isConstant": false, "isLValue": false, "isPure": false, @@ -21650,20 +21664,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8127:58:0", + "src": "8127:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 368, + "id": 426, "nodeType": "ExpressionStatement", - "src": "8127:58:0" + "src": "8127:58:1" }, { "expression": { "argumentTypes": null, - "id": 381, + "id": 439, "isConstant": false, "isLValue": false, "isPure": false, @@ -21674,26 +21688,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 369, + "id": 427, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "8196:12:0", + "referencedDeclaration": 133, + "src": "8196:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 371, + "id": 429, "indexExpression": { "argumentTypes": null, - "id": 370, + "id": 428, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8209:10:0", + "referencedDeclaration": 402, + "src": "8209:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21704,21 +21718,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8196:24:0", + "src": "8196:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 372, + "id": 430, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "8196:30:0", + "referencedDeclaration": 98, + "src": "8196:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21733,18 +21747,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 378, + "id": 436, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8277:3:0", + "referencedDeclaration": 5309, + "src": "8277:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 379, + "id": 437, "isConstant": false, "isLValue": false, "isPure": false, @@ -21752,7 +21766,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8277:9:0", + "src": "8277:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21772,26 +21786,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 373, + "id": 431, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "8229:12:0", + "referencedDeclaration": 133, + "src": "8229:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 375, + "id": 433, "indexExpression": { "argumentTypes": null, - "id": 374, + "id": 432, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8242:10:0", + "referencedDeclaration": 402, + "src": "8242:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21802,41 +21816,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8229:24:0", + "src": "8229:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 376, + "id": 434, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "8229:30:0", + "referencedDeclaration": 98, + "src": "8229:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 377, + "id": 435, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "8229:47:0", + "referencedDeclaration": 4601, + "src": "8229:47:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 380, + "id": 438, "isConstant": false, "isLValue": false, "isPure": false, @@ -21844,21 +21858,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8229:58:0", + "src": "8229:58:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8196:91:0", + "src": "8196:91:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 382, + "id": 440, "nodeType": "ExpressionStatement", - "src": "8196:91:0" + "src": "8196:91:1" }, { "eventCall": { @@ -21866,12 +21880,12 @@ "arguments": [ { "argumentTypes": null, - "id": 384, + "id": 442, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8313:10:0", + "referencedDeclaration": 402, + "src": "8313:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21881,18 +21895,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 385, + "id": 443, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8325:3:0", + "referencedDeclaration": 5309, + "src": "8325:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 386, + "id": 444, "isConstant": false, "isLValue": false, "isPure": false, @@ -21900,7 +21914,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8325:10:0", + "src": "8325:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21910,18 +21924,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 387, + "id": 445, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "8337:3:0", + "referencedDeclaration": 5309, + "src": "8337:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 388, + "id": 446, "isConstant": false, "isLValue": false, "isPure": false, @@ -21929,7 +21943,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8337:9:0", + "src": "8337:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21951,18 +21965,18 @@ "typeString": "uint256" } ], - "id": 383, + "id": 441, "name": "FundAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 30, - "src": "8303:9:0", + "referencedDeclaration": 88, + "src": "8303:9:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 389, + "id": 447, "isConstant": false, "isLValue": false, "isPure": false, @@ -21970,20 +21984,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8303:44:0", + "src": "8303:44:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 390, + "id": 448, "nodeType": "EmitStatement", - "src": "8298:49:0" + "src": "8298:49:1" } ] }, "documentation": "@dev Allows buyer of the transaction to add more funds(ether) in the\ntransaction.\nThis will help to cater scenarios wherein initially buyer missed to\nfund transaction as required\n@param scriptHash script hash of the transaction\nOnly buyer of the transaction can invoke this method", - "id": 392, + "id": 450, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -21992,78 +22006,78 @@ "arguments": [ { "argumentTypes": null, - "id": 347, + "id": 405, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "7971:10:0", + "referencedDeclaration": 402, + "src": "7971:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 348, + "id": 406, "modifierName": { "argumentTypes": null, - "id": 346, + "id": 404, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "7953:17:0", + "referencedDeclaration": 157, + "src": "7953:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "7953:29:0" + "src": "7953:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 350, + "id": 408, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8005:10:0", + "referencedDeclaration": 402, + "src": "8005:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 351, + "id": 409, "modifierName": { "argumentTypes": null, - "id": 349, + "id": 407, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "7991:13:0", + "referencedDeclaration": 190, + "src": "7991:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "7991:25:0" + "src": "7991:25:1" }, { "arguments": [ { "argumentTypes": null, - "id": 353, + "id": 411, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8046:10:0", + "referencedDeclaration": 402, + "src": "8046:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22073,18 +22087,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 354, + "id": 412, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "8058:15:0", + "referencedDeclaration": 70, + "src": "8058:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 355, + "id": 413, "isConstant": false, "isLValue": false, "isPure": true, @@ -22092,77 +22106,77 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8058:21:0", + "src": "8058:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } } ], - "id": 356, + "id": 414, "modifierName": { "argumentTypes": null, - "id": 352, + "id": 410, "name": "checkTransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 165, - "src": "8025:20:0", + "referencedDeclaration": 223, + "src": "8025:20:1", "typeDescriptions": { - "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$70_$", "typeString": "modifier (bytes32,enum Escrow_v1_0.TransactionType)" } }, "nodeType": "ModifierInvocation", - "src": "8025:55:0" + "src": "8025:55:1" }, { "arguments": [ { "argumentTypes": null, - "id": 358, + "id": 416, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 344, - "src": "8099:10:0", + "referencedDeclaration": 402, + "src": "8099:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 359, + "id": 417, "modifierName": { "argumentTypes": null, - "id": 357, + "id": 415, "name": "onlyBuyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 182, - "src": "8089:9:0", + "referencedDeclaration": 240, + "src": "8089:9:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8089:21:0" + "src": "8089:21:1" } ], "name": "addFundsToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 345, + "id": 403, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 344, + "id": 402, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 392, - "src": "7887:18:0", + "scope": 450, + "src": "7887:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22170,10 +22184,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 343, + "id": 401, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "7887:7:0", + "src": "7887:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22183,26 +22197,26 @@ "visibility": "internal" } ], - "src": "7877:34:0" + "src": "7877:34:1" }, "payable": true, "returnParameters": { - "id": 360, + "id": 418, "nodeType": "ParameterList", "parameters": [], - "src": "8116:0:0" + "src": "8116:0:1" }, - "scope": 1208, - "src": "7847:507:0", + "scope": 1266, + "src": "7847:507:1", "stateMutability": "payable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 462, + "id": 520, "nodeType": "Block", - "src": "8969:545:0", + "src": "8969:545:1", "statements": [ { "expression": { @@ -22214,19 +22228,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 416, + "id": 474, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 414, + "id": 472, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "8988:5:0", + "referencedDeclaration": 454, + "src": "8988:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22237,14 +22251,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 415, + "id": 473, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "8996:1:0", + "src": "8996:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -22252,7 +22266,7 @@ }, "value": "0" }, - "src": "8988:9:0", + "src": "8988:9:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22261,14 +22275,14 @@ { "argumentTypes": null, "hexValue": "56616c7565206d7573742062652067726561746572207468616e207a65726f2e", - "id": 417, + "id": 475, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8999:34:0", + "src": "8999:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_21fbec2be6560b9ccffc4980d43c0d147770168e7aaf24999b418b9010085622", @@ -22288,21 +22302,21 @@ "typeString": "literal_string \"Value must be greater than zero.\"" } ], - "id": 413, + "id": 471, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8980:7:0", + "referencedDeclaration": 5313, + "src": "8980:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 418, + "id": 476, "isConstant": false, "isLValue": false, "isPure": false, @@ -22310,43 +22324,43 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8980:54:0", + "src": "8980:54:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 419, + "id": 477, "nodeType": "ExpressionStatement", - "src": "8980:54:0" + "src": "8980:54:1" }, { "assignments": [ - 421 + 479 ], "declarations": [ { "constant": false, - "id": 421, + "id": 479, "name": "token", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "9045:20:0", + "scope": 521, + "src": "9045:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 420, + "id": 478, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "9045:14:0", + "referencedDeclaration": 4445, + "src": "9045:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -22354,7 +22368,7 @@ "visibility": "internal" } ], - "id": 428, + "id": 486, "initialValue": { "argumentTypes": null, "arguments": [ @@ -22364,26 +22378,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 423, + "id": 481, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9096:12:0", + "referencedDeclaration": 133, + "src": "9096:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 425, + "id": 483, "indexExpression": { "argumentTypes": null, - "id": 424, + "id": 482, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9109:10:0", + "referencedDeclaration": 452, + "src": "9109:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22394,21 +22408,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9096:24:0", + "src": "9096:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 426, + "id": 484, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 56, - "src": "9096:37:0", + "referencedDeclaration": 114, + "src": "9096:37:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22422,18 +22436,18 @@ "typeString": "address" } ], - "id": 422, + "id": 480, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "9068:14:0", + "referencedDeclaration": 4445, + "src": "9068:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 427, + "id": 485, "isConstant": false, "isLValue": false, "isPure": false, @@ -22441,14 +22455,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9068:75:0", + "src": "9068:75:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "9045:98:0" + "src": "9045:98:1" }, { "expression": { @@ -22461,18 +22475,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 432, + "id": 490, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "9194:3:0", + "referencedDeclaration": 5309, + "src": "9194:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 433, + "id": 491, "isConstant": false, "isLValue": false, "isPure": false, @@ -22480,7 +22494,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9194:10:0", + "src": "9194:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22491,14 +22505,14 @@ "arguments": [ { "argumentTypes": null, - "id": 435, + "id": 493, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "9214:4:0", + "referencedDeclaration": 5328, + "src": "9214:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -22506,24 +22520,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 434, + "id": 492, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "9206:7:0", + "src": "9206:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 436, + "id": 494, "isConstant": false, "isLValue": false, "isPure": false, @@ -22531,7 +22545,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9206:13:0", + "src": "9206:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22539,12 +22553,12 @@ }, { "argumentTypes": null, - "id": 437, + "id": 495, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9221:5:0", + "referencedDeclaration": 454, + "src": "9221:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22568,32 +22582,32 @@ ], "expression": { "argumentTypes": null, - "id": 430, + "id": 488, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 421, - "src": "9175:5:0", + "referencedDeclaration": 479, + "src": "9175:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 431, + "id": 489, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transferFrom", "nodeType": "MemberAccess", - "referencedDeclaration": 2255, - "src": "9175:18:0", + "referencedDeclaration": 4423, + "src": "9175:18:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 438, + "id": 496, "isConstant": false, "isLValue": false, "isPure": false, @@ -22601,7 +22615,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9175:52:0", + "src": "9175:52:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22610,14 +22624,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642c206d6179626520796f7520646964206e6f7420617070726f76652074686520657363726f7720636f6e747261637420746f207370656e64206f6e20626568616c66206f6620746865206275796572", - "id": 439, + "id": 497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "9241:102:0", + "src": "9241:102:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e06258a5dc7e9fc23adefd6ac4d92ff40460664d63b6f526bbacd7feb017989e", @@ -22637,21 +22651,21 @@ "typeString": "literal_string \"Token transfer failed, maybe you did not approve the escrow contract to spend on behalf of the buyer\"" } ], - "id": 429, + "id": 487, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "9154:7:0", + "referencedDeclaration": 5313, + "src": "9154:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 440, + "id": 498, "isConstant": false, "isLValue": false, "isPure": false, @@ -22659,20 +22673,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9154:199:0", + "src": "9154:199:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 441, + "id": 499, "nodeType": "ExpressionStatement", - "src": "9154:199:0" + "src": "9154:199:1" }, { "expression": { "argumentTypes": null, - "id": 453, + "id": 511, "isConstant": false, "isLValue": false, "isPure": false, @@ -22683,26 +22697,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 442, + "id": 500, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9364:12:0", + "referencedDeclaration": 133, + "src": "9364:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 444, + "id": 502, "indexExpression": { "argumentTypes": null, - "id": 443, + "id": 501, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9377:10:0", + "referencedDeclaration": 452, + "src": "9377:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22713,21 +22727,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9364:24:0", + "src": "9364:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 445, + "id": 503, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "9364:30:0", + "referencedDeclaration": 98, + "src": "9364:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22740,12 +22754,12 @@ "arguments": [ { "argumentTypes": null, - "id": 451, + "id": 509, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9445:5:0", + "referencedDeclaration": 454, + "src": "9445:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22765,26 +22779,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 446, + "id": 504, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "9397:12:0", + "referencedDeclaration": 133, + "src": "9397:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 448, + "id": 506, "indexExpression": { "argumentTypes": null, - "id": 447, + "id": 505, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9410:10:0", + "referencedDeclaration": 452, + "src": "9410:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22795,41 +22809,41 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9397:24:0", + "src": "9397:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 449, + "id": 507, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "9397:30:0", + "referencedDeclaration": 98, + "src": "9397:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 450, + "id": 508, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "9397:47:0", + "referencedDeclaration": 4601, + "src": "9397:47:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 452, + "id": 510, "isConstant": false, "isLValue": false, "isPure": false, @@ -22837,21 +22851,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9397:54:0", + "src": "9397:54:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9364:87:0", + "src": "9364:87:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 454, + "id": 512, "nodeType": "ExpressionStatement", - "src": "9364:87:0" + "src": "9364:87:1" }, { "eventCall": { @@ -22859,12 +22873,12 @@ "arguments": [ { "argumentTypes": null, - "id": 456, + "id": 514, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "9477:10:0", + "referencedDeclaration": 452, + "src": "9477:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22874,18 +22888,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 457, + "id": 515, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2529, - "src": "9489:3:0", + "referencedDeclaration": 5309, + "src": "9489:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 458, + "id": 516, "isConstant": false, "isLValue": false, "isPure": false, @@ -22893,7 +22907,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9489:10:0", + "src": "9489:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22901,12 +22915,12 @@ }, { "argumentTypes": null, - "id": 459, + "id": 517, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "9501:5:0", + "referencedDeclaration": 454, + "src": "9501:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22928,18 +22942,18 @@ "typeString": "uint256" } ], - "id": 455, + "id": 513, "name": "FundAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 30, - "src": "9467:9:0", + "referencedDeclaration": 88, + "src": "9467:9:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,uint256)" } }, - "id": 460, + "id": 518, "isConstant": false, "isLValue": false, "isPure": false, @@ -22947,20 +22961,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9467:40:0", + "src": "9467:40:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 461, + "id": 519, "nodeType": "EmitStatement", - "src": "9462:45:0" + "src": "9462:45:1" } ] }, "documentation": "@dev Allows buyer of the transaction to add more funds(Tokens) in the\ntransaction.\nThis will help to cater scenarios wherein initially buyer missed to\nfund transaction as required\n@param scriptHash script hash of the transaction\nOnly buyer of the transaction can invoke this method", - "id": 463, + "id": 521, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -22969,78 +22983,78 @@ "arguments": [ { "argumentTypes": null, - "id": 399, + "id": 457, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8825:10:0", + "referencedDeclaration": 452, + "src": "8825:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 400, + "id": 458, "modifierName": { "argumentTypes": null, - "id": 398, + "id": 456, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "8807:17:0", + "referencedDeclaration": 157, + "src": "8807:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8807:29:0" + "src": "8807:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 402, + "id": 460, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8859:10:0", + "referencedDeclaration": 452, + "src": "8859:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 403, + "id": 461, "modifierName": { "argumentTypes": null, - "id": 401, + "id": 459, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "8845:13:0", + "referencedDeclaration": 190, + "src": "8845:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8845:25:0" + "src": "8845:25:1" }, { "arguments": [ { "argumentTypes": null, - "id": 405, + "id": 463, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8900:10:0", + "referencedDeclaration": 452, + "src": "8900:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23050,18 +23064,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 406, + "id": 464, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "8912:15:0", + "referencedDeclaration": 70, + "src": "8912:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 407, + "id": 465, "isConstant": false, "isLValue": false, "isPure": true, @@ -23069,77 +23083,77 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8912:21:0", + "src": "8912:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } } ], - "id": 408, + "id": 466, "modifierName": { "argumentTypes": null, - "id": 404, + "id": 462, "name": "checkTransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 165, - "src": "8879:20:0", + "referencedDeclaration": 223, + "src": "8879:20:1", "typeDescriptions": { - "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_modifier$_t_bytes32_$_t_enum$_TransactionType_$70_$", "typeString": "modifier (bytes32,enum Escrow_v1_0.TransactionType)" } }, "nodeType": "ModifierInvocation", - "src": "8879:55:0" + "src": "8879:55:1" }, { "arguments": [ { "argumentTypes": null, - "id": 410, + "id": 468, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "8953:10:0", + "referencedDeclaration": 452, + "src": "8953:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 411, + "id": 469, "modifierName": { "argumentTypes": null, - "id": 409, + "id": 467, "name": "onlyBuyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 182, - "src": "8943:9:0", + "referencedDeclaration": 240, + "src": "8943:9:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "8943:21:0" + "src": "8943:21:1" } ], "name": "addTokensToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 397, + "id": 455, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 394, + "id": 452, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "8734:18:0", + "scope": 521, + "src": "8734:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23147,10 +23161,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 393, + "id": 451, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "8734:7:0", + "src": "8734:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23161,11 +23175,11 @@ }, { "constant": false, - "id": 396, + "id": 454, "name": "value", "nodeType": "VariableDeclaration", - "scope": 463, - "src": "8762:13:0", + "scope": 521, + "src": "8762:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23173,10 +23187,10 @@ "typeString": "uint256" }, "typeName": { - "id": 395, + "id": 453, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8762:7:0", + "src": "8762:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23186,52 +23200,52 @@ "visibility": "internal" } ], - "src": "8724:57:0" + "src": "8724:57:1" }, "payable": false, "returnParameters": { - "id": 412, + "id": 470, "nodeType": "ParameterList", "parameters": [], - "src": "8969:0:0" + "src": "8969:0:1" }, - "scope": 1208, - "src": "8693:821:0", + "scope": 1266, + "src": "8693:821:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 475, + "id": 533, "nodeType": "Block", - "src": "9765:56:0", + "src": "9765:56:1", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 471, + "id": 529, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "9782:18:0", + "referencedDeclaration": 141, + "src": "9782:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 473, + "id": 531, "indexExpression": { "argumentTypes": null, - "id": 472, + "id": 530, "name": "partyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 465, - "src": "9801:12:0", + "referencedDeclaration": 523, + "src": "9801:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23242,21 +23256,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "9782:32:0", + "src": "9782:32:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "functionReturnParameters": 470, - "id": 474, + "functionReturnParameters": 528, + "id": 532, "nodeType": "Return", - "src": "9775:39:0" + "src": "9775:39:1" } ] }, "documentation": "dev Returns all transaction ids for a party\nparam partyAddress Address of the party", - "id": 476, + "id": 534, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -23264,16 +23278,16 @@ "name": "getAllTransactionsForParty", "nodeType": "FunctionDefinition", "parameters": { - "id": 466, + "id": 524, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 465, + "id": 523, "name": "partyAddress", "nodeType": "VariableDeclaration", - "scope": 476, - "src": "9676:20:0", + "scope": 534, + "src": "9676:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23281,10 +23295,10 @@ "typeString": "address" }, "typeName": { - "id": 464, + "id": 522, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9676:7:0", + "src": "9676:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23294,20 +23308,20 @@ "visibility": "internal" } ], - "src": "9666:36:0" + "src": "9666:36:1" }, "payable": false, "returnParameters": { - "id": 470, + "id": 528, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 469, + "id": 527, "name": "", "nodeType": "VariableDeclaration", - "scope": 476, - "src": "9750:9:0", + "scope": 534, + "src": "9750:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23316,19 +23330,19 @@ }, "typeName": { "baseType": { - "id": 467, + "id": 525, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "9750:7:0", + "src": "9750:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 468, + "id": 526, "length": null, "nodeType": "ArrayTypeName", - "src": "9750:9:0", + "src": "9750:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -23338,19 +23352,19 @@ "visibility": "internal" } ], - "src": "9749:11:0" + "src": "9749:11:1" }, - "scope": 1208, - "src": "9631:190:0", + "scope": 1266, + "src": "9631:190:1", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 564, + "id": 622, "nodeType": "Block", - "src": "10698:916:0", + "src": "10698:916:1", "statements": [ { "expression": { @@ -23362,7 +23376,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 506, + "id": 564, "isConstant": false, "isLValue": false, "isPure": false, @@ -23371,18 +23385,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 503, + "id": 561, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "10730:12:0", + "referencedDeclaration": 548, + "src": "10730:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 504, + "id": 562, "isConstant": false, "isLValue": false, "isPure": false, @@ -23390,7 +23404,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10730:19:0", + "src": "10730:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23401,14 +23415,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 505, + "id": 563, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10752:1:0", + "src": "10752:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -23416,7 +23430,7 @@ }, "value": "0" }, - "src": "10730:23:0", + "src": "10730:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23425,14 +23439,14 @@ { "argumentTypes": null, "hexValue": "4e756d626572206f662064657374696e6174696f6e73206d7573742062652067726561746572207468616e2030", - "id": 507, + "id": 565, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "10767:47:0", + "src": "10767:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fbeb58246a6e3ff255a1d618f14d1cced67ffd4784fbc3e1cfbdf71d1f7fbdf9", @@ -23452,21 +23466,21 @@ "typeString": "literal_string \"Number of destinations must be greater than 0\"" } ], - "id": 502, + "id": 560, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "10709:7:0", + "referencedDeclaration": 5313, + "src": "10709:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 508, + "id": 566, "isConstant": false, "isLValue": false, "isPure": false, @@ -23474,15 +23488,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10709:115:0", + "src": "10709:115:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 509, + "id": 567, "nodeType": "ExpressionStatement", - "src": "10709:115:0" + "src": "10709:115:1" }, { "expression": { @@ -23494,7 +23508,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 515, + "id": 573, "isConstant": false, "isLValue": false, "isPure": false, @@ -23503,18 +23517,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 511, + "id": 569, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "10855:12:0", + "referencedDeclaration": 548, + "src": "10855:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 512, + "id": 570, "isConstant": false, "isLValue": false, "isPure": false, @@ -23522,7 +23536,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10855:19:0", + "src": "10855:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23534,18 +23548,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 513, + "id": 571, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "10878:7:0", + "referencedDeclaration": 551, + "src": "10878:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" } }, - "id": 514, + "id": 572, "isConstant": false, "isLValue": false, "isPure": false, @@ -23553,13 +23567,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "10878:14:0", + "src": "10878:14:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "10855:37:0", + "src": "10855:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -23568,14 +23582,14 @@ { "argumentTypes": null, "hexValue": "4e756d626572206f662064657374696e6174696f6e73206d757374206d61746368206e756d626572206f662076616c7565732073656e74", - "id": 516, + "id": 574, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "10906:57:0", + "src": "10906:57:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e70a315a5939ff57e3400503291dbc0af19d18c32f15c80c7c6f5b7c54a6cd3c", @@ -23595,21 +23609,21 @@ "typeString": "literal_string \"Number of destinations must match number of values sent\"" } ], - "id": 510, + "id": 568, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "10834:7:0", + "referencedDeclaration": 5313, + "src": "10834:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 517, + "id": 575, "isConstant": false, "isLValue": false, "isPure": false, @@ -23617,15 +23631,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10834:139:0", + "src": "10834:139:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 518, + "id": 576, "nodeType": "ExpressionStatement", - "src": "10834:139:0" + "src": "10834:139:1" }, { "expression": { @@ -23633,12 +23647,12 @@ "arguments": [ { "argumentTypes": null, - "id": 520, + "id": 578, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 479, - "src": "11016:4:0", + "referencedDeclaration": 537, + "src": "11016:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_calldata_ptr", "typeString": "uint8[] calldata" @@ -23646,12 +23660,12 @@ }, { "argumentTypes": null, - "id": 521, + "id": 579, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 482, - "src": "11034:4:0", + "referencedDeclaration": 540, + "src": "11034:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" @@ -23659,12 +23673,12 @@ }, { "argumentTypes": null, - "id": 522, + "id": 580, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 485, - "src": "11052:4:0", + "referencedDeclaration": 543, + "src": "11052:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" @@ -23672,12 +23686,12 @@ }, { "argumentTypes": null, - "id": 523, + "id": 581, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11070:10:0", + "referencedDeclaration": 545, + "src": "11070:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23685,12 +23699,12 @@ }, { "argumentTypes": null, - "id": 524, + "id": 582, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11094:12:0", + "referencedDeclaration": 548, + "src": "11094:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -23698,12 +23712,12 @@ }, { "argumentTypes": null, - "id": 525, + "id": 583, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11120:7:0", + "referencedDeclaration": 551, + "src": "11120:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -23737,18 +23751,18 @@ "typeString": "uint256[] calldata" } ], - "id": 519, + "id": 577, "name": "_verifyTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 700, - "src": "10984:18:0", + "referencedDeclaration": 758, + "src": "10984:18:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory)" } }, - "id": 526, + "id": 584, "isConstant": false, "isLValue": false, "isPure": false, @@ -23756,20 +23770,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10984:153:0", + "src": "10984:153:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 527, + "id": 585, "nodeType": "ExpressionStatement", - "src": "10984:153:0" + "src": "10984:153:1" }, { "expression": { "argumentTypes": null, - "id": 534, + "id": 592, "isConstant": false, "isLValue": false, "isPure": false, @@ -23780,26 +23794,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 528, + "id": 586, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11148:12:0", + "referencedDeclaration": 133, + "src": "11148:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 530, + "id": 588, "indexExpression": { "argumentTypes": null, - "id": 529, + "id": 587, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11161:10:0", + "referencedDeclaration": 545, + "src": "11161:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23810,23 +23824,23 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11148:24:0", + "src": "11148:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 531, + "id": 589, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "status", "nodeType": "MemberAccess", - "referencedDeclaration": 44, - "src": "11148:31:0", + "referencedDeclaration": 102, + "src": "11148:31:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -23836,18 +23850,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 532, + "id": 590, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "11182:6:0", + "referencedDeclaration": 67, + "src": "11182:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 533, + "id": 591, "isConstant": false, "isLValue": false, "isPure": true, @@ -23855,26 +23869,26 @@ "memberName": "RELEASED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11182:15:0", + "src": "11182:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "src": "11148:49:0", + "src": "11148:49:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, - "id": 535, + "id": 593, "nodeType": "ExpressionStatement", - "src": "11148:49:0" + "src": "11148:49:1" }, { "expression": { "argumentTypes": null, - "id": 542, + "id": 600, "isConstant": false, "isLValue": false, "isPure": false, @@ -23885,26 +23899,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 536, + "id": 594, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11281:12:0", + "referencedDeclaration": 133, + "src": "11281:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 538, + "id": 596, "indexExpression": { "argumentTypes": null, - "id": 537, + "id": 595, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11294:10:0", + "referencedDeclaration": 545, + "src": "11294:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -23915,21 +23929,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11281:24:0", + "src": "11281:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 539, + "id": 597, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": true, "memberName": "lastModified", "nodeType": "MemberAccess", - "referencedDeclaration": 42, - "src": "11281:37:0", + "referencedDeclaration": 100, + "src": "11281:37:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23941,18 +23955,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 540, + "id": 598, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "11321:5:0", + "referencedDeclaration": 5299, + "src": "11321:5:1", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 541, + "id": 599, "isConstant": false, "isLValue": false, "isPure": false, @@ -23960,21 +23974,21 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11321:15:0", + "src": "11321:15:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11281:55:0", + "src": "11281:55:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 543, + "id": 601, "nodeType": "ExpressionStatement", - "src": "11281:55:0" + "src": "11281:55:1" }, { "expression": { @@ -23986,7 +24000,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 554, + "id": 612, "isConstant": false, "isLValue": false, "isPure": false, @@ -23996,12 +24010,12 @@ "arguments": [ { "argumentTypes": null, - "id": 546, + "id": 604, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11382:10:0", + "referencedDeclaration": 545, + "src": "11382:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -24009,12 +24023,12 @@ }, { "argumentTypes": null, - "id": 547, + "id": 605, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11394:12:0", + "referencedDeclaration": 548, + "src": "11394:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -24022,12 +24036,12 @@ }, { "argumentTypes": null, - "id": 548, + "id": 606, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11408:7:0", + "referencedDeclaration": 551, + "src": "11408:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -24049,18 +24063,18 @@ "typeString": "uint256[] calldata" } ], - "id": 545, + "id": 603, "name": "_transferFunds", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 893, - "src": "11367:14:0", + "referencedDeclaration": 951, + "src": "11367:14:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$_t_uint256_$", "typeString": "function (bytes32,address[] memory,uint256[] memory) returns (uint256)" } }, - "id": 549, + "id": 607, "isConstant": false, "isLValue": false, "isPure": false, @@ -24068,7 +24082,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11367:49:0", + "src": "11367:49:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -24082,26 +24096,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 550, + "id": 608, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "11420:12:0", + "referencedDeclaration": 133, + "src": "11420:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 552, + "id": 610, "indexExpression": { "argumentTypes": null, - "id": 551, + "id": 609, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11433:10:0", + "referencedDeclaration": 545, + "src": "11433:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -24112,27 +24126,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11420:24:0", + "src": "11420:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 553, + "id": 611, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "value", "nodeType": "MemberAccess", - "referencedDeclaration": 40, - "src": "11420:30:0", + "referencedDeclaration": 98, + "src": "11420:30:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11367:83:0", + "src": "11367:83:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -24141,14 +24155,14 @@ { "argumentTypes": null, "hexValue": "546f74616c2076616c756520746f2062652072656c6561736564206d75737420626520657175616c20746f20746865207472616e73616374696f6e20657363726f772076616c7565", - "id": 555, + "id": 613, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "11464:74:0", + "src": "11464:74:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9e0bdb14e2e0d5e118fd1f547268c6a1fdb5e8facacd614066d4b60bc2c9941d", @@ -24168,21 +24182,21 @@ "typeString": "literal_string \"Total value to be released must be equal to the transaction escrow value\"" } ], - "id": 544, + "id": 602, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "11346:7:0", + "referencedDeclaration": 5313, + "src": "11346:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 556, + "id": 614, "isConstant": false, "isLValue": false, "isPure": false, @@ -24190,15 +24204,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11346:202:0", + "src": "11346:202:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 557, + "id": 615, "nodeType": "ExpressionStatement", - "src": "11346:202:0" + "src": "11346:202:1" }, { "eventCall": { @@ -24206,12 +24220,12 @@ "arguments": [ { "argumentTypes": null, - "id": 559, + "id": 617, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "11573:10:0", + "referencedDeclaration": 545, + "src": "11573:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -24219,12 +24233,12 @@ }, { "argumentTypes": null, - "id": 560, + "id": 618, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 490, - "src": "11585:12:0", + "referencedDeclaration": 548, + "src": "11585:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -24232,12 +24246,12 @@ }, { "argumentTypes": null, - "id": 561, + "id": 619, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 493, - "src": "11599:7:0", + "referencedDeclaration": 551, + "src": "11599:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_calldata_ptr", "typeString": "uint256[] calldata" @@ -24259,18 +24273,18 @@ "typeString": "uint256[] calldata" } ], - "id": 558, + "id": 616, "name": "Executed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 22, - "src": "11564:8:0", + "referencedDeclaration": 80, + "src": "11564:8:1", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (bytes32,address[] memory,uint256[] memory)" } }, - "id": 562, + "id": 620, "isConstant": false, "isLValue": false, "isPure": false, @@ -24278,20 +24292,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11564:43:0", + "src": "11564:43:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 563, + "id": 621, "nodeType": "EmitStatement", - "src": "11559:48:0" + "src": "11559:48:1" } ] }, "documentation": "dev This method will be used to release funds associated with\nthe transaction\nPlease see specs https://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md\nparam sigV Array containing V component of all the signatures\nparam sigR Array containing R component of all the signatures\nparam signS Array containing S component of all the signatures\nparam scriptHash script hash of the transaction\nparam destinations List of addresses who will receive funds\nparam amounts amount released to each destination", - "id": 565, + "id": 623, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -24300,82 +24314,82 @@ "arguments": [ { "argumentTypes": null, - "id": 496, + "id": 554, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "10648:10:0", + "referencedDeclaration": 545, + "src": "10648:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 497, + "id": 555, "modifierName": { "argumentTypes": null, - "id": 495, + "id": 553, "name": "transactionExists", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 99, - "src": "10630:17:0", + "referencedDeclaration": 157, + "src": "10630:17:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "10630:29:0" + "src": "10630:29:1" }, { "arguments": [ { "argumentTypes": null, - "id": 499, + "id": 557, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 487, - "src": "10682:10:0", + "referencedDeclaration": 545, + "src": "10682:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } } ], - "id": 500, + "id": 558, "modifierName": { "argumentTypes": null, - "id": 498, + "id": 556, "name": "inFundedState", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 132, - "src": "10668:13:0", + "referencedDeclaration": 190, + "src": "10668:13:1", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_bytes32_$", "typeString": "modifier (bytes32)" } }, "nodeType": "ModifierInvocation", - "src": "10668:25:0" + "src": "10668:25:1" } ], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 494, + "id": 552, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 479, + "id": 537, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10451:12:0", + "scope": 623, + "src": "10451:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24384,19 +24398,19 @@ }, "typeName": { "baseType": { - "id": 477, + "id": 535, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "10451:5:0", + "src": "10451:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 478, + "id": 536, "length": null, "nodeType": "ArrayTypeName", - "src": "10451:7:0", + "src": "10451:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -24407,11 +24421,11 @@ }, { "constant": false, - "id": 482, + "id": 540, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10473:14:0", + "scope": 623, + "src": "10473:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24420,19 +24434,19 @@ }, "typeName": { "baseType": { - "id": 480, + "id": 538, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10473:7:0", + "src": "10473:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 481, + "id": 539, "length": null, "nodeType": "ArrayTypeName", - "src": "10473:9:0", + "src": "10473:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -24443,11 +24457,11 @@ }, { "constant": false, - "id": 485, + "id": 543, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10497:14:0", + "scope": 623, + "src": "10497:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24456,19 +24470,19 @@ }, "typeName": { "baseType": { - "id": 483, + "id": 541, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10497:7:0", + "src": "10497:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 484, + "id": 542, "length": null, "nodeType": "ArrayTypeName", - "src": "10497:9:0", + "src": "10497:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -24479,11 +24493,11 @@ }, { "constant": false, - "id": 487, + "id": 545, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10521:18:0", + "scope": 623, + "src": "10521:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24491,10 +24505,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 486, + "id": 544, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10521:7:0", + "src": "10521:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -24505,11 +24519,11 @@ }, { "constant": false, - "id": 490, + "id": 548, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10549:22:0", + "scope": 623, + "src": "10549:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24518,19 +24532,19 @@ }, "typeName": { "baseType": { - "id": 488, + "id": 546, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10549:7:0", + "src": "10549:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 489, + "id": 547, "length": null, "nodeType": "ArrayTypeName", - "src": "10549:9:0", + "src": "10549:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -24541,11 +24555,11 @@ }, { "constant": false, - "id": 493, + "id": 551, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 565, - "src": "10581:17:0", + "scope": 623, + "src": "10581:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -24554,19 +24568,19 @@ }, "typeName": { "baseType": { - "id": 491, + "id": 549, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "10581:7:0", + "src": "10581:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 492, + "id": 550, "length": null, "nodeType": "ArrayTypeName", - "src": "10581:9:0", + "src": "10581:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -24576,26 +24590,26 @@ "visibility": "internal" } ], - "src": "10441:163:0" + "src": "10441:163:1" }, "payable": false, "returnParameters": { - "id": 501, + "id": 559, "nodeType": "ParameterList", "parameters": [], - "src": "10698:0:0" + "src": "10698:0:1" }, - "scope": 1208, - "src": "10425:1189:0", + "scope": 1266, + "src": "10425:1189:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 623, + "id": 681, "nodeType": "Block", - "src": "12442:734:0", + "src": "12442:734:1", "statements": [ { "condition": { @@ -24604,19 +24618,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 588, + "id": 646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 584, + "id": 642, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 579, - "src": "12456:12:0", + "referencedDeclaration": 637, + "src": "12456:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24630,14 +24644,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 586, + "id": 644, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12480:1:0", + "src": "12480:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -24653,20 +24667,20 @@ "typeString": "int_const 0" } ], - "id": 585, + "id": 643, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "12472:7:0", + "src": "12472:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 587, + "id": 645, "isConstant": false, "isLValue": false, "isPure": true, @@ -24674,22 +24688,22 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12472:10:0", + "src": "12472:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "12456:26:0", + "src": "12456:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 621, + "id": 679, "nodeType": "Block", - "src": "12813:357:0", + "src": "12813:357:1", "statements": [ { "expression": { @@ -24700,12 +24714,12 @@ "arguments": [ { "argumentTypes": null, - "id": 608, + "id": 666, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 567, - "src": "12899:8:0", + "referencedDeclaration": 625, + "src": "12899:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -24713,12 +24727,12 @@ }, { "argumentTypes": null, - "id": 609, + "id": 667, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 569, - "src": "12929:9:0", + "referencedDeclaration": 627, + "src": "12929:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -24726,12 +24740,12 @@ }, { "argumentTypes": null, - "id": 610, + "id": 668, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 571, - "src": "12960:12:0", + "referencedDeclaration": 629, + "src": "12960:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -24739,12 +24753,12 @@ }, { "argumentTypes": null, - "id": 611, + "id": 669, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 573, - "src": "12994:5:0", + "referencedDeclaration": 631, + "src": "12994:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24752,12 +24766,12 @@ }, { "argumentTypes": null, - "id": 612, + "id": 670, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 575, - "src": "13021:6:0", + "referencedDeclaration": 633, + "src": "13021:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24765,12 +24779,12 @@ }, { "argumentTypes": null, - "id": 613, + "id": 671, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 577, - "src": "13049:9:0", + "referencedDeclaration": 635, + "src": "13049:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24781,14 +24795,14 @@ "arguments": [ { "argumentTypes": null, - "id": 615, + "id": 673, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "13088:4:0", + "referencedDeclaration": 5328, + "src": "13088:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -24796,24 +24810,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 614, + "id": 672, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "13080:7:0", + "src": "13080:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 616, + "id": 674, "isConstant": false, "isLValue": false, "isPure": false, @@ -24821,7 +24835,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13080:13:0", + "src": "13080:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24829,12 +24843,12 @@ }, { "argumentTypes": null, - "id": 617, + "id": 675, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 579, - "src": "13115:12:0", + "referencedDeclaration": 637, + "src": "13115:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -24878,18 +24892,18 @@ ], "expression": { "argumentTypes": null, - "id": 606, + "id": 664, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "12861:3:0", + "referencedDeclaration": 5296, + "src": "12861:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 607, + "id": 665, "isConstant": false, "isLValue": false, "isPure": true, @@ -24897,13 +24911,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12861:16:0", + "src": "12861:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 618, + "id": 676, "isConstant": false, "isLValue": false, "isPure": false, @@ -24911,7 +24925,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12861:284:0", + "src": "12861:284:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -24925,18 +24939,18 @@ "typeString": "bytes memory" } ], - "id": 605, + "id": 663, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "12834:9:0", + "referencedDeclaration": 5303, + "src": "12834:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 619, + "id": 677, "isConstant": false, "isLValue": false, "isPure": false, @@ -24944,26 +24958,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12834:325:0", + "src": "12834:325:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 583, - "id": 620, + "functionReturnParameters": 641, + "id": 678, "nodeType": "Return", - "src": "12827:332:0" + "src": "12827:332:1" } ] }, - "id": 622, + "id": 680, "nodeType": "IfStatement", - "src": "12452:718:0", + "src": "12452:718:1", "trueBody": { - "id": 604, + "id": 662, "nodeType": "Block", - "src": "12484:323:0", + "src": "12484:323:1", "statements": [ { "expression": { @@ -24974,12 +24988,12 @@ "arguments": [ { "argumentTypes": null, - "id": 592, + "id": 650, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 567, - "src": "12570:8:0", + "referencedDeclaration": 625, + "src": "12570:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -24987,12 +25001,12 @@ }, { "argumentTypes": null, - "id": 593, + "id": 651, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 569, - "src": "12600:9:0", + "referencedDeclaration": 627, + "src": "12600:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -25000,12 +25014,12 @@ }, { "argumentTypes": null, - "id": 594, + "id": 652, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 571, - "src": "12631:12:0", + "referencedDeclaration": 629, + "src": "12631:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -25013,12 +25027,12 @@ }, { "argumentTypes": null, - "id": 595, + "id": 653, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 573, - "src": "12665:5:0", + "referencedDeclaration": 631, + "src": "12665:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25026,12 +25040,12 @@ }, { "argumentTypes": null, - "id": 596, + "id": 654, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 575, - "src": "12692:6:0", + "referencedDeclaration": 633, + "src": "12692:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25039,12 +25053,12 @@ }, { "argumentTypes": null, - "id": 597, + "id": 655, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 577, - "src": "12720:9:0", + "referencedDeclaration": 635, + "src": "12720:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25055,14 +25069,14 @@ "arguments": [ { "argumentTypes": null, - "id": 599, + "id": 657, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "12759:4:0", + "referencedDeclaration": 5328, + "src": "12759:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -25070,24 +25084,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 598, + "id": 656, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "12751:7:0", + "src": "12751:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 600, + "id": 658, "isConstant": false, "isLValue": false, "isPure": false, @@ -25095,7 +25109,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12751:13:0", + "src": "12751:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25135,18 +25149,18 @@ ], "expression": { "argumentTypes": null, - "id": 590, + "id": 648, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "12532:3:0", + "referencedDeclaration": 5296, + "src": "12532:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 591, + "id": 649, "isConstant": false, "isLValue": false, "isPure": true, @@ -25154,13 +25168,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "12532:16:0", + "src": "12532:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 601, + "id": 659, "isConstant": false, "isLValue": false, "isPure": false, @@ -25168,7 +25182,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12532:250:0", + "src": "12532:250:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -25182,18 +25196,18 @@ "typeString": "bytes memory" } ], - "id": 589, + "id": 647, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "12505:9:0", + "referencedDeclaration": 5303, + "src": "12505:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 602, + "id": 660, "isConstant": false, "isLValue": false, "isPure": false, @@ -25201,16 +25215,16 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12505:291:0", + "src": "12505:291:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "functionReturnParameters": 583, - "id": 603, + "functionReturnParameters": 641, + "id": 661, "nodeType": "Return", - "src": "12498:298:0" + "src": "12498:298:1" } ] } @@ -25218,7 +25232,7 @@ ] }, "documentation": "dev Method for calculating script hash. Calculation will depend upon\nthe type of transaction\nETHER Type transaction-:\nScript Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\nmoderator, multiSigContractAddress)\nTOKEN Type transaction\nScript Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller,\nmoderator, multiSigContractAddress, tokenAddress)\nClient can use this method to verify whether it has calculated correct\nscript hash or not", - "id": 624, + "id": 682, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -25226,16 +25240,16 @@ "name": "calculateRedeemScriptHash", "nodeType": "FunctionDefinition", "parameters": { - "id": 580, + "id": 638, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 567, + "id": 625, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12203:16:0", + "scope": 682, + "src": "12203:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25243,10 +25257,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 566, + "id": 624, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "12203:7:0", + "src": "12203:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -25257,11 +25271,11 @@ }, { "constant": false, - "id": 569, + "id": 627, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12229:15:0", + "scope": 682, + "src": "12229:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25269,10 +25283,10 @@ "typeString": "uint8" }, "typeName": { - "id": 568, + "id": 626, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "12229:5:0", + "src": "12229:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -25283,11 +25297,11 @@ }, { "constant": false, - "id": 571, + "id": 629, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12254:19:0", + "scope": 682, + "src": "12254:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25295,10 +25309,10 @@ "typeString": "uint32" }, "typeName": { - "id": 570, + "id": 628, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "12254:6:0", + "src": "12254:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -25309,11 +25323,11 @@ }, { "constant": false, - "id": 573, + "id": 631, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12283:13:0", + "scope": 682, + "src": "12283:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25321,10 +25335,10 @@ "typeString": "address" }, "typeName": { - "id": 572, + "id": 630, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12283:7:0", + "src": "12283:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25335,11 +25349,11 @@ }, { "constant": false, - "id": 575, + "id": 633, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12306:14:0", + "scope": 682, + "src": "12306:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25347,10 +25361,10 @@ "typeString": "address" }, "typeName": { - "id": 574, + "id": 632, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12306:7:0", + "src": "12306:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25361,11 +25375,11 @@ }, { "constant": false, - "id": 577, + "id": 635, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12330:17:0", + "scope": 682, + "src": "12330:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25373,10 +25387,10 @@ "typeString": "address" }, "typeName": { - "id": 576, + "id": 634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12330:7:0", + "src": "12330:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25387,11 +25401,11 @@ }, { "constant": false, - "id": 579, + "id": 637, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12357:20:0", + "scope": 682, + "src": "12357:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25399,10 +25413,10 @@ "typeString": "address" }, "typeName": { - "id": 578, + "id": 636, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12357:7:0", + "src": "12357:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -25412,20 +25426,20 @@ "visibility": "internal" } ], - "src": "12193:190:0" + "src": "12193:190:1" }, "payable": false, "returnParameters": { - "id": 583, + "id": 641, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 582, + "id": 640, "name": "", "nodeType": "VariableDeclaration", - "scope": 624, - "src": "12429:7:0", + "scope": 682, + "src": "12429:7:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25433,10 +25447,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 581, + "id": 639, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "12429:7:0", + "src": "12429:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25446,19 +25460,19 @@ "visibility": "internal" } ], - "src": "12428:9:0" + "src": "12428:9:1" }, - "scope": 1208, - "src": "12159:1017:0", + "scope": 1266, + "src": "12159:1017:1", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 699, + "id": 757, "nodeType": "Block", - "src": "13671:897:0", + "src": "13671:897:1", "statements": [ { "expression": { @@ -25466,12 +25480,12 @@ "arguments": [ { "argumentTypes": null, - "id": 645, + "id": 703, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 627, - "src": "13712:4:0", + "referencedDeclaration": 685, + "src": "13712:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" @@ -25479,12 +25493,12 @@ }, { "argumentTypes": null, - "id": 646, + "id": 704, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 630, - "src": "13730:4:0", + "referencedDeclaration": 688, + "src": "13730:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -25492,12 +25506,12 @@ }, { "argumentTypes": null, - "id": 647, + "id": 705, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 633, - "src": "13748:4:0", + "referencedDeclaration": 691, + "src": "13748:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -25505,12 +25519,12 @@ }, { "argumentTypes": null, - "id": 648, + "id": 706, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13766:10:0", + "referencedDeclaration": 693, + "src": "13766:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25518,12 +25532,12 @@ }, { "argumentTypes": null, - "id": 649, + "id": 707, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 638, - "src": "13790:12:0", + "referencedDeclaration": 696, + "src": "13790:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -25531,12 +25545,12 @@ }, { "argumentTypes": null, - "id": 650, + "id": 708, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 641, - "src": "13816:7:0", + "referencedDeclaration": 699, + "src": "13816:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -25570,18 +25584,18 @@ "typeString": "uint256[] memory" } ], - "id": 644, + "id": 702, "name": "_verifySignatures", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1016, - "src": "13681:17:0", + "referencedDeclaration": 1074, + "src": "13681:17:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory)" } }, - "id": 651, + "id": 709, "isConstant": false, "isLValue": false, "isPure": false, @@ -25589,28 +25603,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13681:152:0", + "src": "13681:152:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 652, + "id": 710, "nodeType": "ExpressionStatement", - "src": "13681:152:0" + "src": "13681:152:1" }, { "assignments": [ - 654 + 712 ], "declarations": [ { "constant": false, - "id": 654, + "id": 712, "name": "timeLockExpired", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13844:20:0", + "scope": 758, + "src": "13844:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -25618,10 +25632,10 @@ "typeString": "bool" }, "typeName": { - "id": 653, + "id": 711, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "13844:4:0", + "src": "13844:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25631,7 +25645,7 @@ "visibility": "internal" } ], - "id": 665, + "id": 723, "initialValue": { "argumentTypes": null, "arguments": [ @@ -25641,26 +25655,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 656, + "id": 714, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "13899:12:0", + "referencedDeclaration": 133, + "src": "13899:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 658, + "id": 716, "indexExpression": { "argumentTypes": null, - "id": 657, + "id": 715, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13912:10:0", + "referencedDeclaration": 693, + "src": "13912:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25671,21 +25685,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13899:24:0", + "src": "13899:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 659, + "id": 717, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "timeoutHours", "nodeType": "MemberAccess", - "referencedDeclaration": 50, - "src": "13899:37:0", + "referencedDeclaration": 108, + "src": "13899:37:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -25697,26 +25711,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 660, + "id": 718, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "13950:12:0", + "referencedDeclaration": 133, + "src": "13950:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 662, + "id": 720, "indexExpression": { "argumentTypes": null, - "id": 661, + "id": 719, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "13963:10:0", + "referencedDeclaration": 693, + "src": "13963:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25727,21 +25741,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13950:24:0", + "src": "13950:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 663, + "id": 721, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "lastModified", "nodeType": "MemberAccess", - "referencedDeclaration": 42, - "src": "13950:37:0", + "referencedDeclaration": 100, + "src": "13950:37:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25759,18 +25773,18 @@ "typeString": "uint256" } ], - "id": 655, + "id": 713, "name": "_isTimeLockExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1048, - "src": "13867:18:0", + "referencedDeclaration": 1106, + "src": "13867:18:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_uint32_$_t_uint256_$returns$_t_bool_$", "typeString": "function (uint32,uint256) view returns (bool)" } }, - "id": 664, + "id": 722, "isConstant": false, "isLValue": false, "isPure": false, @@ -25778,14 +25792,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13867:130:0", + "src": "13867:130:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "nodeType": "VariableDeclarationStatement", - "src": "13844:153:0" + "src": "13844:153:1" }, { "condition": { @@ -25794,7 +25808,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 672, + "id": 730, "isConstant": false, "isLValue": false, "isPure": false, @@ -25803,18 +25817,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 666, + "id": 724, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 627, - "src": "14183:4:0", + "referencedDeclaration": 685, + "src": "14183:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 667, + "id": 725, "isConstant": false, "isLValue": false, "isPure": false, @@ -25822,7 +25836,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14183:11:0", + "src": "14183:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -25836,26 +25850,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 668, + "id": 726, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14197:12:0", + "referencedDeclaration": 133, + "src": "14197:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 670, + "id": 728, "indexExpression": { "argumentTypes": null, - "id": 669, + "id": 727, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14210:10:0", + "referencedDeclaration": 693, + "src": "14210:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25866,45 +25880,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14197:24:0", + "src": "14197:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 671, + "id": 729, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "threshold", "nodeType": "MemberAccess", - "referencedDeclaration": 48, - "src": "14197:34:0", + "referencedDeclaration": 106, + "src": "14197:34:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "src": "14183:48:0", + "src": "14183:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 698, + "id": 756, "nodeType": "IfStatement", - "src": "14179:383:0", + "src": "14179:383:1", "trueBody": { - "id": 697, + "id": 755, "nodeType": "Block", - "src": "14233:329:0", + "src": "14233:329:1", "statements": [ { "condition": { "argumentTypes": null, - "id": 674, + "id": 732, "isConstant": false, "isLValue": false, "isPure": false, @@ -25912,15 +25926,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "14251:16:0", + "src": "14251:16:1", "subExpression": { "argumentTypes": null, - "id": 673, + "id": 731, "name": "timeLockExpired", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 654, - "src": "14252:15:0", + "referencedDeclaration": 712, + "src": "14252:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -25934,7 +25948,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 689, + "id": 747, "isConstant": false, "isLValue": false, "isPure": false, @@ -25942,7 +25956,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "14389:64:0", + "src": "14389:64:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -25951,26 +25965,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 680, + "id": 738, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14390:12:0", + "referencedDeclaration": 133, + "src": "14390:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 682, + "id": 740, "indexExpression": { "argumentTypes": null, - "id": 681, + "id": 739, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14403:10:0", + "referencedDeclaration": 693, + "src": "14403:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -25981,53 +25995,53 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14390:24:0", + "src": "14390:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 683, + "id": 741, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "14390:30:0", + "referencedDeclaration": 124, + "src": "14390:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 688, + "id": 746, "indexExpression": { "argumentTypes": null, "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 684, + "id": 742, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14421:12:0", + "referencedDeclaration": 133, + "src": "14421:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 686, + "id": 744, "indexExpression": { "argumentTypes": null, - "id": 685, + "id": 743, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 635, - "src": "14434:10:0", + "referencedDeclaration": 693, + "src": "14434:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26038,21 +26052,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14421:24:0", + "src": "14421:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 687, + "id": 745, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "seller", "nodeType": "MemberAccess", - "referencedDeclaration": 54, - "src": "14421:31:0", + "referencedDeclaration": 112, + "src": "14421:31:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26063,7 +26077,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14390:63:0", + "src": "14390:63:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26075,13 +26089,13 @@ } }, "falseBody": null, - "id": 695, + "id": 753, "nodeType": "IfStatement", - "src": "14385:167:0", + "src": "14385:167:1", "trueBody": { - "id": 694, + "id": 752, "nodeType": "Block", - "src": "14455:97:0", + "src": "14455:97:1", "statements": [ { "expression": { @@ -26090,14 +26104,14 @@ { "argumentTypes": null, "hexValue": "4d696e206e756d626572206f662073696773206e6f742070726573656e7420616e642073656c6c657220646964206e6f74207369676e", - "id": 691, + "id": 749, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14480:56:0", + "src": "14480:56:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3b322ca30262369c4d65a8630eaee7e951f7a52d78fe30e6f9c7b31754058a3e", @@ -26113,21 +26127,21 @@ "typeString": "literal_string \"Min number of sigs not present and seller did not sign\"" } ], - "id": 690, + "id": 748, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 2534, - 2535 + 5314, + 5315 ], - "referencedDeclaration": 2535, - "src": "14473:6:0", + "referencedDeclaration": 5315, + "src": "14473:6:1", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory) pure" } }, - "id": 692, + "id": 750, "isConstant": false, "isLValue": false, "isPure": false, @@ -26135,26 +26149,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14473:64:0", + "src": "14473:64:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 693, + "id": 751, "nodeType": "ExpressionStatement", - "src": "14473:64:0" + "src": "14473:64:1" } ] } }, - "id": 696, + "id": 754, "nodeType": "IfStatement", - "src": "14247:305:0", + "src": "14247:305:1", "trueBody": { - "id": 679, + "id": 737, "nodeType": "Block", - "src": "14269:98:0", + "src": "14269:98:1", "statements": [ { "expression": { @@ -26163,14 +26177,14 @@ { "argumentTypes": null, "hexValue": "4d696e206e756d626572206f662073696773206e6f742070726573656e7420616e642074696d656c6f636b206e6f742065787069726564", - "id": 676, + "id": 734, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "14294:57:0", + "src": "14294:57:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_0fd9b9a5d87d84ac3970eddd40be2f966b50dd97cbeb9401eba72b84fb57995c", @@ -26186,21 +26200,21 @@ "typeString": "literal_string \"Min number of sigs not present and timelock not expired\"" } ], - "id": 675, + "id": 733, "name": "revert", "nodeType": "Identifier", "overloadedDeclarations": [ - 2534, - 2535 + 5314, + 5315 ], - "referencedDeclaration": 2535, - "src": "14287:6:0", + "referencedDeclaration": 5315, + "src": "14287:6:1", "typeDescriptions": { "typeIdentifier": "t_function_revert_pure$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory) pure" } }, - "id": 677, + "id": 735, "isConstant": false, "isLValue": false, "isPure": false, @@ -26208,15 +26222,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14287:65:0", + "src": "14287:65:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 678, + "id": 736, "nodeType": "ExpressionStatement", - "src": "14287:65:0" + "src": "14287:65:1" } ] } @@ -26227,7 +26241,7 @@ ] }, "documentation": "@dev This methods checks validity of transaction\n1. Verify Signatures\n2. Check if minimum number of signatures has been acquired\n3. If above condition is false, check if timelock is expired or if the\n execution is signed by seller", - "id": 700, + "id": 758, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -26235,16 +26249,16 @@ "name": "_verifyTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 642, + "id": 700, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 627, + "id": 685, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13497:12:0", + "scope": 758, + "src": "13497:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26253,19 +26267,19 @@ }, "typeName": { "baseType": { - "id": 625, + "id": 683, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "13497:5:0", + "src": "13497:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 626, + "id": 684, "length": null, "nodeType": "ArrayTypeName", - "src": "13497:7:0", + "src": "13497:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -26276,11 +26290,11 @@ }, { "constant": false, - "id": 630, + "id": 688, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13519:14:0", + "scope": 758, + "src": "13519:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26289,19 +26303,19 @@ }, "typeName": { "baseType": { - "id": 628, + "id": 686, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13519:7:0", + "src": "13519:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 629, + "id": 687, "length": null, "nodeType": "ArrayTypeName", - "src": "13519:9:0", + "src": "13519:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -26312,11 +26326,11 @@ }, { "constant": false, - "id": 633, + "id": 691, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13543:14:0", + "scope": 758, + "src": "13543:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26325,19 +26339,19 @@ }, "typeName": { "baseType": { - "id": 631, + "id": 689, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13543:7:0", + "src": "13543:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 632, + "id": 690, "length": null, "nodeType": "ArrayTypeName", - "src": "13543:9:0", + "src": "13543:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -26348,11 +26362,11 @@ }, { "constant": false, - "id": 635, + "id": 693, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13567:18:0", + "scope": 758, + "src": "13567:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26360,10 +26374,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 634, + "id": 692, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13567:7:0", + "src": "13567:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26374,11 +26388,11 @@ }, { "constant": false, - "id": 638, + "id": 696, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13595:22:0", + "scope": 758, + "src": "13595:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26387,19 +26401,19 @@ }, "typeName": { "baseType": { - "id": 636, + "id": 694, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13595:7:0", + "src": "13595:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 637, + "id": 695, "length": null, "nodeType": "ArrayTypeName", - "src": "13595:9:0", + "src": "13595:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -26410,11 +26424,11 @@ }, { "constant": false, - "id": 641, + "id": 699, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 700, - "src": "13627:17:0", + "scope": 758, + "src": "13627:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26423,19 +26437,19 @@ }, "typeName": { "baseType": { - "id": 639, + "id": 697, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "13627:7:0", + "src": "13627:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 640, + "id": 698, "length": null, "nodeType": "ArrayTypeName", - "src": "13627:9:0", + "src": "13627:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -26445,54 +26459,54 @@ "visibility": "internal" } ], - "src": "13487:163:0" + "src": "13487:163:1" }, "payable": false, "returnParameters": { - "id": 643, + "id": 701, "nodeType": "ParameterList", "parameters": [], - "src": "13671:0:0" + "src": "13671:0:1" }, - "scope": 1208, - "src": "13460:1108:0", + "scope": 1266, + "src": "13460:1108:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 892, + "id": 950, "nodeType": "Block", - "src": "14861:2002:0", + "src": "14861:2002:1", "statements": [ { "assignments": [ - 714 + 772 ], "declarations": [ { "constant": false, - "id": 714, + "id": 772, "name": "t", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14871:21:0", + "scope": 951, + "src": "14871:21:1", "stateVariable": false, "storageLocation": "storage", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" }, "typeName": { "contractScope": null, - "id": 713, + "id": 771, "name": "Transaction", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 71, - "src": "14871:11:0", + "referencedDeclaration": 129, + "src": "14871:11:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction" } }, @@ -26500,31 +26514,31 @@ "visibility": "internal" } ], - "id": 718, + "id": 776, "initialValue": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 715, + "id": 773, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "14895:12:0", + "referencedDeclaration": 133, + "src": "14895:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 717, + "id": 775, "indexExpression": { "argumentTypes": null, - "id": 716, + "id": 774, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 702, - "src": "14908:10:0", + "referencedDeclaration": 760, + "src": "14908:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -26535,27 +26549,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "14895:24:0", + "src": "14895:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, "nodeType": "VariableDeclarationStatement", - "src": "14871:48:0" + "src": "14871:48:1" }, { "assignments": [ - 720 + 778 ], "declarations": [ { "constant": false, - "id": 720, + "id": 778, "name": "valueTransferred", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14930:24:0", + "scope": 951, + "src": "14930:24:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -26563,10 +26577,10 @@ "typeString": "uint256" }, "typeName": { - "id": 719, + "id": 777, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14930:7:0", + "src": "14930:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26576,18 +26590,18 @@ "visibility": "internal" } ], - "id": 722, + "id": 780, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 721, + "id": 779, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14957:1:0", + "src": "14957:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26596,16 +26610,16 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "14930:28:0" + "src": "14930:28:1" }, { "condition": { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 727, + "id": 785, "isConstant": false, "isLValue": false, "isPure": false, @@ -26614,28 +26628,28 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 723, + "id": 781, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "14973:1:0", + "referencedDeclaration": 772, + "src": "14973:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 724, + "id": 782, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "14973:17:0", + "referencedDeclaration": 104, + "src": "14973:17:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -26645,18 +26659,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 725, + "id": 783, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "14994:15:0", + "referencedDeclaration": 70, + "src": "14994:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 726, + "id": 784, "isConstant": false, "isLValue": false, "isPure": true, @@ -26664,13 +26678,13 @@ "memberName": "ETHER", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "14994:21:0", + "src": "14994:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "14973:42:0", + "src": "14973:42:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26680,10 +26694,10 @@ "condition": { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, - "id": 804, + "id": 862, "isConstant": false, "isLValue": false, "isPure": false, @@ -26692,28 +26706,28 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 800, + "id": 858, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15820:1:0", + "referencedDeclaration": 772, + "src": "15820:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 801, + "id": 859, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "transactionType", "nodeType": "MemberAccess", - "referencedDeclaration": 46, - "src": "15820:17:0", + "referencedDeclaration": 104, + "src": "15820:17:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -26723,18 +26737,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 802, + "id": 860, "name": "TransactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 12, - "src": "15841:15:0", + "referencedDeclaration": 70, + "src": "15841:15:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_TransactionType_$12_$", + "typeIdentifier": "t_type$_t_enum$_TransactionType_$70_$", "typeString": "type(enum Escrow_v1_0.TransactionType)" } }, - "id": 803, + "id": 861, "isConstant": false, "isLValue": false, "isPure": true, @@ -26742,54 +26756,54 @@ "memberName": "TOKEN", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15841:21:0", + "src": "15841:21:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, - "src": "15820:42:0", + "src": "15820:42:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 888, + "id": 946, "nodeType": "IfStatement", - "src": "15816:1008:0", + "src": "15816:1008:1", "trueBody": { - "id": 887, + "id": 945, "nodeType": "Block", - "src": "15864:960:0", + "src": "15864:960:1", "statements": [ { "assignments": [ - 806 + 864 ], "declarations": [ { "constant": false, - "id": 806, + "id": 864, "name": "token", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15879:20:0", + "scope": 951, + "src": "15879:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 805, + "id": 863, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "15879:14:0", + "referencedDeclaration": 4445, + "src": "15879:14:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -26797,7 +26811,7 @@ "visibility": "internal" } ], - "id": 811, + "id": 869, "initialValue": { "argumentTypes": null, "arguments": [ @@ -26805,26 +26819,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 808, + "id": 866, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15917:1:0", + "referencedDeclaration": 772, + "src": "15917:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 809, + "id": 867, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "tokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 56, - "src": "15917:14:0", + "referencedDeclaration": 114, + "src": "15917:14:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26838,18 +26852,18 @@ "typeString": "address" } ], - "id": 807, + "id": 865, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "15902:14:0", + "referencedDeclaration": 4445, + "src": "15902:14:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 810, + "id": 868, "isConstant": false, "isLValue": false, "isPure": false, @@ -26857,20 +26871,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15902:30:0", + "src": "15902:30:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, "nodeType": "VariableDeclarationStatement", - "src": "15879:53:0" + "src": "15879:53:1" }, { "body": { - "id": 885, + "id": 943, "nodeType": "Block", - "src": "15995:819:0", + "src": "15995:819:1", "statements": [ { "expression": { @@ -26882,7 +26896,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 830, + "id": 888, "isConstant": false, "isLValue": false, "isPure": false, @@ -26891,26 +26905,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 824, + "id": 882, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16043:12:0", + "referencedDeclaration": 763, + "src": "16043:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 826, + "id": 884, "indexExpression": { "argumentTypes": null, - "id": 825, + "id": 883, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16056:1:0", + "referencedDeclaration": 871, + "src": "16056:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -26921,7 +26935,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16043:15:0", + "src": "16043:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -26935,14 +26949,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 828, + "id": 886, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16070:1:0", + "src": "16070:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -26958,20 +26972,20 @@ "typeString": "int_const 0" } ], - "id": 827, + "id": 885, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "16062:7:0", + "src": "16062:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 829, + "id": 887, "isConstant": false, "isLValue": false, "isPure": true, @@ -26979,13 +26993,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16062:10:0", + "src": "16062:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "16043:29:0", + "src": "16043:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -26994,14 +27008,14 @@ { "argumentTypes": null, "hexValue": "7a65726f2061646472657373206973206e6f7420616c6c6f7765642061732064657374696e6174696f6e2061646472657373", - "id": 831, + "id": 889, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16094:52:0", + "src": "16094:52:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_587fbb5a9b8e6d4cc482f236066ac51bcf007ae6026eab186437d2f1b22fc139", @@ -27021,21 +27035,21 @@ "typeString": "literal_string \"zero address is not allowed as destination address\"" } ], - "id": 823, + "id": 881, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16014:7:0", + "referencedDeclaration": 5313, + "src": "16014:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 832, + "id": 890, "isConstant": false, "isLValue": false, "isPure": false, @@ -27043,15 +27057,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16014:150:0", + "src": "16014:150:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 833, + "id": 891, "nodeType": "ExpressionStatement", - "src": "16014:150:0" + "src": "16014:150:1" }, { "expression": { @@ -27063,56 +27077,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 835, + "id": 893, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "16212:1:0", + "referencedDeclaration": 772, + "src": "16212:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 836, + "id": 894, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "16212:9:0", + "referencedDeclaration": 120, + "src": "16212:9:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 840, + "id": 898, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 837, + "id": 895, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16222:12:0", + "referencedDeclaration": 763, + "src": "16222:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 839, + "id": 897, "indexExpression": { "argumentTypes": null, - "id": 838, + "id": 896, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16235:1:0", + "referencedDeclaration": 871, + "src": "16235:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27123,7 +27137,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16222:15:0", + "src": "16222:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27134,7 +27148,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16212:26:0", + "src": "16212:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27143,14 +27157,14 @@ { "argumentTypes": null, "hexValue": "44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f6620746865206f776e657273", - "id": 841, + "id": 899, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16260:46:0", + "src": "16260:46:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5ccbe9d117aeeb4b3546dfe6a12f083cb37039367b3ec38b60873b8650bc846f", @@ -27170,21 +27184,21 @@ "typeString": "literal_string \"Destination address is not one of the owners\"" } ], - "id": 834, + "id": 892, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16183:7:0", + "referencedDeclaration": 5313, + "src": "16183:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 842, + "id": 900, "isConstant": false, "isLValue": false, "isPure": false, @@ -27192,15 +27206,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16183:141:0", + "src": "16183:141:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 843, + "id": 901, "nodeType": "ExpressionStatement", - "src": "16183:141:0" + "src": "16183:141:1" }, { "expression": { @@ -27212,7 +27226,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 849, + "id": 907, "isConstant": false, "isLValue": false, "isPure": false, @@ -27221,26 +27235,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 845, + "id": 903, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16372:7:0", + "referencedDeclaration": 766, + "src": "16372:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 847, + "id": 905, "indexExpression": { "argumentTypes": null, - "id": 846, + "id": 904, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16380:1:0", + "referencedDeclaration": 871, + "src": "16380:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27251,7 +27265,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16372:10:0", + "src": "16372:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27262,14 +27276,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 848, + "id": 906, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16385:1:0", + "src": "16385:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -27277,7 +27291,7 @@ }, "value": "0" }, - "src": "16372:14:0", + "src": "16372:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27286,14 +27300,14 @@ { "argumentTypes": null, "hexValue": "416d6f756e7420746f2062652073656e742073686f756c642062652067726561746572207468616e2030", - "id": 850, + "id": 908, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16408:44:0", + "src": "16408:44:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5e1271a09dbb64ae031de288deb0ad8d707df7db51d6e827931dc8fa6642a71e", @@ -27313,21 +27327,21 @@ "typeString": "literal_string \"Amount to be sent should be greater than 0\"" } ], - "id": 844, + "id": 902, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16343:7:0", + "referencedDeclaration": 5313, + "src": "16343:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 851, + "id": 909, "isConstant": false, "isLValue": false, "isPure": false, @@ -27335,32 +27349,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16343:127:0", + "src": "16343:127:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 852, + "id": 910, "nodeType": "ExpressionStatement", - "src": "16343:127:0" + "src": "16343:127:1" }, { "expression": { "argumentTypes": null, - "id": 860, + "id": 918, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 853, + "id": 911, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16489:16:0", + "referencedDeclaration": 778, + "src": "16489:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27375,26 +27389,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 856, + "id": 914, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16529:7:0", + "referencedDeclaration": 766, + "src": "16529:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 858, + "id": 916, "indexExpression": { "argumentTypes": null, - "id": 857, + "id": 915, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16537:1:0", + "referencedDeclaration": 871, + "src": "16537:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27405,7 +27419,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16529:10:0", + "src": "16529:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27421,32 +27435,32 @@ ], "expression": { "argumentTypes": null, - "id": 854, + "id": 912, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16508:16:0", + "referencedDeclaration": 778, + "src": "16508:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 855, + "id": 913, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "16508:20:0", + "referencedDeclaration": 4601, + "src": "16508:20:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 859, + "id": 917, "isConstant": false, "isLValue": false, "isPure": false, @@ -27454,26 +27468,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16508:32:0", + "src": "16508:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16489:51:0", + "src": "16489:51:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 861, + "id": 919, "nodeType": "ExpressionStatement", - "src": "16489:51:0" + "src": "16489:51:1" }, { "expression": { "argumentTypes": null, - "id": 870, + "id": 928, "isConstant": false, "isLValue": false, "isPure": false, @@ -27484,56 +27498,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 862, + "id": 920, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "16605:1:0", + "referencedDeclaration": 772, + "src": "16605:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 867, + "id": 925, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "16605:15:0", + "referencedDeclaration": 128, + "src": "16605:15:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 868, + "id": 926, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 864, + "id": 922, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16621:12:0", + "referencedDeclaration": 763, + "src": "16621:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 866, + "id": 924, "indexExpression": { "argumentTypes": null, - "id": 865, + "id": 923, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16634:1:0", + "referencedDeclaration": 871, + "src": "16634:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27544,7 +27558,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16621:15:0", + "src": "16621:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27555,7 +27569,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "16605:32:0", + "src": "16605:32:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27566,14 +27580,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 869, + "id": 927, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16640:4:0", + "src": "16640:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -27581,15 +27595,15 @@ }, "value": "true" }, - "src": "16605:39:0", + "src": "16605:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 871, + "id": 929, "nodeType": "ExpressionStatement", - "src": "16605:39:0" + "src": "16605:39:1" }, { "expression": { @@ -27602,26 +27616,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 875, + "id": 933, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "16707:12:0", + "referencedDeclaration": 763, + "src": "16707:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 877, + "id": 935, "indexExpression": { "argumentTypes": null, - "id": 876, + "id": 934, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16720:1:0", + "referencedDeclaration": 871, + "src": "16720:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27632,7 +27646,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16707:15:0", + "src": "16707:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -27642,26 +27656,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 878, + "id": 936, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "16724:7:0", + "referencedDeclaration": 766, + "src": "16724:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 880, + "id": 938, "indexExpression": { "argumentTypes": null, - "id": 879, + "id": 937, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "16732:1:0", + "referencedDeclaration": 871, + "src": "16732:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27672,7 +27686,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "16724:10:0", + "src": "16724:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27692,32 +27706,32 @@ ], "expression": { "argumentTypes": null, - "id": 873, + "id": 931, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 806, - "src": "16692:5:0", + "referencedDeclaration": 864, + "src": "16692:5:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 874, + "id": 932, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "16692:14:0", + "referencedDeclaration": 4412, + "src": "16692:14:1", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 881, + "id": 939, "isConstant": false, "isLValue": false, "isPure": false, @@ -27725,7 +27739,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16692:43:0", + "src": "16692:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -27734,14 +27748,14 @@ { "argumentTypes": null, "hexValue": "546f6b656e207472616e73666572206661696c65642e", - "id": 882, + "id": 940, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "16757:24:0", + "src": "16757:24:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e545223bb79d8456d66fa5a98897abb42bb4807111f004a120200da3b7e292c5", @@ -27761,21 +27775,21 @@ "typeString": "literal_string \"Token transfer failed.\"" } ], - "id": 872, + "id": 930, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "16663:7:0", + "referencedDeclaration": 5313, + "src": "16663:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 883, + "id": 941, "isConstant": false, "isLValue": false, "isPure": false, @@ -27783,15 +27797,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16663:136:0", + "src": "16663:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 884, + "id": 942, "nodeType": "ExpressionStatement", - "src": "16663:136:0" + "src": "16663:136:1" } ] }, @@ -27801,19 +27815,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 819, + "id": 877, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 816, + "id": 874, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "15967:1:0", + "referencedDeclaration": 871, + "src": "15967:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27825,18 +27839,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 817, + "id": 875, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15969:12:0", + "referencedDeclaration": 763, + "src": "15969:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 818, + "id": 876, "isConstant": false, "isLValue": false, "isPure": false, @@ -27844,31 +27858,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15969:19:0", + "src": "15969:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15967:21:0", + "src": "15967:21:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 886, + "id": 944, "initializationExpression": { "assignments": [ - 813 + 871 ], "declarations": [ { "constant": false, - "id": 813, + "id": 871, "name": "j", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15952:9:0", + "scope": 951, + "src": "15952:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -27876,10 +27890,10 @@ "typeString": "uint256" }, "typeName": { - "id": 812, + "id": 870, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "15952:7:0", + "src": "15952:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27889,18 +27903,18 @@ "visibility": "internal" } ], - "id": 815, + "id": 873, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 814, + "id": 872, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15964:1:0", + "src": "15964:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -27909,12 +27923,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "15952:13:0" + "src": "15952:13:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 821, + "id": 879, "isConstant": false, "isLValue": false, "isPure": false, @@ -27922,15 +27936,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "15990:3:0", + "src": "15990:3:1", "subExpression": { "argumentTypes": null, - "id": 820, + "id": 878, "name": "j", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 813, - "src": "15990:1:0", + "referencedDeclaration": 871, + "src": "15990:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -27941,29 +27955,29 @@ "typeString": "uint256" } }, - "id": 822, + "id": 880, "nodeType": "ExpressionStatement", - "src": "15990:3:0" + "src": "15990:3:1" }, "nodeType": "ForStatement", - "src": "15947:867:0" + "src": "15947:867:1" } ] } }, - "id": 889, + "id": 947, "nodeType": "IfStatement", - "src": "14969:1855:0", + "src": "14969:1855:1", "trueBody": { - "id": 799, + "id": 857, "nodeType": "Block", - "src": "15017:793:0", + "src": "15017:793:1", "statements": [ { "body": { - "id": 797, + "id": 855, "nodeType": "Block", - "src": "15081:718:0", + "src": "15081:718:1", "statements": [ { "expression": { @@ -27975,7 +27989,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 746, + "id": 804, "isConstant": false, "isLValue": false, "isPure": false, @@ -27984,26 +27998,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 740, + "id": 798, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15129:12:0", + "referencedDeclaration": 763, + "src": "15129:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 742, + "id": 800, "indexExpression": { "argumentTypes": null, - "id": 741, + "id": 799, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15142:1:0", + "referencedDeclaration": 787, + "src": "15142:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28014,7 +28028,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15129:15:0", + "src": "15129:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28028,14 +28042,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 744, + "id": 802, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15156:1:0", + "src": "15156:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -28051,20 +28065,20 @@ "typeString": "int_const 0" } ], - "id": 743, + "id": 801, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "15148:7:0", + "src": "15148:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 745, + "id": 803, "isConstant": false, "isLValue": false, "isPure": true, @@ -28072,13 +28086,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15148:10:0", + "src": "15148:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "15129:29:0", + "src": "15129:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28087,14 +28101,14 @@ { "argumentTypes": null, "hexValue": "7a65726f2061646472657373206973206e6f7420616c6c6f7765642061732064657374696e6174696f6e2061646472657373", - "id": 747, + "id": 805, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15180:52:0", + "src": "15180:52:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_587fbb5a9b8e6d4cc482f236066ac51bcf007ae6026eab186437d2f1b22fc139", @@ -28114,21 +28128,21 @@ "typeString": "literal_string \"zero address is not allowed as destination address\"" } ], - "id": 739, + "id": 797, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15100:7:0", + "referencedDeclaration": 5313, + "src": "15100:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 748, + "id": 806, "isConstant": false, "isLValue": false, "isPure": false, @@ -28136,15 +28150,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15100:150:0", + "src": "15100:150:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 749, + "id": 807, "nodeType": "ExpressionStatement", - "src": "15100:150:0" + "src": "15100:150:1" }, { "expression": { @@ -28156,56 +28170,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 751, + "id": 809, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15298:1:0", + "referencedDeclaration": 772, + "src": "15298:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 752, + "id": 810, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "15298:9:0", + "referencedDeclaration": 120, + "src": "15298:9:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 756, + "id": 814, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 753, + "id": 811, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15308:12:0", + "referencedDeclaration": 763, + "src": "15308:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 755, + "id": 813, "indexExpression": { "argumentTypes": null, - "id": 754, + "id": 812, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15321:1:0", + "referencedDeclaration": 787, + "src": "15321:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28216,7 +28230,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15308:15:0", + "src": "15308:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28227,7 +28241,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15298:26:0", + "src": "15298:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28236,14 +28250,14 @@ { "argumentTypes": null, "hexValue": "44657374696e6174696f6e2061646472657373206973206e6f74206f6e65206f6620746865206f776e657273", - "id": 757, + "id": 815, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15346:46:0", + "src": "15346:46:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5ccbe9d117aeeb4b3546dfe6a12f083cb37039367b3ec38b60873b8650bc846f", @@ -28263,21 +28277,21 @@ "typeString": "literal_string \"Destination address is not one of the owners\"" } ], - "id": 750, + "id": 808, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15269:7:0", + "referencedDeclaration": 5313, + "src": "15269:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 758, + "id": 816, "isConstant": false, "isLValue": false, "isPure": false, @@ -28285,15 +28299,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15269:141:0", + "src": "15269:141:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 759, + "id": 817, "nodeType": "ExpressionStatement", - "src": "15269:141:0" + "src": "15269:141:1" }, { "expression": { @@ -28305,7 +28319,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 765, + "id": 823, "isConstant": false, "isLValue": false, "isPure": false, @@ -28314,26 +28328,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 761, + "id": 819, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15458:7:0", + "referencedDeclaration": 766, + "src": "15458:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 763, + "id": 821, "indexExpression": { "argumentTypes": null, - "id": 762, + "id": 820, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15466:1:0", + "referencedDeclaration": 787, + "src": "15466:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28344,7 +28358,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15458:10:0", + "src": "15458:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28355,14 +28369,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 764, + "id": 822, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15471:1:0", + "src": "15471:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -28370,7 +28384,7 @@ }, "value": "0" }, - "src": "15458:14:0", + "src": "15458:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28379,14 +28393,14 @@ { "argumentTypes": null, "hexValue": "416d6f756e7420746f2062652073656e742073686f756c642062652067726561746572207468616e2030", - "id": 766, + "id": 824, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "15494:44:0", + "src": "15494:44:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5e1271a09dbb64ae031de288deb0ad8d707df7db51d6e827931dc8fa6642a71e", @@ -28406,21 +28420,21 @@ "typeString": "literal_string \"Amount to be sent should be greater than 0\"" } ], - "id": 760, + "id": 818, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "15429:7:0", + "referencedDeclaration": 5313, + "src": "15429:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 767, + "id": 825, "isConstant": false, "isLValue": false, "isPure": false, @@ -28428,32 +28442,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15429:127:0", + "src": "15429:127:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 768, + "id": 826, "nodeType": "ExpressionStatement", - "src": "15429:127:0" + "src": "15429:127:1" }, { "expression": { "argumentTypes": null, - "id": 776, + "id": 834, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 769, + "id": 827, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "15575:16:0", + "referencedDeclaration": 778, + "src": "15575:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28468,26 +28482,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 772, + "id": 830, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15615:7:0", + "referencedDeclaration": 766, + "src": "15615:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 774, + "id": 832, "indexExpression": { "argumentTypes": null, - "id": 773, + "id": 831, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15623:1:0", + "referencedDeclaration": 787, + "src": "15623:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28498,7 +28512,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15615:10:0", + "src": "15615:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28514,32 +28528,32 @@ ], "expression": { "argumentTypes": null, - "id": 770, + "id": 828, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "15594:16:0", + "referencedDeclaration": 778, + "src": "15594:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 771, + "id": 829, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "15594:20:0", + "referencedDeclaration": 4601, + "src": "15594:20:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 775, + "id": 833, "isConstant": false, "isLValue": false, "isPure": false, @@ -28547,26 +28561,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15594:32:0", + "src": "15594:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15575:51:0", + "src": "15575:51:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 777, + "id": 835, "nodeType": "ExpressionStatement", - "src": "15575:51:0" + "src": "15575:51:1" }, { "expression": { "argumentTypes": null, - "id": 786, + "id": 844, "isConstant": false, "isLValue": false, "isPure": false, @@ -28577,56 +28591,56 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 778, + "id": 836, "name": "t", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 714, - "src": "15691:1:0", + "referencedDeclaration": 772, + "src": "15691:1:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage_ptr", + "typeIdentifier": "t_struct$_Transaction_$129_storage_ptr", "typeString": "struct Escrow_v1_0.Transaction storage pointer" } }, - "id": 783, + "id": 841, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "beneficiaries", "nodeType": "MemberAccess", - "referencedDeclaration": 70, - "src": "15691:15:0", + "referencedDeclaration": 128, + "src": "15691:15:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 784, + "id": 842, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 780, + "id": 838, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15707:12:0", + "referencedDeclaration": 763, + "src": "15707:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 782, + "id": 840, "indexExpression": { "argumentTypes": null, - "id": 781, + "id": 839, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15720:1:0", + "referencedDeclaration": 787, + "src": "15720:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28637,7 +28651,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15707:15:0", + "src": "15707:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -28648,7 +28662,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "15691:32:0", + "src": "15691:32:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -28659,14 +28673,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 785, + "id": 843, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15726:4:0", + "src": "15726:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -28674,15 +28688,15 @@ }, "value": "true" }, - "src": "15691:39:0", + "src": "15691:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 787, + "id": 845, "nodeType": "ExpressionStatement", - "src": "15691:39:0" + "src": "15691:39:1" }, { "expression": { @@ -28692,26 +28706,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 792, + "id": 850, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 708, - "src": "15773:7:0", + "referencedDeclaration": 766, + "src": "15773:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 794, + "id": 852, "indexExpression": { "argumentTypes": null, - "id": 793, + "id": 851, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15781:1:0", + "referencedDeclaration": 787, + "src": "15781:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28722,7 +28736,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15773:10:0", + "src": "15773:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28740,26 +28754,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 788, + "id": 846, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15748:12:0", + "referencedDeclaration": 763, + "src": "15748:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 790, + "id": 848, "indexExpression": { "argumentTypes": null, - "id": 789, + "id": 847, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15761:1:0", + "referencedDeclaration": 787, + "src": "15761:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28770,13 +28784,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15748:15:0", + "src": "15748:15:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 791, + "id": 849, "isConstant": false, "isLValue": false, "isPure": false, @@ -28784,13 +28798,13 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15748:24:0", + "src": "15748:24:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" } }, - "id": 795, + "id": 853, "isConstant": false, "isLValue": false, "isPure": false, @@ -28798,15 +28812,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15748:36:0", + "src": "15748:36:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 796, + "id": 854, "nodeType": "ExpressionStatement", - "src": "15748:36:0" + "src": "15748:36:1" } ] }, @@ -28816,19 +28830,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 735, + "id": 793, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 732, + "id": 790, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15051:1:0", + "referencedDeclaration": 787, + "src": "15051:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28840,18 +28854,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 733, + "id": 791, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 705, - "src": "15055:12:0", + "referencedDeclaration": 763, + "src": "15055:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 734, + "id": 792, "isConstant": false, "isLValue": false, "isPure": false, @@ -28859,31 +28873,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "15055:19:0", + "src": "15055:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "15051:23:0", + "src": "15051:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 798, + "id": 856, "initializationExpression": { "assignments": [ - 729 + 787 ], "declarations": [ { "constant": false, - "id": 729, + "id": 787, "name": "i", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "15036:9:0", + "scope": 951, + "src": "15036:9:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -28891,10 +28905,10 @@ "typeString": "uint256" }, "typeName": { - "id": 728, + "id": 786, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "15036:7:0", + "src": "15036:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28904,18 +28918,18 @@ "visibility": "internal" } ], - "id": 731, + "id": 789, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 730, + "id": 788, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15048:1:0", + "src": "15048:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -28924,12 +28938,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "15036:13:0" + "src": "15036:13:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 737, + "id": 795, "isConstant": false, "isLValue": false, "isPure": false, @@ -28937,15 +28951,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "15076:3:0", + "src": "15076:3:1", "subExpression": { "argumentTypes": null, - "id": 736, + "id": 794, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 729, - "src": "15076:1:0", + "referencedDeclaration": 787, + "src": "15076:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -28956,12 +28970,12 @@ "typeString": "uint256" } }, - "id": 738, + "id": 796, "nodeType": "ExpressionStatement", - "src": "15076:3:0" + "src": "15076:3:1" }, "nodeType": "ForStatement", - "src": "15031:768:0" + "src": "15031:768:1" } ] } @@ -28969,26 +28983,26 @@ { "expression": { "argumentTypes": null, - "id": 890, + "id": 948, "name": "valueTransferred", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 720, - "src": "16840:16:0", + "referencedDeclaration": 778, + "src": "16840:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 712, - "id": 891, + "functionReturnParameters": 770, + "id": 949, "nodeType": "Return", - "src": "16833:23:0" + "src": "16833:23:1" } ] }, "documentation": "dev Private method to transfer funds to the destination addresses on\nthe basis of transaction type", - "id": 893, + "id": 951, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -28996,16 +29010,16 @@ "name": "_transferFunds", "nodeType": "FunctionDefinition", "parameters": { - "id": 709, + "id": 767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 702, + "id": 760, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14733:18:0", + "scope": 951, + "src": "14733:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29013,10 +29027,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 701, + "id": 759, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14733:7:0", + "src": "14733:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29027,11 +29041,11 @@ }, { "constant": false, - "id": 705, + "id": 763, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14761:21:0", + "scope": 951, + "src": "14761:21:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29040,19 +29054,19 @@ }, "typeName": { "baseType": { - "id": 703, + "id": 761, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14761:7:0", + "src": "14761:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 704, + "id": 762, "length": null, "nodeType": "ArrayTypeName", - "src": "14761:9:0", + "src": "14761:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -29063,11 +29077,11 @@ }, { "constant": false, - "id": 708, + "id": 766, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14792:16:0", + "scope": 951, + "src": "14792:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29076,19 +29090,19 @@ }, "typeName": { "baseType": { - "id": 706, + "id": 764, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14792:7:0", + "src": "14792:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 707, + "id": 765, "length": null, "nodeType": "ArrayTypeName", - "src": "14792:9:0", + "src": "14792:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -29098,20 +29112,20 @@ "visibility": "internal" } ], - "src": "14723:91:0" + "src": "14723:91:1" }, "payable": false, "returnParameters": { - "id": 712, + "id": 770, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 711, + "id": 769, "name": "", "nodeType": "VariableDeclaration", - "scope": 893, - "src": "14848:7:0", + "scope": 951, + "src": "14848:7:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29119,10 +29133,10 @@ "typeString": "uint256" }, "typeName": { - "id": 710, + "id": 768, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14848:7:0", + "src": "14848:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29132,19 +29146,19 @@ "visibility": "internal" } ], - "src": "14847:9:0" + "src": "14847:9:1" }, - "scope": 1208, - "src": "14700:2163:0", + "scope": 1266, + "src": "14700:2163:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1015, + "id": 1073, "nodeType": "Block", - "src": "17194:1247:0", + "src": "17194:1247:1", "statements": [ { "expression": { @@ -29156,7 +29170,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 918, + "id": 976, "isConstant": false, "isLValue": false, "isPure": false, @@ -29165,18 +29179,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 914, + "id": 972, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17212:4:0", + "referencedDeclaration": 957, + "src": "17212:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 915, + "id": 973, "isConstant": false, "isLValue": false, "isPure": false, @@ -29184,7 +29198,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17212:11:0", + "src": "17212:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29196,18 +29210,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 916, + "id": 974, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 902, - "src": "17227:4:0", + "referencedDeclaration": 960, + "src": "17227:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 917, + "id": 975, "isConstant": false, "isLValue": false, "isPure": false, @@ -29215,13 +29229,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17227:11:0", + "src": "17227:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17212:26:0", + "src": "17212:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -29230,14 +29244,14 @@ { "argumentTypes": null, "hexValue": "522c53206c656e677468206d69736d61746368", - "id": 919, + "id": 977, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17240:21:0", + "src": "17240:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6415df2de68c580f51a6899dccdc1deed9e5baa5c08f3141a1c35737fb161e1b", @@ -29257,21 +29271,21 @@ "typeString": "literal_string \"R,S length mismatch\"" } ], - "id": 913, + "id": 971, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "17204:7:0", + "referencedDeclaration": 5313, + "src": "17204:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 920, + "id": 978, "isConstant": false, "isLValue": false, "isPure": false, @@ -29279,15 +29293,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17204:58:0", + "src": "17204:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 921, + "id": 979, "nodeType": "ExpressionStatement", - "src": "17204:58:0" + "src": "17204:58:1" }, { "expression": { @@ -29299,7 +29313,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 927, + "id": 985, "isConstant": false, "isLValue": false, "isPure": false, @@ -29308,18 +29322,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 923, + "id": 981, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17280:4:0", + "referencedDeclaration": 957, + "src": "17280:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 924, + "id": 982, "isConstant": false, "isLValue": false, "isPure": false, @@ -29327,7 +29341,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17280:11:0", + "src": "17280:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29339,18 +29353,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 925, + "id": 983, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 896, - "src": "17295:4:0", + "referencedDeclaration": 954, + "src": "17295:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 926, + "id": 984, "isConstant": false, "isLValue": false, "isPure": false, @@ -29358,13 +29372,13 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17295:11:0", + "src": "17295:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17280:26:0", + "src": "17280:26:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -29373,14 +29387,14 @@ { "argumentTypes": null, "hexValue": "522c56206c656e677468206d69736d61746368", - "id": 928, + "id": 986, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17308:21:0", + "src": "17308:21:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_70841a86b203e1f3584f84f108ae7ab8a08aeb80ef39e5239bead52625ba25a2", @@ -29400,21 +29414,21 @@ "typeString": "literal_string \"R,V length mismatch\"" } ], - "id": 922, + "id": 980, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "17272:7:0", + "referencedDeclaration": 5313, + "src": "17272:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 929, + "id": 987, "isConstant": false, "isLValue": false, "isPure": false, @@ -29422,28 +29436,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17272:58:0", + "src": "17272:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 930, + "id": 988, "nodeType": "ExpressionStatement", - "src": "17272:58:0" + "src": "17272:58:1" }, { "assignments": [ - 932 + 990 ], "declarations": [ { "constant": false, - "id": 932, + "id": 990, "name": "txHash", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17429:14:0", + "scope": 1074, + "src": "17429:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29451,10 +29465,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 931, + "id": 989, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17429:7:0", + "src": "17429:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29464,7 +29478,7 @@ "visibility": "internal" } ], - "id": 956, + "id": 1014, "initialValue": { "argumentTypes": null, "arguments": [ @@ -29474,14 +29488,14 @@ { "argumentTypes": null, "hexValue": "19457468657265756d205369676e6564204d6573736167653a0a3332", - "id": 936, + "id": 994, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "17503:34:0", + "src": "17503:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_178a2411ab6fbc1ba11064408972259c558d0e82fd48b0aba3ad81d14f065e73", @@ -29501,14 +29515,14 @@ { "argumentTypes": null, "hexValue": "30783139", - "id": 941, + "id": 999, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17633:4:0", + "src": "17633:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_25_by_1", @@ -29524,20 +29538,20 @@ "typeString": "int_const 25" } ], - "id": 940, + "id": 998, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17628:4:0", + "src": "17628:4:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes1_$", "typeString": "type(bytes1)" }, "typeName": "byte" }, - "id": 942, + "id": 1000, "isConstant": false, "isLValue": false, "isPure": true, @@ -29545,7 +29559,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17628:10:0", + "src": "17628:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes1", "typeString": "bytes1" @@ -29557,14 +29571,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 944, + "id": 1002, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17669:1:0", + "src": "17669:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -29580,20 +29594,20 @@ "typeString": "int_const 0" } ], - "id": 943, + "id": 1001, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17664:4:0", + "src": "17664:4:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes1_$", "typeString": "type(bytes1)" }, "typeName": "byte" }, - "id": 945, + "id": 1003, "isConstant": false, "isLValue": false, "isPure": true, @@ -29601,7 +29615,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17664:7:0", + "src": "17664:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes1", "typeString": "bytes1" @@ -29612,14 +29626,14 @@ "arguments": [ { "argumentTypes": null, - "id": 947, + "id": 1005, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2546, - "src": "17705:4:0", + "referencedDeclaration": 5328, + "src": "17705:4:1", "typeDescriptions": { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } } @@ -29627,24 +29641,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Escrow_v1_0_$1208", + "typeIdentifier": "t_contract$_Escrow_v1_0_$1266", "typeString": "contract Escrow_v1_0" } ], - "id": 946, + "id": 1004, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "17697:7:0", + "src": "17697:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 948, + "id": 1006, "isConstant": false, "isLValue": false, "isPure": false, @@ -29652,7 +29666,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17697:13:0", + "src": "17697:13:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -29660,12 +29674,12 @@ }, { "argumentTypes": null, - "id": 949, + "id": 1007, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 907, - "src": "17736:12:0", + "referencedDeclaration": 965, + "src": "17736:12:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -29673,12 +29687,12 @@ }, { "argumentTypes": null, - "id": 950, + "id": 1008, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 910, - "src": "17774:7:0", + "referencedDeclaration": 968, + "src": "17774:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -29686,12 +29700,12 @@ }, { "argumentTypes": null, - "id": 951, + "id": 1009, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "17807:10:0", + "referencedDeclaration": 962, + "src": "17807:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29727,18 +29741,18 @@ ], "expression": { "argumentTypes": null, - "id": 938, + "id": 996, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "17586:3:0", + "referencedDeclaration": 5296, + "src": "17586:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 939, + "id": 997, "isConstant": false, "isLValue": false, "isPure": true, @@ -29746,13 +29760,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17586:16:0", + "src": "17586:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 952, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -29760,7 +29774,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17586:253:0", + "src": "17586:253:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -29774,18 +29788,18 @@ "typeString": "bytes memory" } ], - "id": 937, + "id": 995, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "17555:9:0", + "referencedDeclaration": 5303, + "src": "17555:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 953, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": false, @@ -29793,7 +29807,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17555:302:0", + "src": "17555:302:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29813,18 +29827,18 @@ ], "expression": { "argumentTypes": null, - "id": 934, + "id": 992, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2516, - "src": "17469:3:0", + "referencedDeclaration": 5296, + "src": "17469:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 935, + "id": 993, "isConstant": false, "isLValue": false, "isPure": true, @@ -29832,13 +29846,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17469:16:0", + "src": "17469:16:1", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 954, + "id": 1012, "isConstant": false, "isLValue": false, "isPure": false, @@ -29846,7 +29860,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17469:402:0", + "src": "17469:402:1", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -29860,18 +29874,18 @@ "typeString": "bytes memory" } ], - "id": 933, + "id": 991, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "17446:9:0", + "referencedDeclaration": 5303, + "src": "17446:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" } }, - "id": 955, + "id": 1013, "isConstant": false, "isLValue": false, "isPure": false, @@ -29879,33 +29893,33 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17446:435:0", + "src": "17446:435:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "VariableDeclarationStatement", - "src": "17429:452:0" + "src": "17429:452:1" }, { "body": { - "id": 1013, + "id": 1071, "nodeType": "Block", - "src": "17931:504:0", + "src": "17931:504:1", "statements": [ { "assignments": [ - 969 + 1027 ], "declarations": [ { "constant": false, - "id": 969, + "id": 1027, "name": "recovered", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17946:17:0", + "scope": 1074, + "src": "17946:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -29913,10 +29927,10 @@ "typeString": "address" }, "typeName": { - "id": 968, + "id": 1026, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17946:7:0", + "src": "17946:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -29926,18 +29940,18 @@ "visibility": "internal" } ], - "id": 982, + "id": 1040, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 971, + "id": 1029, "name": "txHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 932, - "src": "17993:6:0", + "referencedDeclaration": 990, + "src": "17993:6:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -29947,26 +29961,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 972, + "id": 1030, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 896, - "src": "18017:4:0", + "referencedDeclaration": 954, + "src": "18017:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" } }, - "id": 974, + "id": 1032, "indexExpression": { "argumentTypes": null, - "id": 973, + "id": 1031, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18022:1:0", + "referencedDeclaration": 1016, + "src": "18022:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -29977,7 +29991,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18017:7:0", + "src": "18017:7:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -29987,26 +30001,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 975, + "id": 1033, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "18042:4:0", + "referencedDeclaration": 957, + "src": "18042:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 977, + "id": 1035, "indexExpression": { "argumentTypes": null, - "id": 976, + "id": 1034, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18047:1:0", + "referencedDeclaration": 1016, + "src": "18047:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30017,7 +30031,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18042:7:0", + "src": "18042:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30027,26 +30041,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 978, + "id": 1036, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 902, - "src": "18067:4:0", + "referencedDeclaration": 960, + "src": "18067:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 980, + "id": 1038, "indexExpression": { "argumentTypes": null, - "id": 979, + "id": 1037, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "18072:1:0", + "referencedDeclaration": 1016, + "src": "18072:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30057,7 +30071,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18067:7:0", + "src": "18067:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30083,18 +30097,18 @@ "typeString": "bytes32" } ], - "id": 970, + "id": 1028, "name": "ecrecover", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "17966:9:0", + "referencedDeclaration": 5301, + "src": "17966:9:1", "typeDescriptions": { "typeIdentifier": "t_function_ecrecover_pure$_t_bytes32_$_t_uint8_$_t_bytes32_$_t_bytes32_$returns$_t_address_$", "typeString": "function (bytes32,uint8,bytes32,bytes32) pure returns (address)" } }, - "id": 981, + "id": 1039, "isConstant": false, "isLValue": false, "isPure": false, @@ -30102,14 +30116,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17966:122:0", + "src": "17966:122:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "17946:142:0" + "src": "17946:142:1" }, { "expression": { @@ -30123,26 +30137,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 984, + "id": 1042, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18128:12:0", + "referencedDeclaration": 133, + "src": "18128:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 986, + "id": 1044, "indexExpression": { "argumentTypes": null, - "id": 985, + "id": 1043, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18141:10:0", + "referencedDeclaration": 962, + "src": "18141:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30153,35 +30167,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18128:24:0", + "src": "18128:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 987, + "id": 1045, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "18128:32:0", + "referencedDeclaration": 120, + "src": "18128:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 989, + "id": 1047, "indexExpression": { "argumentTypes": null, - "id": 988, + "id": 1046, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18161:9:0", + "referencedDeclaration": 1027, + "src": "18161:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -30192,7 +30206,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18128:43:0", + "src": "18128:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -30201,14 +30215,14 @@ { "argumentTypes": null, "hexValue": "496e76616c6964207369676e6174757265", - "id": 990, + "id": 1048, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "18189:19:0", + "src": "18189:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_4f2d7dfcb27c0aafa13ae8c400de482c7832204d194018b6e45bd2bf244c74e7", @@ -30228,21 +30242,21 @@ "typeString": "literal_string \"Invalid signature\"" } ], - "id": 983, + "id": 1041, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "18103:7:0", + "referencedDeclaration": 5313, + "src": "18103:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 991, + "id": 1049, "isConstant": false, "isLValue": false, "isPure": false, @@ -30250,15 +30264,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18103:119:0", + "src": "18103:119:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 992, + "id": 1050, "nodeType": "ExpressionStatement", - "src": "18103:119:0" + "src": "18103:119:1" }, { "expression": { @@ -30266,7 +30280,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1000, + "id": 1058, "isConstant": false, "isLValue": false, "isPure": false, @@ -30274,7 +30288,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "18261:42:0", + "src": "18261:42:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -30283,26 +30297,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 994, + "id": 1052, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18262:12:0", + "referencedDeclaration": 133, + "src": "18262:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 996, + "id": 1054, "indexExpression": { "argumentTypes": null, - "id": 995, + "id": 1053, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18275:10:0", + "referencedDeclaration": 962, + "src": "18275:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30313,35 +30327,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18262:24:0", + "src": "18262:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 997, + "id": 1055, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "18262:30:0", + "referencedDeclaration": 124, + "src": "18262:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 999, + "id": 1057, "indexExpression": { "argumentTypes": null, - "id": 998, + "id": 1056, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18293:9:0", + "referencedDeclaration": 1027, + "src": "18293:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -30352,7 +30366,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18262:41:0", + "src": "18262:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -30366,14 +30380,14 @@ { "argumentTypes": null, "hexValue": "53616d65207369676e61747572652073656e74207477696365", - "id": 1001, + "id": 1059, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "18321:27:0", + "src": "18321:27:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_fb2c7e49d5ec7ce36fa812cf15ee7fa946942f931d04fe3ae970516007b2a543", @@ -30393,21 +30407,21 @@ "typeString": "literal_string \"Same signature sent twice\"" } ], - "id": 993, + "id": 1051, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "18236:7:0", + "referencedDeclaration": 5313, + "src": "18236:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1002, + "id": 1060, "isConstant": false, "isLValue": false, "isPure": false, @@ -30415,20 +30429,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18236:126:0", + "src": "18236:126:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1003, + "id": 1061, "nodeType": "ExpressionStatement", - "src": "18236:126:0" + "src": "18236:126:1" }, { "expression": { "argumentTypes": null, - "id": 1011, + "id": 1069, "isConstant": false, "isLValue": false, "isPure": false, @@ -30441,26 +30455,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1004, + "id": 1062, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "18376:12:0", + "referencedDeclaration": 133, + "src": "18376:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1006, + "id": 1064, "indexExpression": { "argumentTypes": null, - "id": 1005, + "id": 1063, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 904, - "src": "18389:10:0", + "referencedDeclaration": 962, + "src": "18389:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30471,35 +30485,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18376:24:0", + "src": "18376:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1007, + "id": 1065, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "voted", "nodeType": "MemberAccess", - "referencedDeclaration": 66, - "src": "18376:30:0", + "referencedDeclaration": 124, + "src": "18376:30:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1009, + "id": 1067, "indexExpression": { "argumentTypes": null, - "id": 1008, + "id": 1066, "name": "recovered", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 969, - "src": "18407:9:0", + "referencedDeclaration": 1027, + "src": "18407:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -30510,7 +30524,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "18376:41:0", + "src": "18376:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -30521,14 +30535,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1010, + "id": 1068, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "18420:4:0", + "src": "18420:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -30536,15 +30550,15 @@ }, "value": "true" }, - "src": "18376:48:0", + "src": "18376:48:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1012, + "id": 1070, "nodeType": "ExpressionStatement", - "src": "18376:48:0" + "src": "18376:48:1" } ] }, @@ -30554,19 +30568,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 964, + "id": 1022, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 961, + "id": 1019, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "17909:1:0", + "referencedDeclaration": 1016, + "src": "17909:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30578,18 +30592,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 962, + "id": 1020, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 899, - "src": "17913:4:0", + "referencedDeclaration": 957, + "src": "17913:4:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 963, + "id": 1021, "isConstant": false, "isLValue": false, "isPure": false, @@ -30597,31 +30611,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "17913:11:0", + "src": "17913:11:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17909:15:0", + "src": "17909:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1014, + "id": 1072, "initializationExpression": { "assignments": [ - 958 + 1016 ], "declarations": [ { "constant": false, - "id": 958, + "id": 1016, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17897:6:0", + "scope": 1074, + "src": "17897:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30629,10 +30643,10 @@ "typeString": "uint256" }, "typeName": { - "id": 957, + "id": 1015, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "17897:4:0", + "src": "17897:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30642,18 +30656,18 @@ "visibility": "internal" } ], - "id": 960, + "id": 1018, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 959, + "id": 1017, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17906:1:0", + "src": "17906:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -30662,12 +30676,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "17897:10:0" + "src": "17897:10:1" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 966, + "id": 1024, "isConstant": false, "isLValue": false, "isPure": false, @@ -30675,15 +30689,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "17926:3:0", + "src": "17926:3:1", "subExpression": { "argumentTypes": null, - "id": 965, + "id": 1023, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 958, - "src": "17926:1:0", + "referencedDeclaration": 1016, + "src": "17926:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30694,17 +30708,17 @@ "typeString": "uint256" } }, - "id": 967, + "id": 1025, "nodeType": "ExpressionStatement", - "src": "17926:3:0" + "src": "17926:3:1" }, "nodeType": "ForStatement", - "src": "17892:543:0" + "src": "17892:543:1" } ] }, "documentation": "dev Checks whether the signatures are valid or not and marks signers as\nhaving \"voted\".", - "id": 1016, + "id": 1074, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -30712,16 +30726,16 @@ "name": "_verifySignatures", "nodeType": "FunctionDefinition", "parameters": { - "id": 911, + "id": 969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 896, + "id": 954, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17021:12:0", + "scope": 1074, + "src": "17021:12:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30730,19 +30744,19 @@ }, "typeName": { "baseType": { - "id": 894, + "id": 952, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "17021:5:0", + "src": "17021:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 895, + "id": 953, "length": null, "nodeType": "ArrayTypeName", - "src": "17021:7:0", + "src": "17021:7:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -30753,11 +30767,11 @@ }, { "constant": false, - "id": 899, + "id": 957, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17043:14:0", + "scope": 1074, + "src": "17043:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30766,19 +30780,19 @@ }, "typeName": { "baseType": { - "id": 897, + "id": 955, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17043:7:0", + "src": "17043:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 898, + "id": 956, "length": null, "nodeType": "ArrayTypeName", - "src": "17043:9:0", + "src": "17043:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -30789,11 +30803,11 @@ }, { "constant": false, - "id": 902, + "id": 960, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17067:14:0", + "scope": 1074, + "src": "17067:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30802,19 +30816,19 @@ }, "typeName": { "baseType": { - "id": 900, + "id": 958, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17067:7:0", + "src": "17067:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 901, + "id": 959, "length": null, "nodeType": "ArrayTypeName", - "src": "17067:9:0", + "src": "17067:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -30825,11 +30839,11 @@ }, { "constant": false, - "id": 904, + "id": 962, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17091:18:0", + "scope": 1074, + "src": "17091:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30837,10 +30851,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 903, + "id": 961, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "17091:7:0", + "src": "17091:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -30851,11 +30865,11 @@ }, { "constant": false, - "id": 907, + "id": 965, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17119:22:0", + "scope": 1074, + "src": "17119:22:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30864,19 +30878,19 @@ }, "typeName": { "baseType": { - "id": 905, + "id": 963, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17119:7:0", + "src": "17119:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 906, + "id": 964, "length": null, "nodeType": "ArrayTypeName", - "src": "17119:9:0", + "src": "17119:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -30887,11 +30901,11 @@ }, { "constant": false, - "id": 910, + "id": 968, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1016, - "src": "17151:16:0", + "scope": 1074, + "src": "17151:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30900,19 +30914,19 @@ }, "typeName": { "baseType": { - "id": 908, + "id": 966, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "17151:7:0", + "src": "17151:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 909, + "id": 967, "length": null, "nodeType": "ArrayTypeName", - "src": "17151:9:0", + "src": "17151:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -30922,39 +30936,39 @@ "visibility": "internal" } ], - "src": "17011:162:0" + "src": "17011:162:1" }, "payable": false, "returnParameters": { - "id": 912, + "id": 970, "nodeType": "ParameterList", "parameters": [], - "src": "17194:0:0" + "src": "17194:0:1" }, - "scope": 1208, - "src": "16985:1456:0", + "scope": 1266, + "src": "16985:1456:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1047, + "id": 1105, "nodeType": "Block", - "src": "18596:170:0", + "src": "18596:170:1", "statements": [ { "assignments": [ - 1026 + 1084 ], "declarations": [ { "constant": false, - "id": 1026, + "id": 1084, "name": "timeSince", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18606:17:0", + "scope": 1106, + "src": "18606:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -30962,10 +30976,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1025, + "id": 1083, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "18606:7:0", + "src": "18606:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -30975,18 +30989,18 @@ "visibility": "internal" } ], - "id": 1031, + "id": 1089, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1029, + "id": 1087, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1020, - "src": "18634:12:0", + "referencedDeclaration": 1078, + "src": "18634:12:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -31002,32 +31016,32 @@ ], "expression": { "argumentTypes": null, - "id": 1027, + "id": 1085, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2531, - "src": "18626:3:0", + "referencedDeclaration": 5311, + "src": "18626:3:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1028, + "id": 1086, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "18626:7:0", + "referencedDeclaration": 4577, + "src": "18626:7:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1030, + "id": 1088, "isConstant": false, "isLValue": false, "isPure": false, @@ -31035,14 +31049,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18626:21:0", + "src": "18626:21:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "18606:41:0" + "src": "18606:41:1" }, { "expression": { @@ -31056,19 +31070,19 @@ "typeIdentifier": "t_uint32", "typeString": "uint32" }, - "id": 1034, + "id": 1092, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1032, + "id": 1090, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1018, - "src": "18678:12:0", + "referencedDeclaration": 1076, + "src": "18678:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -31079,14 +31093,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1033, + "id": 1091, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "18694:1:0", + "src": "18694:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -31094,7 +31108,7 @@ }, "value": "0" }, - "src": "18678:17:0", + "src": "18678:17:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31106,19 +31120,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1043, + "id": 1101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1036, + "id": 1094, "name": "timeSince", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1026, - "src": "18706:9:0", + "referencedDeclaration": 1084, + "src": "18706:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -31132,14 +31146,14 @@ { "argumentTypes": null, "hexValue": "33363030", - "id": 1041, + "id": 1099, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "18744:4:0", + "src": "18744:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_3600_by_1", @@ -31160,12 +31174,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1038, + "id": 1096, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1018, - "src": "18726:12:0", + "referencedDeclaration": 1076, + "src": "18726:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -31179,20 +31193,20 @@ "typeString": "uint32" } ], - "id": 1037, + "id": 1095, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "18718:7:0", + "src": "18718:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1039, + "id": 1097, "isConstant": false, "isLValue": false, "isPure": false, @@ -31200,27 +31214,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18718:21:0", + "src": "18718:21:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1040, + "id": 1098, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 2312, - "src": "18718:25:0", + "referencedDeclaration": 4529, + "src": "18718:25:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1042, + "id": 1100, "isConstant": false, "isLValue": false, "isPure": false, @@ -31228,36 +31242,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18718:31:0", + "src": "18718:31:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "18706:43:0", + "src": "18706:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1044, + "id": 1102, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "Conditional", - "src": "18678:71:0", + "src": "18678:71:1", "trueExpression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1035, + "id": 1093, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "18698:5:0", + "src": "18698:5:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -31271,28 +31285,28 @@ } } ], - "id": 1045, + "id": 1103, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "18664:95:0", + "src": "18664:95:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1024, - "id": 1046, + "functionReturnParameters": 1082, + "id": 1104, "nodeType": "Return", - "src": "18657:102:0" + "src": "18657:102:1" } ] }, "documentation": null, - "id": 1048, + "id": 1106, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -31300,16 +31314,16 @@ "name": "_isTimeLockExpired", "nodeType": "FunctionDefinition", "parameters": { - "id": 1021, + "id": 1079, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1018, + "id": 1076, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18484:19:0", + "scope": 1106, + "src": "18484:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -31317,10 +31331,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1017, + "id": 1075, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "18484:6:0", + "src": "18484:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -31331,11 +31345,11 @@ }, { "constant": false, - "id": 1020, + "id": 1078, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18513:20:0", + "scope": 1106, + "src": "18513:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -31343,10 +31357,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1019, + "id": 1077, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "18513:7:0", + "src": "18513:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -31356,20 +31370,20 @@ "visibility": "internal" } ], - "src": "18474:65:0" + "src": "18474:65:1" }, "payable": false, "returnParameters": { - "id": 1024, + "id": 1082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1023, + "id": 1081, "name": "", "nodeType": "VariableDeclaration", - "scope": 1048, - "src": "18586:4:0", + "scope": 1106, + "src": "18586:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -31377,10 +31391,10 @@ "typeString": "bool" }, "typeName": { - "id": 1022, + "id": 1080, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "18586:4:0", + "src": "18586:4:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31390,19 +31404,19 @@ "visibility": "internal" } ], - "src": "18585:6:0" + "src": "18585:6:1" }, - "scope": 1208, - "src": "18447:319:0", + "scope": 1266, + "src": "18447:319:1", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 1206, + "id": 1264, "nodeType": "Block", - "src": "19180:2156:0", + "src": "19180:2156:1", "statements": [ { "expression": { @@ -31414,19 +31428,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1074, + "id": 1132, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1072, + "id": 1130, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "19198:5:0", + "referencedDeclaration": 1108, + "src": "19198:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -31436,18 +31450,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 1073, + "id": 1131, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "19207:6:0", + "referencedDeclaration": 1110, + "src": "19207:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "19198:15:0", + "src": "19198:15:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31456,14 +31470,14 @@ { "argumentTypes": null, "hexValue": "427579657220616e642073656c6c6572206172652073616d65", - "id": 1075, + "id": 1133, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19215:27:0", + "src": "19215:27:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6141441751234d42e9a73d96317794195c7ff57b8f16ac15725a10f10763f824", @@ -31483,21 +31497,21 @@ "typeString": "literal_string \"Buyer and seller are same\"" } ], - "id": 1071, + "id": 1129, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19190:7:0", + "referencedDeclaration": 5313, + "src": "19190:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1076, + "id": 1134, "isConstant": false, "isLValue": false, "isPure": false, @@ -31505,15 +31519,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19190:53:0", + "src": "19190:53:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1077, + "id": 1135, "nodeType": "ExpressionStatement", - "src": "19190:53:0" + "src": "19190:53:1" }, { "expression": { @@ -31525,19 +31539,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1081, + "id": 1139, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1079, + "id": 1137, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "19310:5:0", + "referencedDeclaration": 1120, + "src": "19310:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -31548,14 +31562,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1080, + "id": 1138, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19318:1:0", + "src": "19318:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -31563,7 +31577,7 @@ }, "value": "0" }, - "src": "19310:9:0", + "src": "19310:9:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31572,14 +31586,14 @@ { "argumentTypes": null, "hexValue": "56616c7565207061737365642069732030", - "id": 1082, + "id": 1140, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19321:19:0", + "src": "19321:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3686f87c4804517ea83323ccf1a3b5b5ff52ed144b19e6fc56abe8fcd182e747", @@ -31599,21 +31613,21 @@ "typeString": "literal_string \"Value passed is 0\"" } ], - "id": 1078, + "id": 1136, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19302:7:0", + "referencedDeclaration": 5313, + "src": "19302:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1083, + "id": 1141, "isConstant": false, "isLValue": false, "isPure": false, @@ -31621,15 +31635,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19302:39:0", + "src": "19302:39:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1084, + "id": 1142, "nodeType": "ExpressionStatement", - "src": "19302:39:0" + "src": "19302:39:1" }, { "expression": { @@ -31641,19 +31655,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1088, + "id": 1146, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1086, + "id": 1144, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19431:9:0", + "referencedDeclaration": 1114, + "src": "19431:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -31664,14 +31678,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1087, + "id": 1145, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19443:1:0", + "src": "19443:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -31679,7 +31693,7 @@ }, "value": "0" }, - "src": "19431:13:0", + "src": "19431:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31688,14 +31702,14 @@ { "argumentTypes": null, "hexValue": "5468726573686f6c64206d7573742062652067726561746572207468616e2030", - "id": 1089, + "id": 1147, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19446:34:0", + "src": "19446:34:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_af363176b249b5431721df37c18f3ec7aee88ba5c53fea51e5672c2aa170b42e", @@ -31715,21 +31729,21 @@ "typeString": "literal_string \"Threshold must be greater than 0\"" } ], - "id": 1085, + "id": 1143, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19423:7:0", + "referencedDeclaration": 5313, + "src": "19423:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1090, + "id": 1148, "isConstant": false, "isLValue": false, "isPure": false, @@ -31737,15 +31751,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19423:58:0", + "src": "19423:58:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1091, + "id": 1149, "nodeType": "ExpressionStatement", - "src": "19423:58:0" + "src": "19423:58:1" }, { "expression": { @@ -31757,19 +31771,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1095, + "id": 1153, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1093, + "id": 1151, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19499:9:0", + "referencedDeclaration": 1114, + "src": "19499:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -31780,14 +31794,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "33", - "id": 1094, + "id": 1152, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19512:1:0", + "src": "19512:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_3_by_1", @@ -31795,7 +31809,7 @@ }, "value": "3" }, - "src": "19499:14:0", + "src": "19499:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31804,14 +31818,14 @@ { "argumentTypes": null, "hexValue": "5468726573686f6c64206d757374206e6f742062652067726561746572207468616e2033", - "id": 1096, + "id": 1154, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19515:38:0", + "src": "19515:38:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_788126a9367c6f683c74efd2399169e00771f5f0605bb406f99558c1c45363a0", @@ -31831,21 +31845,21 @@ "typeString": "literal_string \"Threshold must not be greater than 3\"" } ], - "id": 1092, + "id": 1150, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19491:7:0", + "referencedDeclaration": 5313, + "src": "19491:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1097, + "id": 1155, "isConstant": false, "isLValue": false, "isPure": false, @@ -31853,15 +31867,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19491:63:0", + "src": "19491:63:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1098, + "id": 1156, "nodeType": "ExpressionStatement", - "src": "19491:63:0" + "src": "19491:63:1" }, { "expression": { @@ -31873,7 +31887,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1108, + "id": 1166, "isConstant": false, "isLValue": false, "isPure": false, @@ -31884,19 +31898,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1102, + "id": 1160, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1100, + "id": 1158, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19704:9:0", + "referencedDeclaration": 1114, + "src": "19704:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -31907,14 +31921,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1101, + "id": 1159, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19717:1:0", + "src": "19717:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -31922,7 +31936,7 @@ }, "value": "1" }, - "src": "19704:14:0", + "src": "19704:14:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -31936,19 +31950,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1107, + "id": 1165, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1103, + "id": 1161, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "19722:9:0", + "referencedDeclaration": 1112, + "src": "19722:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -31962,14 +31976,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1105, + "id": 1163, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "19743:1:0", + "src": "19743:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -31985,20 +31999,20 @@ "typeString": "int_const 0" } ], - "id": 1104, + "id": 1162, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "19735:7:0", + "src": "19735:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 1106, + "id": 1164, "isConstant": false, "isLValue": false, "isPure": true, @@ -32006,19 +32020,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19735:10:0", + "src": "19735:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "19722:23:0", + "src": "19722:23:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "19704:41:0", + "src": "19704:41:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -32027,14 +32041,14 @@ { "argumentTypes": null, "hexValue": "456974686572207468726573686f6c642073686f756c642062652031206f722076616c6964206d6f64657261746f7220616464726573732073686f756c6420626520706173736564", - "id": 1109, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "19759:74:0", + "src": "19759:74:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2056db168725d2fabb8aaf14efad7a3fc12ef6bc7132f0596ea09b041b71cb25", @@ -32054,21 +32068,21 @@ "typeString": "literal_string \"Either threshold should be 1 or valid moderator address should be passed\"" } ], - "id": 1099, + "id": 1157, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19683:7:0", + "referencedDeclaration": 5313, + "src": "19683:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1110, + "id": 1168, "isConstant": false, "isLValue": false, "isPure": false, @@ -32076,15 +32090,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19683:160:0", + "src": "19683:160:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1111, + "id": 1169, "nodeType": "ExpressionStatement", - "src": "19683:160:0" + "src": "19683:160:1" }, { "expression": { @@ -32096,19 +32110,19 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 1123, + "id": 1181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1113, + "id": 1171, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "19875:10:0", + "referencedDeclaration": 1118, + "src": "19875:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -32121,12 +32135,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1115, + "id": 1173, "name": "uniqueId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1064, - "src": "19932:8:0", + "referencedDeclaration": 1122, + "src": "19932:8:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -32134,12 +32148,12 @@ }, { "argumentTypes": null, - "id": 1116, + "id": 1174, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "19958:9:0", + "referencedDeclaration": 1114, + "src": "19958:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -32147,12 +32161,12 @@ }, { "argumentTypes": null, - "id": 1117, + "id": 1175, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "19985:12:0", + "referencedDeclaration": 1116, + "src": "19985:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -32160,12 +32174,12 @@ }, { "argumentTypes": null, - "id": 1118, + "id": 1176, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20015:5:0", + "referencedDeclaration": 1108, + "src": "20015:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32173,12 +32187,12 @@ }, { "argumentTypes": null, - "id": 1119, + "id": 1177, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20038:6:0", + "referencedDeclaration": 1110, + "src": "20038:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32186,12 +32200,12 @@ }, { "argumentTypes": null, - "id": 1120, + "id": 1178, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20062:9:0", + "referencedDeclaration": 1112, + "src": "20062:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32199,12 +32213,12 @@ }, { "argumentTypes": null, - "id": 1121, + "id": 1179, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "20089:12:0", + "referencedDeclaration": 1126, + "src": "20089:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32242,18 +32256,18 @@ "typeString": "address" } ], - "id": 1114, + "id": 1172, "name": "calculateRedeemScriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 624, - "src": "19889:25:0", + "referencedDeclaration": 682, + "src": "19889:25:1", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes20_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$_t_address_$returns$_t_bytes32_$", "typeString": "function (bytes20,uint8,uint32,address,address,address,address) view returns (bytes32)" } }, - "id": 1122, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": false, @@ -32261,13 +32275,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19889:226:0", + "src": "19889:226:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "19875:240:0", + "src": "19875:240:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -32276,14 +32290,14 @@ { "argumentTypes": null, "hexValue": "43616c63756c6174656420736372697074206861736820646f6573206e6f74206d61746368207061737365642073637269707420686173682e", - "id": 1124, + "id": 1182, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "20129:59:0", + "src": "20129:59:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_0c041e0c58e6b0e01d338d852a5abb639065eabeb0aee05e0ce3e5f0e52b4f51", @@ -32303,21 +32317,21 @@ "typeString": "literal_string \"Calculated script hash does not match passed script hash.\"" } ], - "id": 1112, + "id": 1170, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "19854:7:0", + "referencedDeclaration": 5313, + "src": "19854:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1125, + "id": 1183, "isConstant": false, "isLValue": false, "isPure": false, @@ -32325,20 +32339,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "19854:344:0", + "src": "19854:344:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1126, + "id": 1184, "nodeType": "ExpressionStatement", - "src": "19854:344:0" + "src": "19854:344:1" }, { "expression": { "argumentTypes": null, - "id": 1144, + "id": 1202, "isConstant": false, "isLValue": false, "isPure": false, @@ -32347,26 +32361,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1127, + "id": 1185, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20209:12:0", + "referencedDeclaration": 133, + "src": "20209:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1129, + "id": 1187, "indexExpression": { "argumentTypes": null, - "id": 1128, + "id": 1186, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20222:10:0", + "referencedDeclaration": 1118, + "src": "20222:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -32377,9 +32391,9 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20209:24:0", + "src": "20209:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, @@ -32390,12 +32404,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1131, + "id": 1189, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20269:5:0", + "referencedDeclaration": 1108, + "src": "20269:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32403,12 +32417,12 @@ }, { "argumentTypes": null, - "id": 1132, + "id": 1190, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20296:6:0", + "referencedDeclaration": 1110, + "src": "20296:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32416,12 +32430,12 @@ }, { "argumentTypes": null, - "id": 1133, + "id": 1191, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20327:9:0", + "referencedDeclaration": 1112, + "src": "20327:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32429,12 +32443,12 @@ }, { "argumentTypes": null, - "id": 1134, + "id": 1192, "name": "value", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "20357:5:0", + "referencedDeclaration": 1120, + "src": "20357:5:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -32444,18 +32458,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1135, + "id": 1193, "name": "Status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 9, - "src": "20384:6:0", + "referencedDeclaration": 67, + "src": "20384:6:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_enum$_Status_$9_$", + "typeIdentifier": "t_type$_t_enum$_Status_$67_$", "typeString": "type(enum Escrow_v1_0.Status)" } }, - "id": 1136, + "id": 1194, "isConstant": false, "isLValue": false, "isPure": true, @@ -32463,9 +32477,9 @@ "memberName": "FUNDED", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "20384:13:0", + "src": "20384:13:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_Status_$9", + "typeIdentifier": "t_enum$_Status_$67", "typeString": "enum Escrow_v1_0.Status" } }, @@ -32473,18 +32487,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1137, + "id": 1195, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "20425:5:0", + "referencedDeclaration": 5299, + "src": "20425:5:1", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1138, + "id": 1196, "isConstant": false, "isLValue": false, "isPure": false, @@ -32492,7 +32506,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "20425:15:0", + "src": "20425:15:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -32500,12 +32514,12 @@ }, { "argumentTypes": null, - "id": 1139, + "id": 1197, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "20465:9:0", + "referencedDeclaration": 1114, + "src": "20465:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -32513,12 +32527,12 @@ }, { "argumentTypes": null, - "id": 1140, + "id": 1198, "name": "timeoutHours", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "20502:12:0", + "referencedDeclaration": 1116, + "src": "20502:12:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -32526,25 +32540,25 @@ }, { "argumentTypes": null, - "id": 1141, + "id": 1199, "name": "transactionType", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "20544:15:0", + "referencedDeclaration": 1124, + "src": "20544:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, { "argumentTypes": null, - "id": 1142, + "id": 1200, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "20586:12:0", + "referencedDeclaration": 1126, + "src": "20586:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32553,18 +32567,18 @@ ], "expression": { "argumentTypes": null, - "id": 1130, + "id": 1188, "name": "Transaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 71, - "src": "20236:11:0", + "referencedDeclaration": 129, + "src": "20236:11:1", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_Transaction_$71_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_Transaction_$129_storage_ptr_$", "typeString": "type(struct Escrow_v1_0.Transaction storage pointer)" } }, - "id": 1143, + "id": 1201, "isConstant": false, "isLValue": false, "isPure": false, @@ -32583,26 +32597,26 @@ "tokenAddress" ], "nodeType": "FunctionCall", - "src": "20236:373:0", + "src": "20236:373:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_memory", + "typeIdentifier": "t_struct$_Transaction_$129_memory", "typeString": "struct Escrow_v1_0.Transaction memory" } }, - "src": "20209:400:0", + "src": "20209:400:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1145, + "id": 1203, "nodeType": "ExpressionStatement", - "src": "20209:400:0" + "src": "20209:400:1" }, { "expression": { "argumentTypes": null, - "id": 1153, + "id": 1211, "isConstant": false, "isLValue": false, "isPure": false, @@ -32615,26 +32629,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1146, + "id": 1204, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20620:12:0", + "referencedDeclaration": 133, + "src": "20620:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1148, + "id": 1206, "indexExpression": { "argumentTypes": null, - "id": 1147, + "id": 1205, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20633:10:0", + "referencedDeclaration": 1118, + "src": "20633:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -32645,35 +32659,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20620:24:0", + "src": "20620:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1149, + "id": 1207, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20620:32:0", + "referencedDeclaration": 120, + "src": "20620:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1151, + "id": 1209, "indexExpression": { "argumentTypes": null, - "id": 1150, + "id": 1208, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "20653:6:0", + "referencedDeclaration": 1110, + "src": "20653:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32684,7 +32698,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20620:40:0", + "src": "20620:40:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -32695,14 +32709,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1152, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "20663:4:0", + "src": "20663:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -32710,20 +32724,20 @@ }, "value": "true" }, - "src": "20620:47:0", + "src": "20620:47:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1154, + "id": 1212, "nodeType": "ExpressionStatement", - "src": "20620:47:0" + "src": "20620:47:1" }, { "expression": { "argumentTypes": null, - "id": 1162, + "id": 1220, "isConstant": false, "isLValue": false, "isPure": false, @@ -32736,26 +32750,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1155, + "id": 1213, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20677:12:0", + "referencedDeclaration": 133, + "src": "20677:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1157, + "id": 1215, "indexExpression": { "argumentTypes": null, - "id": 1156, + "id": 1214, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20690:10:0", + "referencedDeclaration": 1118, + "src": "20690:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -32766,35 +32780,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20677:24:0", + "src": "20677:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1158, + "id": 1216, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20677:32:0", + "referencedDeclaration": 120, + "src": "20677:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1160, + "id": 1218, "indexExpression": { "argumentTypes": null, - "id": 1159, + "id": 1217, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "20710:5:0", + "referencedDeclaration": 1108, + "src": "20710:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32805,7 +32819,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "20677:39:0", + "src": "20677:39:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -32816,14 +32830,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1161, + "id": 1219, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "20719:4:0", + "src": "20719:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -32831,15 +32845,15 @@ }, "value": "true" }, - "src": "20677:46:0", + "src": "20677:46:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1163, + "id": 1221, "nodeType": "ExpressionStatement", - "src": "20677:46:0" + "src": "20677:46:1" }, { "expression": { @@ -32847,7 +32861,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1171, + "id": 1229, "isConstant": false, "isLValue": false, "isPure": false, @@ -32855,7 +32869,7 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "20818:44:0", + "src": "20818:44:1", "subExpression": { "argumentTypes": null, "baseExpression": { @@ -32864,26 +32878,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1165, + "id": 1223, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "20819:12:0", + "referencedDeclaration": 133, + "src": "20819:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1167, + "id": 1225, "indexExpression": { "argumentTypes": null, - "id": 1166, + "id": 1224, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "20832:10:0", + "referencedDeclaration": 1118, + "src": "20832:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -32894,35 +32908,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20819:24:0", + "src": "20819:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1168, + "id": 1226, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "20819:32:0", + "referencedDeclaration": 120, + "src": "20819:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1170, + "id": 1228, "indexExpression": { "argumentTypes": null, - "id": 1169, + "id": 1227, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "20852:9:0", + "referencedDeclaration": 1112, + "src": "20852:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -32933,7 +32947,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "20819:43:0", + "src": "20819:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -32947,14 +32961,14 @@ { "argumentTypes": null, "hexValue": "456974686572206275796572206f722073656c6c657220697320706173736564206173206d6f64657261746f72", - "id": 1172, + "id": 1230, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "20876:47:0", + "src": "20876:47:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_313b391557427937e7bdb85c7561d47c5b9c985755a448dd33a92026ffb38f8d", @@ -32974,21 +32988,21 @@ "typeString": "literal_string \"Either buyer or seller is passed as moderator\"" } ], - "id": 1164, + "id": 1222, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "20797:7:0", + "referencedDeclaration": 5313, + "src": "20797:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1173, + "id": 1231, "isConstant": false, "isLValue": false, "isPure": false, @@ -32996,15 +33010,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "20797:136:0", + "src": "20797:136:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1174, + "id": 1232, "nodeType": "ExpressionStatement", - "src": "20797:136:0" + "src": "20797:136:1" }, { "condition": { @@ -33013,19 +33027,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 1177, + "id": 1235, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1175, + "id": 1233, "name": "threshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1056, - "src": "21104:9:0", + "referencedDeclaration": 1114, + "src": "21104:9:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -33036,14 +33050,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 1176, + "id": 1234, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "21116:1:0", + "src": "21116:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -33051,25 +33065,25 @@ }, "value": "1" }, - "src": "21104:13:0", + "src": "21104:13:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1188, + "id": 1246, "nodeType": "IfStatement", - "src": "21100:94:0", + "src": "21100:94:1", "trueBody": { - "id": 1187, + "id": 1245, "nodeType": "Block", - "src": "21119:75:0", + "src": "21119:75:1", "statements": [ { "expression": { "argumentTypes": null, - "id": 1185, + "id": 1243, "isConstant": false, "isLValue": false, "isPure": false, @@ -33082,26 +33096,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1178, + "id": 1236, "name": "transactions", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 75, - "src": "21133:12:0", + "referencedDeclaration": 133, + "src": "21133:12:1", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$71_storage_$", + "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_Transaction_$129_storage_$", "typeString": "mapping(bytes32 => struct Escrow_v1_0.Transaction storage ref)" } }, - "id": 1180, + "id": 1238, "indexExpression": { "argumentTypes": null, - "id": 1179, + "id": 1237, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21146:10:0", + "referencedDeclaration": 1118, + "src": "21146:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -33112,35 +33126,35 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21133:24:0", + "src": "21133:24:1", "typeDescriptions": { - "typeIdentifier": "t_struct$_Transaction_$71_storage", + "typeIdentifier": "t_struct$_Transaction_$129_storage", "typeString": "struct Escrow_v1_0.Transaction storage ref" } }, - "id": 1181, + "id": 1239, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "isOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 62, - "src": "21133:32:0", + "referencedDeclaration": 120, + "src": "21133:32:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1183, + "id": 1241, "indexExpression": { "argumentTypes": null, - "id": 1182, + "id": 1240, "name": "moderator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1054, - "src": "21166:9:0", + "referencedDeclaration": 1112, + "src": "21166:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33151,7 +33165,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "21133:43:0", + "src": "21133:43:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -33162,14 +33176,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1184, + "id": 1242, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "21179:4:0", + "src": "21179:4:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -33177,15 +33191,15 @@ }, "value": "true" }, - "src": "21133:50:0", + "src": "21133:50:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1186, + "id": 1244, "nodeType": "ExpressionStatement", - "src": "21133:50:0" + "src": "21133:50:1" } ] } @@ -33193,7 +33207,7 @@ { "expression": { "argumentTypes": null, - "id": 1190, + "id": 1248, "isConstant": false, "isLValue": false, "isPure": false, @@ -33201,15 +33215,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "21205:18:0", + "src": "21205:18:1", "subExpression": { "argumentTypes": null, - "id": 1189, + "id": 1247, "name": "transactionCount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 78, - "src": "21205:16:0", + "referencedDeclaration": 136, + "src": "21205:16:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -33220,9 +33234,9 @@ "typeString": "uint256" } }, - "id": 1191, + "id": 1249, "nodeType": "ExpressionStatement", - "src": "21205:18:0" + "src": "21205:18:1" }, { "expression": { @@ -33230,12 +33244,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1196, + "id": 1254, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21265:10:0", + "referencedDeclaration": 1118, + "src": "21265:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -33253,26 +33267,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1192, + "id": 1250, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "21234:18:0", + "referencedDeclaration": 141, + "src": "21234:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 1194, + "id": 1252, "indexExpression": { "argumentTypes": null, - "id": 1193, + "id": 1251, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1050, - "src": "21253:5:0", + "referencedDeclaration": 1108, + "src": "21253:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33283,13 +33297,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21234:25:0", + "src": "21234:25:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "id": 1195, + "id": 1253, "isConstant": false, "isLValue": false, "isPure": false, @@ -33297,13 +33311,13 @@ "memberName": "push", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "21234:30:0", + "src": "21234:30:1", "typeDescriptions": { "typeIdentifier": "t_function_arraypush_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) returns (uint256)" } }, - "id": 1197, + "id": 1255, "isConstant": false, "isLValue": false, "isPure": false, @@ -33311,15 +33325,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "21234:42:0", + "src": "21234:42:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1198, + "id": 1256, "nodeType": "ExpressionStatement", - "src": "21234:42:0" + "src": "21234:42:1" }, { "expression": { @@ -33327,12 +33341,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1203, + "id": 1261, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1060, - "src": "21318:10:0", + "referencedDeclaration": 1118, + "src": "21318:10:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -33350,26 +33364,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1199, + "id": 1257, "name": "partyVsTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 83, - "src": "21286:18:0", + "referencedDeclaration": 141, + "src": "21286:18:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_bytes32_$dyn_storage_$", "typeString": "mapping(address => bytes32[] storage ref)" } }, - "id": 1201, + "id": 1259, "indexExpression": { "argumentTypes": null, - "id": 1200, + "id": 1258, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1052, - "src": "21305:6:0", + "referencedDeclaration": 1110, + "src": "21305:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33380,13 +33394,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "21286:26:0", + "src": "21286:26:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage", "typeString": "bytes32[] storage ref" } }, - "id": 1202, + "id": 1260, "isConstant": false, "isLValue": false, "isPure": false, @@ -33394,13 +33408,13 @@ "memberName": "push", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "21286:31:0", + "src": "21286:31:1", "typeDescriptions": { "typeIdentifier": "t_function_arraypush_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) returns (uint256)" } }, - "id": 1204, + "id": 1262, "isConstant": false, "isLValue": false, "isPure": false, @@ -33408,20 +33422,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "21286:43:0", + "src": "21286:43:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1205, + "id": 1263, "nodeType": "ExpressionStatement", - "src": "21286:43:0" + "src": "21286:43:1" } ] }, "documentation": "Private method to add transaction to reduce code redundancy", - "id": 1207, + "id": 1265, "implemented": true, "isConstructor": false, "isDeclaredConst": false, @@ -33429,16 +33443,16 @@ "name": "_addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1069, + "id": 1127, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1050, + "id": 1108, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18887:13:0", + "scope": 1265, + "src": "18887:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33446,10 +33460,10 @@ "typeString": "address" }, "typeName": { - "id": 1049, + "id": 1107, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18887:7:0", + "src": "18887:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33460,11 +33474,11 @@ }, { "constant": false, - "id": 1052, + "id": 1110, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18910:14:0", + "scope": 1265, + "src": "18910:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33472,10 +33486,10 @@ "typeString": "address" }, "typeName": { - "id": 1051, + "id": 1109, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18910:7:0", + "src": "18910:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33486,11 +33500,11 @@ }, { "constant": false, - "id": 1054, + "id": 1112, "name": "moderator", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18934:17:0", + "scope": 1265, + "src": "18934:17:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33498,10 +33512,10 @@ "typeString": "address" }, "typeName": { - "id": 1053, + "id": 1111, "name": "address", "nodeType": "ElementaryTypeName", - "src": "18934:7:0", + "src": "18934:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33512,11 +33526,11 @@ }, { "constant": false, - "id": 1056, + "id": 1114, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18961:15:0", + "scope": 1265, + "src": "18961:15:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33524,10 +33538,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1055, + "id": 1113, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "18961:5:0", + "src": "18961:5:1", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -33538,11 +33552,11 @@ }, { "constant": false, - "id": 1058, + "id": 1116, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "18986:19:0", + "scope": 1265, + "src": "18986:19:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33550,10 +33564,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1057, + "id": 1115, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "18986:6:0", + "src": "18986:6:1", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -33564,11 +33578,11 @@ }, { "constant": false, - "id": 1060, + "id": 1118, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19015:18:0", + "scope": 1265, + "src": "19015:18:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33576,10 +33590,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1059, + "id": 1117, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "19015:7:0", + "src": "19015:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -33590,11 +33604,11 @@ }, { "constant": false, - "id": 1062, + "id": 1120, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19043:13:0", + "scope": 1265, + "src": "19043:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33602,10 +33616,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1061, + "id": 1119, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "19043:7:0", + "src": "19043:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -33616,11 +33630,11 @@ }, { "constant": false, - "id": 1064, + "id": 1122, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19066:16:0", + "scope": 1265, + "src": "19066:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33628,10 +33642,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1063, + "id": 1121, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "19066:7:0", + "src": "19066:7:1", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -33642,26 +33656,26 @@ }, { "constant": false, - "id": 1066, + "id": 1124, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19092:31:0", + "scope": 1265, + "src": "19092:31:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" }, "typeName": { "contractScope": null, - "id": 1065, + "id": 1123, "name": "TransactionType", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 12, - "src": "19092:15:0", + "referencedDeclaration": 70, + "src": "19092:15:1", "typeDescriptions": { - "typeIdentifier": "t_enum$_TransactionType_$12", + "typeIdentifier": "t_enum$_TransactionType_$70", "typeString": "enum Escrow_v1_0.TransactionType" } }, @@ -33670,11 +33684,11 @@ }, { "constant": false, - "id": 1068, + "id": 1126, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1207, - "src": "19133:20:0", + "scope": 1265, + "src": "19133:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -33682,10 +33696,10 @@ "typeString": "address" }, "typeName": { - "id": 1067, + "id": 1125, "name": "address", "nodeType": "ElementaryTypeName", - "src": "19133:7:0", + "src": "19133:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -33695,33 +33709,122 @@ "visibility": "internal" } ], - "src": "18877:282:0" + "src": "18877:282:1" }, "payable": false, "returnParameters": { - "id": 1070, + "id": 1128, "nodeType": "ParameterList", "parameters": [], - "src": "19180:0:0" + "src": "19180:0:1" }, - "scope": 1208, - "src": "18853:2483:0", + "scope": 1266, + "src": "18853:2483:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "private" } ], - "scope": 1209, - "src": "603:20735:0" + "scope": 1267, + "src": "603:20735:1" } ], - "src": "0:21339:0" + "src": "0:21339:1" }, "compiler": { "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-03-09T15:48:44.490Z" + "networks": { + "1554199358609": { + "events": {}, + "links": {}, + "address": "0x3d784d6346BC2571DE4CD7f0E513e0F159d52099", + "transactionHash": "0xb3a5211d20d3d84dd66b054c0278e9d396ef51219843cc4b542e5a271bc250d2" + }, + "1554199463123": { + "events": {}, + "links": {}, + "address": "0x3d784d6346BC2571DE4CD7f0E513e0F159d52099", + "transactionHash": "0xb3a5211d20d3d84dd66b054c0278e9d396ef51219843cc4b542e5a271bc250d2" + }, + "1554199545405": { + "events": {}, + "links": {}, + "address": "0x3d784d6346BC2571DE4CD7f0E513e0F159d52099", + "transactionHash": "0xb3a5211d20d3d84dd66b054c0278e9d396ef51219843cc4b542e5a271bc250d2" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:51.661Z", + "devdoc": { + "methods": { + "addFundsToTransaction(bytes32)": { + "details": "Allows buyer of the transaction to add more funds(ether) in the transaction. This will help to cater scenarios wherein initially buyer missed to fund transaction as required", + "params": { + "scriptHash": "script hash of the transaction Only buyer of the transaction can invoke this method" + } + }, + "addTokenTransaction(address,address,address,uint8,uint32,bytes32,uint256,bytes20,address)": { + "details": "Add new transaction in the contract", + "params": { + "buyer": "The buyer of the transaction", + "moderator": "Moderator for this transaction", + "scriptHash": "keccak256 hash of the redeem script", + "seller": "The seller of the listing associated with the transaction", + "threshold": "Minimum number of signatures required to released funds", + "timeoutHours": "Hours after which seller can release funds into his favour by signing transaction unilaterally", + "tokenAddress": "Address of the token to be used Redeem Script format will be following: Approve escrow contract to spend amount of token on sender's behalf", + "uniqueId": "bytes20 unique id for the transaction, generated by ETH wallet", + "value": "Amount of tokens to be put in escrow" + } + }, + "addTokensToTransaction(bytes32,uint256)": { + "details": "Allows buyer of the transaction to add more funds(Tokens) in the transaction. This will help to cater scenarios wherein initially buyer missed to fund transaction as required", + "params": { + "scriptHash": "script hash of the transaction Only buyer of the transaction can invoke this method" + } + }, + "addTransaction(address,address,address,uint8,uint32,bytes32,bytes20)": { + "details": "Add new transaction in the contract", + "params": { + "buyer": "The buyer of the transaction", + "moderator": "Moderator for this transaction", + "scriptHash": "keccak256 hash of the redeem script", + "seller": "The seller of the listing associated with the transaction", + "threshold": "Minimum number of signatures required to released funds", + "timeoutHours": "Hours after which seller can release funds into his favour by signing transaction unilaterally", + "uniqueId": "bytes20 unique id for the transaction, generated by ETH wallet Redeem Script format will be following Pass amount of the ETH to be put in escrow" + } + }, + "checkBeneficiary(bytes32,address)": { + "details": "This method will check whether given address was a beneficiary of transaction execution or not", + "params": { + "beneficiary": "Beneficiary address to be checked", + "scriptHash": "script hash of the transaction" + } + }, + "checkVote(bytes32,address)": { + "details": "This method will check whether given party has voted or not", + "params": { + "party": "Address of the party whose vote has to be checked", + "scriptHash": "script hash of the transaction" + }, + "return": "bool vote" + } + } + }, + "userdoc": { + "methods": { + "calculateRedeemScriptHash(bytes20,uint8,uint32,address,address,address,address)": { + "notice": "dev Method for calculating script hash. Calculation will depend upon the type of transaction ETHER Type transaction-: Script Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller, moderator, multiSigContractAddress) TOKEN Type transaction Script Hash- keccak256(uniqueId, threshold, timeoutHours, buyer, seller, moderator, multiSigContractAddress, tokenAddress) Client can use this method to verify whether it has calculated correct script hash or not" + }, + "execute(uint8[],bytes32[],bytes32[],bytes32,address[],uint256[])": { + "notice": "dev This method will be used to release funds associated with the transaction Please see specs https://github.com/OpenBazaar/smart-contracts/blob/master/contracts/escrow/EscrowSpec.md param sigV Array containing V component of all the signatures param sigR Array containing R component of all the signatures param signS Array containing S component of all the signatures param scriptHash script hash of the transaction param destinations List of addresses who will receive funds param amounts amount released to each destination" + }, + "getAllTransactionsForParty(address)": { + "notice": "dev Returns all transaction ids for a party param partyAddress Address of the party" + } + } + } } \ No newline at end of file diff --git a/build/contracts/IEscrow.json b/build/contracts/IEscrow.json index 8967d16..27f8b48 100755 --- a/build/contracts/IEscrow.json +++ b/build/contracts/IEscrow.json @@ -259,21 +259,21 @@ "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/IEscrow.sol", "exportedSymbols": { "IEscrow": [ - 1322 + 1380 ] }, - "id": 1323, + "id": 1381, "nodeType": "SourceUnit", "nodes": [ { - "id": 1210, + "id": 1268, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:1" + "src": "0:23:2" }, { "baseContracts": [], @@ -281,9 +281,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 1322, + "id": 1380, "linearizedBaseContracts": [ - 1322 + 1380 ], "name": "IEscrow", "nodeType": "ContractDefinition", @@ -291,7 +291,7 @@ { "body": null, "documentation": null, - "id": 1233, + "id": 1291, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -299,16 +299,16 @@ "name": "transactions", "nodeType": "FunctionDefinition", "parameters": { - "id": 1213, + "id": 1271, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1212, + "id": 1270, "name": "_scriptHash", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "81:19:1", + "scope": 1291, + "src": "81:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -316,10 +316,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1211, + "id": 1269, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "81:7:1", + "src": "81:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -329,20 +329,20 @@ "visibility": "internal" } ], - "src": "71:35:1" + "src": "71:35:2" }, "payable": false, "returnParameters": { - "id": 1232, + "id": 1290, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1215, + "id": 1273, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "158:13:1", + "scope": 1291, + "src": "158:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -350,10 +350,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1214, + "id": 1272, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "158:7:1", + "src": "158:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -364,11 +364,11 @@ }, { "constant": false, - "id": 1217, + "id": 1275, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "185:20:1", + "scope": 1291, + "src": "185:20:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -376,10 +376,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1216, + "id": 1274, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "185:7:1", + "src": "185:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -390,11 +390,11 @@ }, { "constant": false, - "id": 1219, + "id": 1277, "name": "status", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "219:12:1", + "scope": 1291, + "src": "219:12:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -402,10 +402,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1218, + "id": 1276, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "219:5:1", + "src": "219:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -416,11 +416,11 @@ }, { "constant": false, - "id": 1221, + "id": 1279, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "245:21:1", + "scope": 1291, + "src": "245:21:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -428,10 +428,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1220, + "id": 1278, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "245:5:1", + "src": "245:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -442,11 +442,11 @@ }, { "constant": false, - "id": 1223, + "id": 1281, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "280:15:1", + "scope": 1291, + "src": "280:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -454,10 +454,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1222, + "id": 1280, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "280:5:1", + "src": "280:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -468,11 +468,11 @@ }, { "constant": false, - "id": 1225, + "id": 1283, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "309:19:1", + "scope": 1291, + "src": "309:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -480,10 +480,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1224, + "id": 1282, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "309:6:1", + "src": "309:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -494,11 +494,11 @@ }, { "constant": false, - "id": 1227, + "id": 1285, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "342:13:1", + "scope": 1291, + "src": "342:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -506,10 +506,10 @@ "typeString": "address" }, "typeName": { - "id": 1226, + "id": 1284, "name": "address", "nodeType": "ElementaryTypeName", - "src": "342:7:1", + "src": "342:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -520,11 +520,11 @@ }, { "constant": false, - "id": 1229, + "id": 1287, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "369:14:1", + "scope": 1291, + "src": "369:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -532,10 +532,10 @@ "typeString": "address" }, "typeName": { - "id": 1228, + "id": 1286, "name": "address", "nodeType": "ElementaryTypeName", - "src": "369:7:1", + "src": "369:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -546,11 +546,11 @@ }, { "constant": false, - "id": 1231, + "id": 1289, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "397:20:1", + "scope": 1291, + "src": "397:20:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -558,10 +558,10 @@ "typeString": "address" }, "typeName": { - "id": 1230, + "id": 1288, "name": "address", "nodeType": "ElementaryTypeName", - "src": "397:7:1", + "src": "397:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -571,10 +571,10 @@ "visibility": "internal" } ], - "src": "144:283:1" + "src": "144:283:2" }, - "scope": 1322, - "src": "50:378:1", + "scope": 1380, + "src": "50:378:2", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -582,7 +582,7 @@ { "body": null, "documentation": null, - "id": 1250, + "id": 1308, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -590,16 +590,16 @@ "name": "addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1248, + "id": 1306, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1235, + "id": 1293, "name": "_buyer", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "467:14:1", + "scope": 1308, + "src": "467:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -607,10 +607,10 @@ "typeString": "address" }, "typeName": { - "id": 1234, + "id": 1292, "name": "address", "nodeType": "ElementaryTypeName", - "src": "467:7:1", + "src": "467:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -621,11 +621,11 @@ }, { "constant": false, - "id": 1237, + "id": 1295, "name": "_seller", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "491:15:1", + "scope": 1308, + "src": "491:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -633,10 +633,10 @@ "typeString": "address" }, "typeName": { - "id": 1236, + "id": 1294, "name": "address", "nodeType": "ElementaryTypeName", - "src": "491:7:1", + "src": "491:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -647,11 +647,11 @@ }, { "constant": false, - "id": 1239, + "id": 1297, "name": "_moderator", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "516:18:1", + "scope": 1308, + "src": "516:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -659,10 +659,10 @@ "typeString": "address" }, "typeName": { - "id": 1238, + "id": 1296, "name": "address", "nodeType": "ElementaryTypeName", - "src": "516:7:1", + "src": "516:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -673,11 +673,11 @@ }, { "constant": false, - "id": 1241, + "id": 1299, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "544:15:1", + "scope": 1308, + "src": "544:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -685,10 +685,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1240, + "id": 1298, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "544:5:1", + "src": "544:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -699,11 +699,11 @@ }, { "constant": false, - "id": 1243, + "id": 1301, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "569:19:1", + "scope": 1308, + "src": "569:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -711,10 +711,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1242, + "id": 1300, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "569:6:1", + "src": "569:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -725,11 +725,11 @@ }, { "constant": false, - "id": 1245, + "id": 1303, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "598:18:1", + "scope": 1308, + "src": "598:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -737,10 +737,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1244, + "id": 1302, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "598:7:1", + "src": "598:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -751,11 +751,11 @@ }, { "constant": false, - "id": 1247, + "id": 1305, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "626:16:1", + "scope": 1308, + "src": "626:16:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -763,10 +763,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1246, + "id": 1304, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "626:7:1", + "src": "626:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -776,17 +776,17 @@ "visibility": "internal" } ], - "src": "457:191:1" + "src": "457:191:2" }, "payable": true, "returnParameters": { - "id": 1249, + "id": 1307, "nodeType": "ParameterList", "parameters": [], - "src": "673:0:1" + "src": "673:0:2" }, - "scope": 1322, - "src": "434:240:1", + "scope": 1380, + "src": "434:240:2", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -794,7 +794,7 @@ { "body": null, "documentation": null, - "id": 1271, + "id": 1329, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -802,16 +802,16 @@ "name": "addTokenTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1269, + "id": 1327, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1252, + "id": 1310, "name": "_buyer", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "718:14:1", + "scope": 1329, + "src": "718:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -819,10 +819,10 @@ "typeString": "address" }, "typeName": { - "id": 1251, + "id": 1309, "name": "address", "nodeType": "ElementaryTypeName", - "src": "718:7:1", + "src": "718:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -833,11 +833,11 @@ }, { "constant": false, - "id": 1254, + "id": 1312, "name": "_seller", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "742:15:1", + "scope": 1329, + "src": "742:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -845,10 +845,10 @@ "typeString": "address" }, "typeName": { - "id": 1253, + "id": 1311, "name": "address", "nodeType": "ElementaryTypeName", - "src": "742:7:1", + "src": "742:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -859,11 +859,11 @@ }, { "constant": false, - "id": 1256, + "id": 1314, "name": "_moderator", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "767:18:1", + "scope": 1329, + "src": "767:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -871,10 +871,10 @@ "typeString": "address" }, "typeName": { - "id": 1255, + "id": 1313, "name": "address", "nodeType": "ElementaryTypeName", - "src": "767:7:1", + "src": "767:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -885,11 +885,11 @@ }, { "constant": false, - "id": 1258, + "id": 1316, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "795:15:1", + "scope": 1329, + "src": "795:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -897,10 +897,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1257, + "id": 1315, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "795:5:1", + "src": "795:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -911,11 +911,11 @@ }, { "constant": false, - "id": 1260, + "id": 1318, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "820:19:1", + "scope": 1329, + "src": "820:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -923,10 +923,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1259, + "id": 1317, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "820:6:1", + "src": "820:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -937,11 +937,11 @@ }, { "constant": false, - "id": 1262, + "id": 1320, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "849:18:1", + "scope": 1329, + "src": "849:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -949,10 +949,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1261, + "id": 1319, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "849:7:1", + "src": "849:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -963,11 +963,11 @@ }, { "constant": false, - "id": 1264, + "id": 1322, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "877:13:1", + "scope": 1329, + "src": "877:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -975,10 +975,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1263, + "id": 1321, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "877:7:1", + "src": "877:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -989,11 +989,11 @@ }, { "constant": false, - "id": 1266, + "id": 1324, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "900:16:1", + "scope": 1329, + "src": "900:16:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1001,10 +1001,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1265, + "id": 1323, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "900:7:1", + "src": "900:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -1015,11 +1015,11 @@ }, { "constant": false, - "id": 1268, + "id": 1326, "name": "_tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "926:21:1", + "scope": 1329, + "src": "926:21:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1027,10 +1027,10 @@ "typeString": "address" }, "typeName": { - "id": 1267, + "id": 1325, "name": "address", "nodeType": "ElementaryTypeName", - "src": "926:7:1", + "src": "926:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1040,17 +1040,17 @@ "visibility": "internal" } ], - "src": "708:245:1" + "src": "708:245:2" }, "payable": false, "returnParameters": { - "id": 1270, + "id": 1328, "nodeType": "ParameterList", "parameters": [], - "src": "970:0:1" + "src": "970:0:2" }, - "scope": 1322, - "src": "680:291:1", + "scope": 1380, + "src": "680:291:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1058,7 +1058,7 @@ { "body": null, "documentation": null, - "id": 1276, + "id": 1334, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -1066,16 +1066,16 @@ "name": "addFundsToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1274, + "id": 1332, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1273, + "id": 1331, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1276, - "src": "1008:18:1", + "scope": 1334, + "src": "1008:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1083,10 +1083,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1272, + "id": 1330, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1008:7:1", + "src": "1008:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1096,17 +1096,17 @@ "visibility": "internal" } ], - "src": "1007:20:1" + "src": "1007:20:2" }, "payable": true, "returnParameters": { - "id": 1275, + "id": 1333, "nodeType": "ParameterList", "parameters": [], - "src": "1043:0:1" + "src": "1043:0:2" }, - "scope": 1322, - "src": "977:67:1", + "scope": 1380, + "src": "977:67:2", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -1114,7 +1114,7 @@ { "body": null, "documentation": null, - "id": 1283, + "id": 1341, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -1122,16 +1122,16 @@ "name": "addTokensToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1281, + "id": 1339, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1278, + "id": 1336, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1283, - "src": "1082:18:1", + "scope": 1341, + "src": "1082:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1139,10 +1139,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1277, + "id": 1335, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1082:7:1", + "src": "1082:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1153,11 +1153,11 @@ }, { "constant": false, - "id": 1280, + "id": 1338, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1283, - "src": "1102:13:1", + "scope": 1341, + "src": "1102:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1165,10 +1165,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1279, + "id": 1337, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1102:7:1", + "src": "1102:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1178,17 +1178,17 @@ "visibility": "internal" } ], - "src": "1081:35:1" + "src": "1081:35:2" }, "payable": false, "returnParameters": { - "id": 1282, + "id": 1340, "nodeType": "ParameterList", "parameters": [], - "src": "1124:0:1" + "src": "1124:0:2" }, - "scope": 1322, - "src": "1050:75:1", + "scope": 1380, + "src": "1050:75:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1196,7 +1196,7 @@ { "body": null, "documentation": null, - "id": 1303, + "id": 1361, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -1204,16 +1204,16 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 1301, + "id": 1359, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1286, + "id": 1344, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1157:12:1", + "scope": 1361, + "src": "1157:12:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1222,19 +1222,19 @@ }, "typeName": { "baseType": { - "id": 1284, + "id": 1342, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "1157:5:1", + "src": "1157:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 1285, + "id": 1343, "length": null, "nodeType": "ArrayTypeName", - "src": "1157:7:1", + "src": "1157:7:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -1245,11 +1245,11 @@ }, { "constant": false, - "id": 1289, + "id": 1347, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1179:14:1", + "scope": 1361, + "src": "1179:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1258,19 +1258,19 @@ }, "typeName": { "baseType": { - "id": 1287, + "id": 1345, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1179:7:1", + "src": "1179:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1288, + "id": 1346, "length": null, "nodeType": "ArrayTypeName", - "src": "1179:9:1", + "src": "1179:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -1281,11 +1281,11 @@ }, { "constant": false, - "id": 1292, + "id": 1350, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1203:14:1", + "scope": 1361, + "src": "1203:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1294,19 +1294,19 @@ }, "typeName": { "baseType": { - "id": 1290, + "id": 1348, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1203:7:1", + "src": "1203:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1291, + "id": 1349, "length": null, "nodeType": "ArrayTypeName", - "src": "1203:9:1", + "src": "1203:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -1317,11 +1317,11 @@ }, { "constant": false, - "id": 1294, + "id": 1352, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1227:18:1", + "scope": 1361, + "src": "1227:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1329,10 +1329,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1293, + "id": 1351, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1227:7:1", + "src": "1227:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1343,11 +1343,11 @@ }, { "constant": false, - "id": 1297, + "id": 1355, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1255:22:1", + "scope": 1361, + "src": "1255:22:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1356,19 +1356,19 @@ }, "typeName": { "baseType": { - "id": 1295, + "id": 1353, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1255:7:1", + "src": "1255:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1296, + "id": 1354, "length": null, "nodeType": "ArrayTypeName", - "src": "1255:9:1", + "src": "1255:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -1379,11 +1379,11 @@ }, { "constant": false, - "id": 1300, + "id": 1358, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1287:17:1", + "scope": 1361, + "src": "1287:17:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1392,19 +1392,19 @@ }, "typeName": { "baseType": { - "id": 1298, + "id": 1356, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1287:7:1", + "src": "1287:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1299, + "id": 1357, "length": null, "nodeType": "ArrayTypeName", - "src": "1287:9:1", + "src": "1287:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -1414,17 +1414,17 @@ "visibility": "internal" } ], - "src": "1147:163:1" + "src": "1147:163:2" }, "payable": false, "returnParameters": { - "id": 1302, + "id": 1360, "nodeType": "ParameterList", "parameters": [], - "src": "1327:0:1" + "src": "1327:0:2" }, - "scope": 1322, - "src": "1131:197:1", + "scope": 1380, + "src": "1131:197:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1432,7 +1432,7 @@ { "body": null, "documentation": null, - "id": 1312, + "id": 1370, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -1440,16 +1440,16 @@ "name": "checkBeneficiary", "nodeType": "FunctionDefinition", "parameters": { - "id": 1308, + "id": 1366, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1305, + "id": 1363, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1369:18:1", + "scope": 1370, + "src": "1369:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1457,10 +1457,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1304, + "id": 1362, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1369:7:1", + "src": "1369:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1471,11 +1471,11 @@ }, { "constant": false, - "id": 1307, + "id": 1365, "name": "beneficiary", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1397:19:1", + "scope": 1370, + "src": "1397:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1483,10 +1483,10 @@ "typeString": "address" }, "typeName": { - "id": 1306, + "id": 1364, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1397:7:1", + "src": "1397:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1496,20 +1496,20 @@ "visibility": "internal" } ], - "src": "1359:63:1" + "src": "1359:63:2" }, "payable": false, "returnParameters": { - "id": 1311, + "id": 1369, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1310, + "id": 1368, "name": "check", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1469:10:1", + "scope": 1370, + "src": "1469:10:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1517,10 +1517,10 @@ "typeString": "bool" }, "typeName": { - "id": 1309, + "id": 1367, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1469:4:1", + "src": "1469:4:2", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1530,10 +1530,10 @@ "visibility": "internal" } ], - "src": "1468:12:1" + "src": "1468:12:2" }, - "scope": 1322, - "src": "1334:147:1", + "scope": 1380, + "src": "1334:147:2", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1541,7 +1541,7 @@ { "body": null, "documentation": null, - "id": 1321, + "id": 1379, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -1549,16 +1549,16 @@ "name": "checkVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 1317, + "id": 1375, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1314, + "id": 1372, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1515:18:1", + "scope": 1379, + "src": "1515:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1566,10 +1566,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1313, + "id": 1371, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1515:7:1", + "src": "1515:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1580,11 +1580,11 @@ }, { "constant": false, - "id": 1316, + "id": 1374, "name": "party", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1543:13:1", + "scope": 1379, + "src": "1543:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1592,10 +1592,10 @@ "typeString": "address" }, "typeName": { - "id": 1315, + "id": 1373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1543:7:1", + "src": "1543:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1605,20 +1605,20 @@ "visibility": "internal" } ], - "src": "1505:57:1" + "src": "1505:57:2" }, "payable": false, "returnParameters": { - "id": 1320, + "id": 1378, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1319, + "id": 1377, "name": "vote", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1609:9:1", + "scope": 1379, + "src": "1609:9:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1626,10 +1626,10 @@ "typeString": "bool" }, "typeName": { - "id": 1318, + "id": 1376, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1609:4:1", + "src": "1609:4:2", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1639,40 +1639,40 @@ "visibility": "internal" } ], - "src": "1608:11:1" + "src": "1608:11:2" }, - "scope": 1322, - "src": "1487:133:1", + "scope": 1380, + "src": "1487:133:2", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1323, - "src": "25:1597:1" + "scope": 1381, + "src": "25:1597:2" } ], - "src": "0:1623:1" + "src": "0:1623:2" }, "legacyAST": { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/IEscrow.sol", "exportedSymbols": { "IEscrow": [ - 1322 + 1380 ] }, - "id": 1323, + "id": 1381, "nodeType": "SourceUnit", "nodes": [ { - "id": 1210, + "id": 1268, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "0:23:1" + "src": "0:23:2" }, { "baseContracts": [], @@ -1680,9 +1680,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 1322, + "id": 1380, "linearizedBaseContracts": [ - 1322 + 1380 ], "name": "IEscrow", "nodeType": "ContractDefinition", @@ -1690,7 +1690,7 @@ { "body": null, "documentation": null, - "id": 1233, + "id": 1291, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -1698,16 +1698,16 @@ "name": "transactions", "nodeType": "FunctionDefinition", "parameters": { - "id": 1213, + "id": 1271, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1212, + "id": 1270, "name": "_scriptHash", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "81:19:1", + "scope": 1291, + "src": "81:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1715,10 +1715,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1211, + "id": 1269, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "81:7:1", + "src": "81:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1728,20 +1728,20 @@ "visibility": "internal" } ], - "src": "71:35:1" + "src": "71:35:2" }, "payable": false, "returnParameters": { - "id": 1232, + "id": 1290, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1215, + "id": 1273, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "158:13:1", + "scope": 1291, + "src": "158:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1749,10 +1749,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1214, + "id": 1272, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "158:7:1", + "src": "158:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1763,11 +1763,11 @@ }, { "constant": false, - "id": 1217, + "id": 1275, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "185:20:1", + "scope": 1291, + "src": "185:20:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1775,10 +1775,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1216, + "id": 1274, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "185:7:1", + "src": "185:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1789,11 +1789,11 @@ }, { "constant": false, - "id": 1219, + "id": 1277, "name": "status", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "219:12:1", + "scope": 1291, + "src": "219:12:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1801,10 +1801,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1218, + "id": 1276, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "219:5:1", + "src": "219:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -1815,11 +1815,11 @@ }, { "constant": false, - "id": 1221, + "id": 1279, "name": "transactionType", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "245:21:1", + "scope": 1291, + "src": "245:21:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1827,10 +1827,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1220, + "id": 1278, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "245:5:1", + "src": "245:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -1841,11 +1841,11 @@ }, { "constant": false, - "id": 1223, + "id": 1281, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "280:15:1", + "scope": 1291, + "src": "280:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1853,10 +1853,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1222, + "id": 1280, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "280:5:1", + "src": "280:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -1867,11 +1867,11 @@ }, { "constant": false, - "id": 1225, + "id": 1283, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "309:19:1", + "scope": 1291, + "src": "309:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1879,10 +1879,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1224, + "id": 1282, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "309:6:1", + "src": "309:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1893,11 +1893,11 @@ }, { "constant": false, - "id": 1227, + "id": 1285, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "342:13:1", + "scope": 1291, + "src": "342:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1905,10 +1905,10 @@ "typeString": "address" }, "typeName": { - "id": 1226, + "id": 1284, "name": "address", "nodeType": "ElementaryTypeName", - "src": "342:7:1", + "src": "342:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1919,11 +1919,11 @@ }, { "constant": false, - "id": 1229, + "id": 1287, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "369:14:1", + "scope": 1291, + "src": "369:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1931,10 +1931,10 @@ "typeString": "address" }, "typeName": { - "id": 1228, + "id": 1286, "name": "address", "nodeType": "ElementaryTypeName", - "src": "369:7:1", + "src": "369:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1945,11 +1945,11 @@ }, { "constant": false, - "id": 1231, + "id": 1289, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1233, - "src": "397:20:1", + "scope": 1291, + "src": "397:20:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1957,10 +1957,10 @@ "typeString": "address" }, "typeName": { - "id": 1230, + "id": 1288, "name": "address", "nodeType": "ElementaryTypeName", - "src": "397:7:1", + "src": "397:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1970,10 +1970,10 @@ "visibility": "internal" } ], - "src": "144:283:1" + "src": "144:283:2" }, - "scope": 1322, - "src": "50:378:1", + "scope": 1380, + "src": "50:378:2", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1981,7 +1981,7 @@ { "body": null, "documentation": null, - "id": 1250, + "id": 1308, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -1989,16 +1989,16 @@ "name": "addTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1248, + "id": 1306, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1235, + "id": 1293, "name": "_buyer", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "467:14:1", + "scope": 1308, + "src": "467:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2006,10 +2006,10 @@ "typeString": "address" }, "typeName": { - "id": 1234, + "id": 1292, "name": "address", "nodeType": "ElementaryTypeName", - "src": "467:7:1", + "src": "467:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2020,11 +2020,11 @@ }, { "constant": false, - "id": 1237, + "id": 1295, "name": "_seller", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "491:15:1", + "scope": 1308, + "src": "491:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2032,10 +2032,10 @@ "typeString": "address" }, "typeName": { - "id": 1236, + "id": 1294, "name": "address", "nodeType": "ElementaryTypeName", - "src": "491:7:1", + "src": "491:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2046,11 +2046,11 @@ }, { "constant": false, - "id": 1239, + "id": 1297, "name": "_moderator", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "516:18:1", + "scope": 1308, + "src": "516:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2058,10 +2058,10 @@ "typeString": "address" }, "typeName": { - "id": 1238, + "id": 1296, "name": "address", "nodeType": "ElementaryTypeName", - "src": "516:7:1", + "src": "516:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2072,11 +2072,11 @@ }, { "constant": false, - "id": 1241, + "id": 1299, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "544:15:1", + "scope": 1308, + "src": "544:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2084,10 +2084,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1240, + "id": 1298, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "544:5:1", + "src": "544:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -2098,11 +2098,11 @@ }, { "constant": false, - "id": 1243, + "id": 1301, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "569:19:1", + "scope": 1308, + "src": "569:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2110,10 +2110,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1242, + "id": 1300, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "569:6:1", + "src": "569:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -2124,11 +2124,11 @@ }, { "constant": false, - "id": 1245, + "id": 1303, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "598:18:1", + "scope": 1308, + "src": "598:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2136,10 +2136,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1244, + "id": 1302, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "598:7:1", + "src": "598:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2150,11 +2150,11 @@ }, { "constant": false, - "id": 1247, + "id": 1305, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1250, - "src": "626:16:1", + "scope": 1308, + "src": "626:16:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2162,10 +2162,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1246, + "id": 1304, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "626:7:1", + "src": "626:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -2175,17 +2175,17 @@ "visibility": "internal" } ], - "src": "457:191:1" + "src": "457:191:2" }, "payable": true, "returnParameters": { - "id": 1249, + "id": 1307, "nodeType": "ParameterList", "parameters": [], - "src": "673:0:1" + "src": "673:0:2" }, - "scope": 1322, - "src": "434:240:1", + "scope": 1380, + "src": "434:240:2", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -2193,7 +2193,7 @@ { "body": null, "documentation": null, - "id": 1271, + "id": 1329, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -2201,16 +2201,16 @@ "name": "addTokenTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1269, + "id": 1327, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1252, + "id": 1310, "name": "_buyer", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "718:14:1", + "scope": 1329, + "src": "718:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2218,10 +2218,10 @@ "typeString": "address" }, "typeName": { - "id": 1251, + "id": 1309, "name": "address", "nodeType": "ElementaryTypeName", - "src": "718:7:1", + "src": "718:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2232,11 +2232,11 @@ }, { "constant": false, - "id": 1254, + "id": 1312, "name": "_seller", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "742:15:1", + "scope": 1329, + "src": "742:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2244,10 +2244,10 @@ "typeString": "address" }, "typeName": { - "id": 1253, + "id": 1311, "name": "address", "nodeType": "ElementaryTypeName", - "src": "742:7:1", + "src": "742:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2258,11 +2258,11 @@ }, { "constant": false, - "id": 1256, + "id": 1314, "name": "_moderator", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "767:18:1", + "scope": 1329, + "src": "767:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2270,10 +2270,10 @@ "typeString": "address" }, "typeName": { - "id": 1255, + "id": 1313, "name": "address", "nodeType": "ElementaryTypeName", - "src": "767:7:1", + "src": "767:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2284,11 +2284,11 @@ }, { "constant": false, - "id": 1258, + "id": 1316, "name": "threshold", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "795:15:1", + "scope": 1329, + "src": "795:15:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2296,10 +2296,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1257, + "id": 1315, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "795:5:1", + "src": "795:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -2310,11 +2310,11 @@ }, { "constant": false, - "id": 1260, + "id": 1318, "name": "timeoutHours", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "820:19:1", + "scope": 1329, + "src": "820:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2322,10 +2322,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1259, + "id": 1317, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "820:6:1", + "src": "820:6:2", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -2336,11 +2336,11 @@ }, { "constant": false, - "id": 1262, + "id": 1320, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "849:18:1", + "scope": 1329, + "src": "849:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2348,10 +2348,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1261, + "id": 1319, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "849:7:1", + "src": "849:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2362,11 +2362,11 @@ }, { "constant": false, - "id": 1264, + "id": 1322, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "877:13:1", + "scope": 1329, + "src": "877:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2374,10 +2374,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1263, + "id": 1321, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "877:7:1", + "src": "877:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2388,11 +2388,11 @@ }, { "constant": false, - "id": 1266, + "id": 1324, "name": "uniqueId", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "900:16:1", + "scope": 1329, + "src": "900:16:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2400,10 +2400,10 @@ "typeString": "bytes20" }, "typeName": { - "id": 1265, + "id": 1323, "name": "bytes20", "nodeType": "ElementaryTypeName", - "src": "900:7:1", + "src": "900:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -2414,11 +2414,11 @@ }, { "constant": false, - "id": 1268, + "id": 1326, "name": "_tokenAddress", "nodeType": "VariableDeclaration", - "scope": 1271, - "src": "926:21:1", + "scope": 1329, + "src": "926:21:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2426,10 +2426,10 @@ "typeString": "address" }, "typeName": { - "id": 1267, + "id": 1325, "name": "address", "nodeType": "ElementaryTypeName", - "src": "926:7:1", + "src": "926:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2439,17 +2439,17 @@ "visibility": "internal" } ], - "src": "708:245:1" + "src": "708:245:2" }, "payable": false, "returnParameters": { - "id": 1270, + "id": 1328, "nodeType": "ParameterList", "parameters": [], - "src": "970:0:1" + "src": "970:0:2" }, - "scope": 1322, - "src": "680:291:1", + "scope": 1380, + "src": "680:291:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -2457,7 +2457,7 @@ { "body": null, "documentation": null, - "id": 1276, + "id": 1334, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -2465,16 +2465,16 @@ "name": "addFundsToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1274, + "id": 1332, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1273, + "id": 1331, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1276, - "src": "1008:18:1", + "scope": 1334, + "src": "1008:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2482,10 +2482,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1272, + "id": 1330, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1008:7:1", + "src": "1008:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2495,17 +2495,17 @@ "visibility": "internal" } ], - "src": "1007:20:1" + "src": "1007:20:2" }, "payable": true, "returnParameters": { - "id": 1275, + "id": 1333, "nodeType": "ParameterList", "parameters": [], - "src": "1043:0:1" + "src": "1043:0:2" }, - "scope": 1322, - "src": "977:67:1", + "scope": 1380, + "src": "977:67:2", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -2513,7 +2513,7 @@ { "body": null, "documentation": null, - "id": 1283, + "id": 1341, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -2521,16 +2521,16 @@ "name": "addTokensToTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 1281, + "id": 1339, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1278, + "id": 1336, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1283, - "src": "1082:18:1", + "scope": 1341, + "src": "1082:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2538,10 +2538,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1277, + "id": 1335, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1082:7:1", + "src": "1082:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2552,11 +2552,11 @@ }, { "constant": false, - "id": 1280, + "id": 1338, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1283, - "src": "1102:13:1", + "scope": 1341, + "src": "1102:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2564,10 +2564,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1279, + "id": 1337, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1102:7:1", + "src": "1102:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2577,17 +2577,17 @@ "visibility": "internal" } ], - "src": "1081:35:1" + "src": "1081:35:2" }, "payable": false, "returnParameters": { - "id": 1282, + "id": 1340, "nodeType": "ParameterList", "parameters": [], - "src": "1124:0:1" + "src": "1124:0:2" }, - "scope": 1322, - "src": "1050:75:1", + "scope": 1380, + "src": "1050:75:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -2595,7 +2595,7 @@ { "body": null, "documentation": null, - "id": 1303, + "id": 1361, "implemented": false, "isConstructor": false, "isDeclaredConst": false, @@ -2603,16 +2603,16 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 1301, + "id": 1359, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1286, + "id": 1344, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1157:12:1", + "scope": 1361, + "src": "1157:12:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2621,19 +2621,19 @@ }, "typeName": { "baseType": { - "id": 1284, + "id": 1342, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "1157:5:1", + "src": "1157:5:2", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 1285, + "id": 1343, "length": null, "nodeType": "ArrayTypeName", - "src": "1157:7:1", + "src": "1157:7:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -2644,11 +2644,11 @@ }, { "constant": false, - "id": 1289, + "id": 1347, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1179:14:1", + "scope": 1361, + "src": "1179:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2657,19 +2657,19 @@ }, "typeName": { "baseType": { - "id": 1287, + "id": 1345, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1179:7:1", + "src": "1179:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1288, + "id": 1346, "length": null, "nodeType": "ArrayTypeName", - "src": "1179:9:1", + "src": "1179:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -2680,11 +2680,11 @@ }, { "constant": false, - "id": 1292, + "id": 1350, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1203:14:1", + "scope": 1361, + "src": "1203:14:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2693,19 +2693,19 @@ }, "typeName": { "baseType": { - "id": 1290, + "id": 1348, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1203:7:1", + "src": "1203:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1291, + "id": 1349, "length": null, "nodeType": "ArrayTypeName", - "src": "1203:9:1", + "src": "1203:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -2716,11 +2716,11 @@ }, { "constant": false, - "id": 1294, + "id": 1352, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1227:18:1", + "scope": 1361, + "src": "1227:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2728,10 +2728,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1293, + "id": 1351, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1227:7:1", + "src": "1227:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2742,11 +2742,11 @@ }, { "constant": false, - "id": 1297, + "id": 1355, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1255:22:1", + "scope": 1361, + "src": "1255:22:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2755,19 +2755,19 @@ }, "typeName": { "baseType": { - "id": 1295, + "id": 1353, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1255:7:1", + "src": "1255:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1296, + "id": 1354, "length": null, "nodeType": "ArrayTypeName", - "src": "1255:9:1", + "src": "1255:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -2778,11 +2778,11 @@ }, { "constant": false, - "id": 1300, + "id": 1358, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1303, - "src": "1287:17:1", + "scope": 1361, + "src": "1287:17:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2791,19 +2791,19 @@ }, "typeName": { "baseType": { - "id": 1298, + "id": 1356, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1287:7:1", + "src": "1287:7:2", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1299, + "id": 1357, "length": null, "nodeType": "ArrayTypeName", - "src": "1287:9:1", + "src": "1287:9:2", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -2813,17 +2813,17 @@ "visibility": "internal" } ], - "src": "1147:163:1" + "src": "1147:163:2" }, "payable": false, "returnParameters": { - "id": 1302, + "id": 1360, "nodeType": "ParameterList", "parameters": [], - "src": "1327:0:1" + "src": "1327:0:2" }, - "scope": 1322, - "src": "1131:197:1", + "scope": 1380, + "src": "1131:197:2", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -2831,7 +2831,7 @@ { "body": null, "documentation": null, - "id": 1312, + "id": 1370, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -2839,16 +2839,16 @@ "name": "checkBeneficiary", "nodeType": "FunctionDefinition", "parameters": { - "id": 1308, + "id": 1366, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1305, + "id": 1363, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1369:18:1", + "scope": 1370, + "src": "1369:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2856,10 +2856,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1304, + "id": 1362, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1369:7:1", + "src": "1369:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2870,11 +2870,11 @@ }, { "constant": false, - "id": 1307, + "id": 1365, "name": "beneficiary", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1397:19:1", + "scope": 1370, + "src": "1397:19:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2882,10 +2882,10 @@ "typeString": "address" }, "typeName": { - "id": 1306, + "id": 1364, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1397:7:1", + "src": "1397:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2895,20 +2895,20 @@ "visibility": "internal" } ], - "src": "1359:63:1" + "src": "1359:63:2" }, "payable": false, "returnParameters": { - "id": 1311, + "id": 1369, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1310, + "id": 1368, "name": "check", "nodeType": "VariableDeclaration", - "scope": 1312, - "src": "1469:10:1", + "scope": 1370, + "src": "1469:10:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2916,10 +2916,10 @@ "typeString": "bool" }, "typeName": { - "id": 1309, + "id": 1367, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1469:4:1", + "src": "1469:4:2", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2929,10 +2929,10 @@ "visibility": "internal" } ], - "src": "1468:12:1" + "src": "1468:12:2" }, - "scope": 1322, - "src": "1334:147:1", + "scope": 1380, + "src": "1334:147:2", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -2940,7 +2940,7 @@ { "body": null, "documentation": null, - "id": 1321, + "id": 1379, "implemented": false, "isConstructor": false, "isDeclaredConst": true, @@ -2948,16 +2948,16 @@ "name": "checkVote", "nodeType": "FunctionDefinition", "parameters": { - "id": 1317, + "id": 1375, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1314, + "id": 1372, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1515:18:1", + "scope": 1379, + "src": "1515:18:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2965,10 +2965,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1313, + "id": 1371, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1515:7:1", + "src": "1515:7:2", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2979,11 +2979,11 @@ }, { "constant": false, - "id": 1316, + "id": 1374, "name": "party", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1543:13:1", + "scope": 1379, + "src": "1543:13:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2991,10 +2991,10 @@ "typeString": "address" }, "typeName": { - "id": 1315, + "id": 1373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1543:7:1", + "src": "1543:7:2", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3004,20 +3004,20 @@ "visibility": "internal" } ], - "src": "1505:57:1" + "src": "1505:57:2" }, "payable": false, "returnParameters": { - "id": 1320, + "id": 1378, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1319, + "id": 1377, "name": "vote", "nodeType": "VariableDeclaration", - "scope": 1321, - "src": "1609:9:1", + "scope": 1379, + "src": "1609:9:2", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3025,10 +3025,10 @@ "typeString": "bool" }, "typeName": { - "id": 1318, + "id": 1376, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1609:4:1", + "src": "1609:4:2", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3038,26 +3038,32 @@ "visibility": "internal" } ], - "src": "1608:11:1" + "src": "1608:11:2" }, - "scope": 1322, - "src": "1487:133:1", + "scope": 1380, + "src": "1487:133:2", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1323, - "src": "25:1597:1" + "scope": 1381, + "src": "25:1597:2" } ], - "src": "0:1623:1" + "src": "0:1623:2" }, "compiler": { "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-03-09T15:48:44.470Z" + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:02:53.420Z", + "devdoc": { + "methods": {} + }, + "userdoc": { + "methods": {} + } } \ No newline at end of file diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json index 6e1ffe4..67ecdc0 100755 --- a/build/contracts/Migrations.json +++ b/build/contracts/Migrations.json @@ -13,7 +13,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x445df0ac" }, { "constant": true, @@ -27,13 +28,15 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8da5cb5b" }, { "inputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "constant": false, @@ -47,7 +50,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xfdacd576" }, { "constant": false, @@ -61,7 +65,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x0900f010" } ], "bytecode": "0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102f8806100606000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100aa5780638da5cb5b146100d5578063fdacd5761461012c575b600080fd5b34801561007357600080fd5b506100a8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610159565b005b3480156100b657600080fd5b506100bf610241565b6040518082815260200191505060405180910390f35b3480156100e157600080fd5b506100ea610247565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561013857600080fd5b506101576004803603810190808035906020019092919050505061026c565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561023d578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561022457600080fd5b505af1158015610238573d6000803e3d6000fd5b505050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102c957806001819055505b505600a165627a7a723058203551d036842be1fde9d336350607b240e04761b759edd07e863d32af3a28a3b10029", @@ -1390,7 +1395,26 @@ "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-02-26T06:26:12.976Z" + "networks": { + "1554199358609": { + "events": {}, + "links": {}, + "address": "0x54e76C101DFD25f48B05289B9aea0Ef6125aa719", + "transactionHash": "0xb0b8dd6a9df389ba50b76aa99b6d6c4dd975474f7cd9501d93accba0bc284973" + }, + "1554199463123": { + "events": {}, + "links": {}, + "address": "0x54e76C101DFD25f48B05289B9aea0Ef6125aa719", + "transactionHash": "0xb0b8dd6a9df389ba50b76aa99b6d6c4dd975474f7cd9501d93accba0bc284973" + }, + "1554199545405": { + "events": {}, + "links": {}, + "address": "0x54e76C101DFD25f48B05289B9aea0Ef6125aa719", + "transactionHash": "0xb0b8dd6a9df389ba50b76aa99b6d6c4dd975474f7cd9501d93accba0bc284973" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:51.942Z" } \ No newline at end of file diff --git a/build/contracts/OBRewards.json b/build/contracts/OBRewards.json index 6ad9a82..dc0c1a7 100755 --- a/build/contracts/OBRewards.json +++ b/build/contracts/OBRewards.json @@ -18,7 +18,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x0d80149d" }, { "constant": true, @@ -32,7 +33,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x676c4771" }, { "constant": true, @@ -46,7 +48,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6a3467a5" }, { "constant": false, @@ -55,7 +58,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x715018a6" }, { "constant": true, @@ -69,7 +73,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x85788f6f" }, { "constant": true, @@ -83,7 +88,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8da5cb5b" }, { "constant": true, @@ -97,7 +103,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8f32d59b" }, { "constant": true, @@ -111,7 +118,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc24a0f8b" }, { "constant": true, @@ -125,7 +133,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xd2f343c7" }, { "constant": true, @@ -139,7 +148,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xd8f163ab" }, { "constant": true, @@ -153,7 +163,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xe42a96e7" }, { "constant": false, @@ -167,7 +178,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf2fde38b" }, { "constant": true, @@ -181,7 +193,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf6c5aeb2" }, { "inputs": [ @@ -204,7 +217,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -231,7 +245,8 @@ } ], "name": "SuccessfulClaim", - "type": "event" + "type": "event", + "signature": "0xdb28ff209f2a631171420977162edbe85659d93149d92f69f81260675f546a3a" }, { "anonymous": false, @@ -253,7 +268,8 @@ } ], "name": "UnsuccessfulClaim", - "type": "event" + "type": "event", + "signature": "0xf939e9640bc0433f3e944a23fbb977ee3d326f2523da16c258cce16734a1c4cf" }, { "anonymous": false, @@ -265,7 +281,8 @@ } ], "name": "PromotedSellersAdded", - "type": "event" + "type": "event", + "signature": "0xa61ea6f08d34b0cf93586736a7fdd8becfc2d5f8443cd5fa4e27d7ae0f0c9975" }, { "anonymous": false, @@ -277,13 +294,15 @@ } ], "name": "PromotedSellersRemoved", - "type": "event" + "type": "event", + "signature": "0x5d3cc1ddd817cba6d86bf4cb3d582965e47b25685de10dcfe87dcb8607ba5630" }, { "anonymous": false, "inputs": [], "name": "RewardsOn", - "type": "event" + "type": "event", + "signature": "0xfb3ffd640eb2af7384a797d8a341f421615d81ef4e03359874984268cbd9003a" }, { "anonymous": false, @@ -295,7 +314,8 @@ } ], "name": "EndDateChanged", - "type": "event" + "type": "event", + "signature": "0x78f20fcb2c7d71918cb4f6b5e6c6eb0bf4ed26c77d48c64a29c6f448c40d9ae8" }, { "anonymous": false, @@ -312,7 +332,8 @@ } ], "name": "OwnershipTransferred", - "type": "event" + "type": "event", + "signature": "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0" }, { "constant": false, @@ -326,7 +347,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xba9b865f" }, { "constant": false, @@ -340,7 +362,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x59635375" }, { "constant": true, @@ -359,7 +382,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc7285a73" }, { "constant": true, @@ -382,7 +406,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8c3bc195" }, { "constant": true, @@ -401,7 +426,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x11fe9ec6" }, { "constant": false, @@ -415,7 +441,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x040f9a5e" }, { "constant": false, @@ -429,7 +456,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xc828b479" }, { "constant": false, @@ -443,7 +471,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xbaf3c0ae" }, { "constant": true, @@ -462,7 +491,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xcb97c585" }, { "constant": true, @@ -485,7 +515,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb05f86c2" }, { "constant": false, @@ -494,7 +525,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf26d8ce8" }, { "constant": false, @@ -508,7 +540,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x3784f000" }, { "constant": true, @@ -522,7 +555,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf90b112f" }, { "constant": true, @@ -541,7 +575,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x2aea50fe" }, { "constant": false, @@ -575,7 +610,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xb08d687a" }, { "constant": false, @@ -589,76 +625,77 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x0f3c34d1" } ], - "bytecode": "0x60806040523480156200001157600080fd5b5060405160808062002ff283398101806040528101908080519060200190929190805190602001909291908051906020019092919080519060200190929190505050336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a381600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515620001b6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156200025d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600086111515620002fc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001807f4d6178696d756d20726577617264206d7573742062652067726561746572207481526020017f68616e203000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6000851115156200039b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f54696d652077696e646f77206d7573742062652067726561746572207468616e81526020017f203000000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b856002819055508460058190555083600960006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555062000518600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b158015620004b657600080fd5b505af1158015620004cb573d6000803e3d6000fd5b505050506040513d6020811015620004e257600080fd5b810190808051906020019092919050505060ff16600a0a60326200052a6401000000000262002a0c179091906401000000009004565b6003819055505050505050506200056c565b600080600084141562000541576000915062000565565b82840290508284828115156200055357fe5b041415156200056157600080fd5b8091505b5092915050565b612a76806200057c6000396000f300608060405260043610610175576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063040f9a5e1461017a5780630d80149d146101bd5780630f3c34d11461021857806311fe9ec61461027e5780632aea50fe146102d55780633784f0001461031a5780635963537514610347578063676c4771146103825780636a3467a5146103ad578063715018a61461040457806385788f6f1461041b5780638c3bc195146104465780638da5cb5b146104bd5780638f32d59b14610514578063b05f86c214610543578063b08d687a146105d0578063ba9b865f14610750578063baf3c0ae1461078b578063c24a0f8b146107b8578063c7285a73146107e3578063c828b4791461087b578063cb97c585146108a8578063d2f343c7146108ff578063d8f163ab1461092a578063e42a96e714610955578063f26d8ce8146109ac578063f2fde38b146109c3578063f6c5aeb214610a06578063f90b112f14610a35575b600080fd5b34801561018657600080fd5b506101bb600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610a64565b005b3480156101c957600080fd5b506101fe600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d1f565b604051808215151515815260200191505060405180910390f35b34801561022457600080fd5b5061027c60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610d3f565b005b34801561028a57600080fd5b506102bf600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061145c565b6040518082815260200191505060405180910390f35b3480156102e157600080fd5b5061030460048036038101908080356000191690602001909291905050506114a8565b6040518082815260200191505060405180910390f35b34801561032657600080fd5b50610345600480360381019080803590602001909291905050506114dc565b005b34801561035357600080fd5b506103806004803603810190808035906020019082018035906020019190919293919293905050506115cf565b005b34801561038e57600080fd5b506103976116dc565b6040518082815260200191505060405180910390f35b3480156103b957600080fd5b506103c26116e2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561041057600080fd5b50610419611708565b005b34801561042757600080fd5b506104306117da565b6040518082815260200191505060405180910390f35b34801561045257600080fd5b506104a7600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506117e0565b6040518082815260200191505060405180910390f35b3480156104c957600080fd5b506104d2611867565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561052057600080fd5b50610529611890565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061058e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506118e7565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156105dc57600080fd5b5061074e60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091929192908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080356000191690602001909291908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050611a24565b005b34801561075c57600080fd5b50610789600480360381019080803590602001908201803590602001919091929391929390505050611d68565b005b34801561079757600080fd5b506107b660048036038101908080359060200190929190505050611f86565b005b3480156107c457600080fd5b506107cd611fa3565b6040518082815260200191505060405180910390f35b3480156107ef57600080fd5b50610824600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611fa9565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561086757808201518184015260208101905061084c565b505050509050019250505060405180910390f35b34801561088757600080fd5b506108a660048036038101908080359060200190929190505050612079565b005b3480156108b457600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612096565b6040518082815260200191505060405180910390f35b34801561090b57600080fd5b506109146120e5565b6040518082815260200191505060405180910390f35b34801561093657600080fd5b5061093f6120eb565b6040518082815260200191505060405180910390f35b34801561096157600080fd5b5061096a6120f1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156109b857600080fd5b506109c1612117565b005b3480156109cf57600080fd5b50610a04600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061221e565b005b348015610a1257600080fd5b50610a1b61223d565b604051808215151515815260200191505060405180910390f35b348015610a4157600080fd5b50610a4a612250565b604051808215151515815260200191505060405180910390f35b6000610a6e611890565b1515610a7957600080fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610b1f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610bdc57600080fd5b505af1158015610bf0573d6000803e3d6000fd5b505050506040513d6020811015610c0657600080fd5b81019080805190602001909291905050509150600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb84846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610cde57600080fd5b505af1158015610cf2573d6000803e3d6000fd5b505050506040513d6020811015610d0857600080fd5b810190808051906020019092919050505050505050565b60016020528060005260406000206000915054906101000a900460ff1681565b6000806000806000806000600a60149054906101000a900460ff168015610d67575042600b54115b1515610e01576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008851111515610e7a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20736372697074206861736820706173736564000000000000000000000081525060200191505060405180910390fd5b600096505b875187101561145257610ea88888815181101515610e9957fe5b90602001906020020151612277565b9550955095509550610ed48888815181101515610ec157fe5b90602001906020020151878787876123df565b9150600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610f9357600080fd5b505af1158015610fa7573d6000803e3d6000fd5b505050506040513d6020811015610fbd57600080fd5b8101908080519060200190929190505050905080821115610fdc578091505b6000821415611060578573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561102157fe5b90602001906020020151600019167ff939e9640bc0433f3e944a23fbb977ee3d326f2523da16c258cce16734a1c4cf60405160405180910390a4611445565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208690806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061119282600760008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b600760008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061126482600860008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b600860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506112bc8260045461241690919063ffffffff16565b6004819055508573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1689898151811015156112fe57fe5b90602001906020020151600019167fdb28ff209f2a631171420977162edbe85659d93149d92f69f81260675f546a3a856040518082815260200191505060405180910390a4600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb87846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561140857600080fd5b505af115801561141c573d6000803e3d6000fd5b505050506040513d602081101561143257600080fd5b8101908080519060200190929190505050505b8680600101975050610e7f565b5050505050505050565b6000600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050809050919050565b60008060008060006114b986612277565b93509350935093506114ce86858585856123df565b945084945050505050919050565b6114e4611890565b15156114ef57600080fd5b428111151561158c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f456e6420646174652073686f756c642062652067726561746572207468616e2081526020017f63757272656e742064617465000000000000000000000000000000000000000081525060400191505060405180910390fd5b80600b819055507f78f20fcb2c7d71918cb4f6b5e6c6eb0bf4ed26c77d48c64a29c6f448c40d9ae8600b546040518082815260200191505060405180910390a150565b60006115d9611890565b15156115e457600080fd5b600090505b8282905081101561168357600060016000858585818110151561160857fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555080806001019150506115e9565b7f5d3cc1ddd817cba6d86bf4cb3d582965e47b25685de10dcfe87dcb8607ba56308383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b60025481565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b611710611890565b151561171b57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60035481565b6000600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b600081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490501115156119a2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f417272617920696e646578206f7574206f6620626f756e64000000000000000081525060200191505060405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020828154811015156119ee57fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080905092915050565b6060600a60149054906101000a900460ff168015611a43575042600b54115b1515611add576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e4ec8b008888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808060200180602001806020018760001916600019168152602001806020018060200186810386528c818151815260200191508051906020019060200280838360005b83811015611bad578082015181840152602081019050611b92565b5050505090500186810385528b818151815260200191508051906020019060200280838360005b83811015611bef578082015181840152602081019050611bd4565b5050505090500186810384528a818151815260200191508051906020019060200280838360005b83811015611c31578082015181840152602081019050611c16565b50505050905001868103835288818151815260200191508051906020019060200280838360005b83811015611c73578082015181840152602081019050611c58565b50505050905001868103825287818151815260200191508051906020019060200280838360005b83811015611cb5578082015181840152602081019050611c9a565b505050509050019b505050505050505050505050600060405180830381600087803b158015611ce357600080fd5b505af1158015611cf7573d6000803e3d6000fd5b505050506001604051908082528060200260200182016040528015611d2b5781602001602082028038833980820191505090505b50905083816000815181101515611d3e57fe5b906020019060200201906000191690816000191681525050611d5f81610d3f565b50505050505050565b6000611d72611890565b1515611d7d57600080fd5b600090505b82829050811015611f2d57600160008484848181101515611d9f57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611e9f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4f6e65206f66207468652073656c6c65727320697320616c726561647920707281526020017f6f6d6f746564000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60018060008585858181101515611eb257fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508080600101915050611d82565b7fa61ea6f08d34b0cf93586736a7fdd8becfc2d5f8443cd5fa4e27d7ae0f0c99758383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b611f8e611890565b1515611f9957600080fd5b8060058190555050565b600b5481565b6060600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561206a57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311612020575b50505050509050809050919050565b612081611890565b151561208c57600080fd5b8060028190555050565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490509050809050919050565b60055481565b60045481565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61211f611890565b151561212a57600080fd5b600a60149054906101000a900460ff161515156121d5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5265776172647320646973747269627574696f6e20697320616c72656164792081526020017f6f6e00000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6001600a60146101000a81548160ff0219169083151502179055507ffb3ffd640eb2af7384a797d8a341f421615d81ef4e03359874984268cbd9003a60405160405180910390a1565b612226611890565b151561223157600080fd5b61223a81612437565b50565b600a60149054906101000a900460ff1681565b6000600a60149054906101000a900460ff16801561226f575042600b54115b905080905090565b600080600080600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663642f2eaf866040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505061012060405180830381600087803b15801561231757600080fd5b505af115801561232b573d6000803e3d6000fd5b505050506040513d61012081101561234257600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090919293949596975090919293945090919293509091925050809650819750829550839450505050508383838393509350935093509193509193565b60006123ee8686868686612531565b15156123fd576000905061240a565b6124078585612847565b90505b80905095945050505050565b600080828401905083811015151561242d57600080fd5b8091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561247357600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600060019050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff161415612575576000905061283b565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156125d1576000905061283a565b60018360ff161415156125e75760009050612839565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663f078656287866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156126b457600080fd5b505af11580156126c8573d6000803e3d6000fd5b505050506040513d60208110156126de57600080fd5b810190808051906020019092919050505015156126fe5760009050612838565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b0550c6687866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156127cb57600080fd5b505af11580156127df573d6000803e3d6000fd5b505050506040513d60208110156127f557600080fd5b810190808051906020019092919050505015156128155760009050612837565b4261282b6005548461241690919063ffffffff16565b101561283657600090505b5b5b5b5b5b80905095945050505050565b6000600254600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151561289c57600090506129e2565b61292d600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546003546129eb90919063ffffffff16565b905060025461298482600860008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b11156129e1576129de600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546002546129eb90919063ffffffff16565b90505b5b80905092915050565b6000808383111515156129fd57600080fd5b82840390508091505092915050565b6000806000841415612a215760009150612a43565b8284029050828482811515612a3257fe5b04141515612a3f57600080fd5b8091505b50929150505600a165627a7a723058203da8b331b18cf06467982cefce21e7107992ee010c7be35fa932c217f0f2b80d0029", - "deployedBytecode": "0x608060405260043610610175576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063040f9a5e1461017a5780630d80149d146101bd5780630f3c34d11461021857806311fe9ec61461027e5780632aea50fe146102d55780633784f0001461031a5780635963537514610347578063676c4771146103825780636a3467a5146103ad578063715018a61461040457806385788f6f1461041b5780638c3bc195146104465780638da5cb5b146104bd5780638f32d59b14610514578063b05f86c214610543578063b08d687a146105d0578063ba9b865f14610750578063baf3c0ae1461078b578063c24a0f8b146107b8578063c7285a73146107e3578063c828b4791461087b578063cb97c585146108a8578063d2f343c7146108ff578063d8f163ab1461092a578063e42a96e714610955578063f26d8ce8146109ac578063f2fde38b146109c3578063f6c5aeb214610a06578063f90b112f14610a35575b600080fd5b34801561018657600080fd5b506101bb600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610a64565b005b3480156101c957600080fd5b506101fe600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d1f565b604051808215151515815260200191505060405180910390f35b34801561022457600080fd5b5061027c60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610d3f565b005b34801561028a57600080fd5b506102bf600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061145c565b6040518082815260200191505060405180910390f35b3480156102e157600080fd5b5061030460048036038101908080356000191690602001909291905050506114a8565b6040518082815260200191505060405180910390f35b34801561032657600080fd5b50610345600480360381019080803590602001909291905050506114dc565b005b34801561035357600080fd5b506103806004803603810190808035906020019082018035906020019190919293919293905050506115cf565b005b34801561038e57600080fd5b506103976116dc565b6040518082815260200191505060405180910390f35b3480156103b957600080fd5b506103c26116e2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561041057600080fd5b50610419611708565b005b34801561042757600080fd5b506104306117da565b6040518082815260200191505060405180910390f35b34801561045257600080fd5b506104a7600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506117e0565b6040518082815260200191505060405180910390f35b3480156104c957600080fd5b506104d2611867565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561052057600080fd5b50610529611890565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061058e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506118e7565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156105dc57600080fd5b5061074e60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091929192908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080356000191690602001909291908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050611a24565b005b34801561075c57600080fd5b50610789600480360381019080803590602001908201803590602001919091929391929390505050611d68565b005b34801561079757600080fd5b506107b660048036038101908080359060200190929190505050611f86565b005b3480156107c457600080fd5b506107cd611fa3565b6040518082815260200191505060405180910390f35b3480156107ef57600080fd5b50610824600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611fa9565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561086757808201518184015260208101905061084c565b505050509050019250505060405180910390f35b34801561088757600080fd5b506108a660048036038101908080359060200190929190505050612079565b005b3480156108b457600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612096565b6040518082815260200191505060405180910390f35b34801561090b57600080fd5b506109146120e5565b6040518082815260200191505060405180910390f35b34801561093657600080fd5b5061093f6120eb565b6040518082815260200191505060405180910390f35b34801561096157600080fd5b5061096a6120f1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156109b857600080fd5b506109c1612117565b005b3480156109cf57600080fd5b50610a04600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061221e565b005b348015610a1257600080fd5b50610a1b61223d565b604051808215151515815260200191505060405180910390f35b348015610a4157600080fd5b50610a4a612250565b604051808215151515815260200191505060405180910390f35b6000610a6e611890565b1515610a7957600080fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610b1f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610bdc57600080fd5b505af1158015610bf0573d6000803e3d6000fd5b505050506040513d6020811015610c0657600080fd5b81019080805190602001909291905050509150600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb84846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610cde57600080fd5b505af1158015610cf2573d6000803e3d6000fd5b505050506040513d6020811015610d0857600080fd5b810190808051906020019092919050505050505050565b60016020528060005260406000206000915054906101000a900460ff1681565b6000806000806000806000600a60149054906101000a900460ff168015610d67575042600b54115b1515610e01576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008851111515610e7a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20736372697074206861736820706173736564000000000000000000000081525060200191505060405180910390fd5b600096505b875187101561145257610ea88888815181101515610e9957fe5b90602001906020020151612277565b9550955095509550610ed48888815181101515610ec157fe5b90602001906020020151878787876123df565b9150600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610f9357600080fd5b505af1158015610fa7573d6000803e3d6000fd5b505050506040513d6020811015610fbd57600080fd5b8101908080519060200190929190505050905080821115610fdc578091505b6000821415611060578573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561102157fe5b90602001906020020151600019167ff939e9640bc0433f3e944a23fbb977ee3d326f2523da16c258cce16734a1c4cf60405160405180910390a4611445565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208690806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061119282600760008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b600760008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061126482600860008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b600860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506112bc8260045461241690919063ffffffff16565b6004819055508573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1689898151811015156112fe57fe5b90602001906020020151600019167fdb28ff209f2a631171420977162edbe85659d93149d92f69f81260675f546a3a856040518082815260200191505060405180910390a4600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb87846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561140857600080fd5b505af115801561141c573d6000803e3d6000fd5b505050506040513d602081101561143257600080fd5b8101908080519060200190929190505050505b8680600101975050610e7f565b5050505050505050565b6000600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050809050919050565b60008060008060006114b986612277565b93509350935093506114ce86858585856123df565b945084945050505050919050565b6114e4611890565b15156114ef57600080fd5b428111151561158c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f456e6420646174652073686f756c642062652067726561746572207468616e2081526020017f63757272656e742064617465000000000000000000000000000000000000000081525060400191505060405180910390fd5b80600b819055507f78f20fcb2c7d71918cb4f6b5e6c6eb0bf4ed26c77d48c64a29c6f448c40d9ae8600b546040518082815260200191505060405180910390a150565b60006115d9611890565b15156115e457600080fd5b600090505b8282905081101561168357600060016000858585818110151561160857fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555080806001019150506115e9565b7f5d3cc1ddd817cba6d86bf4cb3d582965e47b25685de10dcfe87dcb8607ba56308383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b60025481565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b611710611890565b151561171b57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60035481565b6000600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b600081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490501115156119a2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f417272617920696e646578206f7574206f6620626f756e64000000000000000081525060200191505060405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020828154811015156119ee57fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080905092915050565b6060600a60149054906101000a900460ff168015611a43575042600b54115b1515611add576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e4ec8b008888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808060200180602001806020018760001916600019168152602001806020018060200186810386528c818151815260200191508051906020019060200280838360005b83811015611bad578082015181840152602081019050611b92565b5050505090500186810385528b818151815260200191508051906020019060200280838360005b83811015611bef578082015181840152602081019050611bd4565b5050505090500186810384528a818151815260200191508051906020019060200280838360005b83811015611c31578082015181840152602081019050611c16565b50505050905001868103835288818151815260200191508051906020019060200280838360005b83811015611c73578082015181840152602081019050611c58565b50505050905001868103825287818151815260200191508051906020019060200280838360005b83811015611cb5578082015181840152602081019050611c9a565b505050509050019b505050505050505050505050600060405180830381600087803b158015611ce357600080fd5b505af1158015611cf7573d6000803e3d6000fd5b505050506001604051908082528060200260200182016040528015611d2b5781602001602082028038833980820191505090505b50905083816000815181101515611d3e57fe5b906020019060200201906000191690816000191681525050611d5f81610d3f565b50505050505050565b6000611d72611890565b1515611d7d57600080fd5b600090505b82829050811015611f2d57600160008484848181101515611d9f57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16151515611e9f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4f6e65206f66207468652073656c6c65727320697320616c726561647920707281526020017f6f6d6f746564000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60018060008585858181101515611eb257fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508080600101915050611d82565b7fa61ea6f08d34b0cf93586736a7fdd8becfc2d5f8443cd5fa4e27d7ae0f0c99758383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b611f8e611890565b1515611f9957600080fd5b8060058190555050565b600b5481565b6060600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561206a57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311612020575b50505050509050809050919050565b612081611890565b151561208c57600080fd5b8060028190555050565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490509050809050919050565b60055481565b60045481565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61211f611890565b151561212a57600080fd5b600a60149054906101000a900460ff161515156121d5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5265776172647320646973747269627574696f6e20697320616c72656164792081526020017f6f6e00000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6001600a60146101000a81548160ff0219169083151502179055507ffb3ffd640eb2af7384a797d8a341f421615d81ef4e03359874984268cbd9003a60405160405180910390a1565b612226611890565b151561223157600080fd5b61223a81612437565b50565b600a60149054906101000a900460ff1681565b6000600a60149054906101000a900460ff16801561226f575042600b54115b905080905090565b600080600080600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663642f2eaf866040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505061012060405180830381600087803b15801561231757600080fd5b505af115801561232b573d6000803e3d6000fd5b505050506040513d61012081101561234257600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090919293949596975090919293945090919293509091925050809650819750829550839450505050508383838393509350935093509193509193565b60006123ee8686868686612531565b15156123fd576000905061240a565b6124078585612847565b90505b80905095945050505050565b600080828401905083811015151561242d57600080fd5b8091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561247357600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600060019050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff161415612575576000905061283b565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156125d1576000905061283a565b60018360ff161415156125e75760009050612839565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663f078656287866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156126b457600080fd5b505af11580156126c8573d6000803e3d6000fd5b505050506040513d60208110156126de57600080fd5b810190808051906020019092919050505015156126fe5760009050612838565b600960009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b0550c6687866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156127cb57600080fd5b505af11580156127df573d6000803e3d6000fd5b505050506040513d60208110156127f557600080fd5b810190808051906020019092919050505015156128155760009050612837565b4261282b6005548461241690919063ffffffff16565b101561283657600090505b5b5b5b5b5b80905095945050505050565b6000600254600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151561289c57600090506129e2565b61292d600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546003546129eb90919063ffffffff16565b905060025461298482600860008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461241690919063ffffffff16565b11156129e1576129de600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546002546129eb90919063ffffffff16565b90505b5b80905092915050565b6000808383111515156129fd57600080fd5b82840390508091505092915050565b6000806000841415612a215760009150612a43565b8284029050828482811515612a3257fe5b04141515612a3f57600080fd5b8091505b50929150505600a165627a7a723058203da8b331b18cf06467982cefce21e7107992ee010c7be35fa932c217f0f2b80d0029", - "sourceMap": "510:17642:2:-;;;3250:834;8:9:-1;5:2;;;30:1;27;20:12;5:2;3250:834:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;518:10:5;509:6;;:19;;;;;;;;;;;;;;;;;;572:6;;;;;;;;;;;539:40;;568:1;539:40;;;;;;;;;;;;3481:22:2;2582:1;2562:22;;:8;:22;;;;2554:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3528:14;2582:1;2562:22;;:8;:22;;;;2554:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3602:1;3580:19;:23;3559:107;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3712:1;3698:11;:15;3677:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3805:19;3784:18;:40;;;;3847:11;3834:10;:24;;;;3893:22;3868:14;;:48;;;;;;;;;;;;;;;;;;3951:14;3926:7;;:40;;;;;;;;;;;;;;;;;;4004:72;4047:7;;;;;;;;;;;:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4047:18:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4047:18:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4047:18:2;;;;;;;;;;;;;;;;4039:27;;4033:2;:33;4012:2;4004:15;;;;;;:72;;;;;:::i;:::-;3976:25;:100;;;;2623:1;3250:834;;;;;510:17642;;204:381:4;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o;510:17642:2:-;;;;;;;", - "deployedSourceMap": "510:17642:2:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6632:239;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6632:239:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;614:47;;8:9:-1;5:2;;;30:1;27;20:12;5:2;614:47:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11456:2002;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11456:2002:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6207:243;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6207:243:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9397:477;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9397:477:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8810:259;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8810:259:2;;;;;;;;;;;;;;;;;;;;;;;;;;4911:238;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4911:238:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;668:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;668:33:2;;;;;;;;;;;;;;;;;;;;;;;1846:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1846:29:2;;;;;;;;;;;;;;;;;;;;;;;;;;;1273:127:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1273:127:5;;;;;;708:40:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;708:40:2;;;;;;;;;;;;;;;;;;;;;;;5775:234;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5775:234:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;639:70:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;639:70:5;;;;;;;;;;;;;;;;;;;;;;;;;;;926:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;926:83:5;;;;;;;;;;;;;;;;;;;;;;;;;;;8046:339:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8046:339:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10205:821;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10205:821:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4361:433;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4361:433:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7362:107;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7362:107:2;;;;;;;;;;;;;;;;;;;;;;;;;;2009:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2009:22:2;;;;;;;;;;;;;;;;;;;;;;;5352:197;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5352:197:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;5352:197:2;;;;;;;;;;;;;;;;;7047:173;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7047:173:2;;;;;;;;;;;;;;;;;;;;;;;;;;7621:197;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7621:197:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1045:25;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1045:25:2;;;;;;;;;;;;;;;;;;;;;;;755:37;;8:9:-1;5:2;;;30:1;27;20:12;5:2;755:37:2;;;;;;;;;;;;;;;;;;;;;;;1744:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1744:29:2;;;;;;;;;;;;;;;;;;;;;;;;;;;8532:172;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8532:172:2;;;;;;1561:101:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1561:101:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;1949:21:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1949:21:2;;;;;;;;;;;;;;;;;;;;;;;;;;;9075:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9075:156:2;;;;;;;;;;;;;;;;;;;;;;;;;;;6632:239;6779:14;824:9:5;:7;:9::i;:::-;816:18;;;;;;;;6755:8:2;2582:1;2562:22;;:8;:22;;;;2554:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6796:7;;;;;;;;;;;:17;;;6814:4;6796:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6796:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6796:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6796:23:2;;;;;;;;;;;;;;;;6779:40;;6830:7;;;;;;;;;;;:16;;;6847:8;6857:6;6830:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6830:34:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6830:34:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;6830:34:2;;;;;;;;;;;;;;;;;840:1:5;6632:239:2;;:::o;614:47::-;;;;;;;;;;;;;;;;;;;;;;:::o;11456:2002::-;11608:9;11744:13;11775:14;11807:12;11837:20;12194;12398:23;2694:9;;;;;;;;;;;:40;;;;;2718:15;2708:7;;:25;2694:40;2673:121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11565:1;11543:12;:19;:23;11535:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11620:1;11608:13;;11603:1848;11627:12;:19;11623:1;:23;11603:1848;;;11874:32;11890:12;11903:1;11890:15;;;;;;;;;;;;;;;;;;11874;:32::i;:::-;11726:180;;;;;;;;12217:166;12253:12;12266:1;12253:15;;;;;;;;;;;;;;;;;;12286:5;12309:6;12333;12357:12;12217:18;:166::i;:::-;12194:189;;12424:7;;;;;;;;;;;:17;;;12442:4;12424:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12424:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12424:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;12424:23:2;;;;;;;;;;;;;;;;12398:49;;12481:15;12466:12;:30;12462:99;;;12531:15;12516:30;;12462:99;12595:1;12579:12;:17;12575:136;;;12664:5;12621:49;;12656:6;12621:49;;12639:12;12652:1;12639:15;;;;;;;;;;;;;;;;;;12621:49;;;;;;;;;;;;;12688:8;;12575:136;12755:14;:22;12770:6;12755:22;;;;;;;;;;;;;;;12783:5;12755:34;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;12755:34:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;12842:113;12942:12;12842:20;:58;12880:6;12842:58;;;;;;;;;;;;;;;:95;12918:5;12842:95;;;;;;;;;;;;;;;;:99;;:113;;;;:::i;:::-;12804:20;:28;12825:6;12804:28;;;;;;;;;;;;;;;:35;12833:5;12804:35;;;;;;;;;;;;;;;:151;;;;13007:82;13076:12;13007:26;:64;13051:6;13007:64;;;;;;;;;;;;;;;;:68;;:82;;;;:::i;:::-;12970:26;:34;12997:6;12970:34;;;;;;;;;;;;;;;:119;;;;13129:40;13156:12;13129:22;;:26;;:40;;;;:::i;:::-;13104:22;:65;;;;13307:5;13217:139;;13283:6;13217:139;;13250:12;13263:1;13250:15;;;;;;;;;;;;;;;;;;13217:139;;;;13330:12;13217:139;;;;;;;;;;;;;;;;;;13403:7;;;;;;;;;;;:16;;;13420:5;13427:12;13403:37;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13403:37:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13403:37:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13403:37:2;;;;;;;;;;;;;;;;;11603:1848;11648:3;;;;;;;11603:1848;;;11456:2002;;;;;;;;:::o;6207:243::-;6314:25;6375:26;:34;6402:6;6375:34;;;;;;;;;;;;;;;;6355:54;;6426:17;6419:24;;6207:243;;;:::o;9397:477::-;9501:14;9545:13;9572:14;9600:12;9626:20;9659:27;9675:10;9659:15;:27::i;:::-;9531:155;;;;;;;;9706:137;9738:10;9762:5;9781:6;9801;9821:12;9706:18;:137::i;:::-;9697:146;;9861:6;9854:13;;9397:477;;;;;;;:::o;8810:259::-;824:9:5;:7;:9::i;:::-;816:18;;;;;;;;8909:15:2;8898:8;:26;8877:117;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9015:8;9005:7;:18;;;;9039:23;9054:7;;9039:23;;;;;;;;;;;;;;;;;;8810:259;:::o;4911:238::-;4996:9;824::5;:7;:9::i;:::-;816:18;;;;;;;;5008:1:2;4996:13;;4991:106;5015:7;;:14;;5011:1;:18;4991:106;;;5081:5;5051:15;:27;5067:7;;5075:1;5067:10;;;;;;;;;;;;;;;;;5051:27;;;;;;;;;;;;;;;;:35;;;;;;;;;;;;;;;;;;5031:3;;;;;;;4991:106;;;5111:31;5134:7;;5111:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4911:238;;;:::o;668:33::-;;;;:::o;1846:29::-;;;;;;;;;;;;;:::o;1273:127:5:-;824:9;:7;:9::i;:::-;816:18;;;;;;;;1367:1;1330:40;;1351:6;;;;;;;;;;;1330:40;;;;;;;;;;;;1393:1;1376:6;;:19;;;;;;;;;;;;;;;;;;1273:127::o;708:40:2:-;;;;:::o;5775:234::-;5915:20;5967;:28;5988:6;5967:28;;;;;;;;;;;;;;;:35;5996:5;5967:35;;;;;;;;;;;;;;;;5960:42;;5775:234;;;;:::o;639:70:5:-;676:7;698:6;;;;;;;;;;;691:13;;639:70;:::o;926:83::-;965:4;998:6;;;;;;;;;;;984:20;;:10;:20;;;977:27;;926:83;:::o;8046:339:2:-;8172:13;8254:5;8222:14;:22;8237:6;8222:22;;;;;;;;;;;;;;;:29;;;;:37;8201:108;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8327:14;:22;8342:6;8327:22;;;;;;;;;;;;;;;8350:5;8327:29;;;;;;;;;;;;;;;;;;;;;;;;;;;8319:37;;8373:5;8366:12;;8046:339;;;;:::o;10205:821::-;10896:29;2694:9;;;;;;;;;;;:40;;;;;2718:15;2708:7;;:25;2694:40;2673:121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10702:14;;;;;;;;;;;:22;;;10738:4;10756;10774;10792:10;10816:12;10842:7;10702:157;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;10702:157:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;10702:157:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;10702:157:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;10702:157:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;10702:157:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10702:157:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10702:157:2;;;;10942:1;10928:16;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;148:4;140:6;136:17;126:27;;0:157;10928:16:2;;;;10896:48;;10972:10;10954:12;10967:1;10954:15;;;;;;;;;;;;;;;;;:28;;;;;;;;;;;;;10993:26;11006:12;10993;:26::i;:::-;10205:821;;;;;;;:::o;4361:433::-;4443:9;824::5;:7;:9::i;:::-;816:18;;;;;;;;4455:1:2;4443:13;;4438:306;4462:7;;:14;;4458:1;:18;4438:306;;;4524:15;:27;4540:7;;4548:1;4540:10;;;;;;;;;;;;;;;;;4524:27;;;;;;;;;;;;;;;;;;;;;;;;;4523:28;4498:125;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4729:4;4699:15;:27;4715:7;;4723:1;4715:10;;;;;;;;;;;;;;;;;4699:27;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;;;;;;;4478:3;;;;;;;4438:306;;;4758:29;4779:7;;4758:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4361:433;;;:::o;7362:107::-;824:9:5;:7;:9::i;:::-;816:18;;;;;;;;7451:11:2;7438:10;:24;;;;7362:107;:::o;2009:22::-;;;;:::o;5352:197::-;5456:16;5497:14;:22;5512:6;5497:22;;;;;;;;;;;;;;;5488:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5536:6;5529:13;;5352:197;;;:::o;7047:173::-;824:9:5;:7;:9::i;:::-;816:18;;;;;;;;7194:19:2;7173:18;:40;;;;7047:173;:::o;7621:197::-;7726:12;7761:14;:22;7776:6;7761:22;;;;;;;;;;;;;;;:29;;;;7754:36;;7807:4;7800:11;;7621:197;;;:::o;1045:25::-;;;;:::o;755:37::-;;;;:::o;1744:29::-;;;;;;;;;;;;;:::o;8532:172::-;824:9:5;:7;:9::i;:::-;816:18;;;;;;;;8595:9:2;;;;;;;;;;;8594:10;8586:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8666:4;8654:9;;:16;;;;;;;;;;;;;;;;;;8686:11;;;;;;;;;;8532:172::o;1561:101:5:-;824:9;:7;:9::i;:::-;816:18;;;;;;;;1629:28;1648:8;1629:18;:28::i;:::-;1561:101;:::o;1949:21:2:-;;;;;;;;;;;;;:::o;9075:156::-;9126:12;9160:9;;;;;;;;;;;:40;;;;;9184:15;9174:7;;:25;9160:40;9150:50;;9217:7;9210:14;;9075:156;:::o;13538:534::-;13656:13;13683:14;13711:12;13737:20;13970:14;;;;;;;;;;;:27;;;13998:11;13970:40;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13970:40:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13970:40:2;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;13970:40:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13840:170;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14029:5;14036:6;14044;14052:12;14021:44;;;;;;;;13538:534;;;;;:::o;16395:585::-;16602:14;16651:165;16691:10;16719:5;16742:6;16766;16790:12;16651:22;:165::i;:::-;16650:166;16633:317;;;16858:1;16849:10;;16633:317;;;16908:31;16925:5;16932:6;16908:16;:31::i;:::-;16899:40;;16633:317;16967:6;16960:13;;16395:585;;;;;;;:::o;1272:131:4:-;1330:7;1345:9;1361:1;1357;:5;1345:17;;1381:1;1376;:6;;1368:15;;;;;;;;1397:1;1390:8;;1272:131;;;;;:::o;1796:169:5:-;1885:1;1865:22;;:8;:22;;;;1857:31;;;;;;;;1928:8;1899:38;;1920:6;;;;;;;;;;;1899:38;;;;;;;;;;;;1952:8;1943:6;;:17;;;;;;;;;;;;;;;;;;1796:169;:::o;14694:1477:2:-;14905:13;14946:4;14935:15;;14982:1;14965:19;;:5;:19;;;14961:1178;;;15114:5;15103:16;;14961:1178;;;15150:15;:23;15166:6;15150:23;;;;;;;;;;;;;;;;;;;;;;;;;15149:24;15145:994;;;15265:5;15254:16;;15145:994;;;15309:1;15299:6;:11;;;;15295:844;;;15385:5;15374:16;;15295:844;;;15490:14;;;;;;;;;;;:24;;;15515:10;15527:6;15490:44;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15490:44:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15490:44:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15490:44:2;;;;;;;;;;;;;;;;15489:45;15415:724;;;15626:5;15615:16;;15415:724;;;15731:14;;;;;;;;;;;:31;;;15763:10;15775:6;15731:51;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15731:51:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15731:51:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15731:51:2;;;;;;;;;;;;;;;;15730:52;15656:483;;;15973:5;15962:16;;15656:483;;;16038:15;16007:28;16024:10;;16007:12;:16;;:28;;;;:::i;:::-;:46;16003:136;;;16123:5;16112:16;;16003:136;15656:483;15415:724;15295:844;15145:994;14961:1178;16156:8;16149:15;;14694:1477;;;;;;;:::o;17175:973::-;17300:14;17373:18;;17335:26;:34;17362:6;17335:34;;;;;;;;;;;;;;;;:56;;17331:786;;;17512:1;17503:10;;17331:786;;;17748:66;17778:20;:28;17799:6;17778:28;;;;;;;;;;;;;;;:35;17807:5;17778:35;;;;;;;;;;;;;;;;17748:25;;:29;;:66;;;;:::i;:::-;17739:75;;17986:18;;17937:46;17976:6;17937:26;:34;17964:6;17937:34;;;;;;;;;;;;;;;;:38;;:46;;;;:::i;:::-;:67;17933:173;;;18033:58;18056:26;:34;18083:6;18056:34;;;;;;;;;;;;;;;;18033:18;;:22;;:58;;;;:::i;:::-;18024:67;;17933:173;17331:786;18134:6;18127:13;;17175:973;;;;:::o;1078:131:4:-;1136:7;1172:9;1164:1;1159;:6;;1151:15;;;;;;;;1188:1;1184;:5;1172:17;;1203:1;1196:8;;1078:131;;;;;:::o;204:381::-;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o", - "source": "/* solium-disable security/no-block-members */\n\npragma solidity 0.4.24;\n\nimport \"openzeppelin-solidity/contracts/math/SafeMath.sol\";\nimport \"openzeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"../token/ITokenContract.sol\";\nimport \"../escrow/IEscrow.sol\";\n\n\n/**\n* @dev This contract will distribute tokens to the buyers who purchase items from\n* the OB verified sellers\n* For more information please visit below mentioned link\n* https://github.com/OB1Company/openbazaar-smart-contracts/issues/10\n*/\ncontract OBRewards is Ownable {\n\n using SafeMath for uint256;\n\n //Mapping of promoted sellers\n mapping(address => bool) public promotedSellers;\n\n uint256 public maxRewardPerSeller;\n\n uint256 public maxRewardToBuyerPerSeller;\n\n uint256 public totalTokensDistributed;\n\n //A time window in seconds where purchases between A and B will be\n //rewarded with tokens. Ie if a trade is completed satisfactorily at\n //time X, then the buyer can claim their reward any time after X and\n //before X + timeWindow.\n uint256 public timeWindow;\n\n //Mapping of seller versus all buyers who received rewards by purchasing\n //from that seller.\n mapping(address => address[]) sellerVsBuyers;\n\n //Given a seller and a buyer, this will return the amount of tokens that\n //have been rewarded to the buyer for purchasing from the seller.\n mapping(address => mapping(address => uint256)) sellerVsBuyerRewards;\n\n //For each seller, this returns the total number of tokens that have been\n //given out as rewards for purchasing from that seller.\n mapping(address => uint256) sellerVsRewardsDistributed;\n\n //Escrow contract address which will be used to calculate and validate\n //transactions\n IEscrow public escrowContract;\n\n //Address of the reward Token to be distributed to the buyers\n ITokenContract public obToken;\n\n //Bool to signify whether reward distribution is active or not\n bool public rewardsOn;\n\n //End date of the promotion\n uint256 public endDate;\n\n event SuccessfulClaim(\n bytes32 indexed scriptHash,\n address indexed seller,\n address indexed buyer,\n uint256 amount\n );\n\n event UnsuccessfulClaim(\n bytes32 indexed scriptHash,\n address indexed seller,\n address indexed buyer\n );\n\n event PromotedSellersAdded(address[] seller);\n\n event PromotedSellersRemoved(address[] seller);\n\n event RewardsOn();\n\n event EndDateChanged(uint256 endDate);\n\n modifier nonZeroAddress(address _address) {\n require(_address != address(0), \"Zero address not allowed\");\n _;\n }\n\n modifier rewardsRunning() {\n require(\n rewardsOn && (endDate > block.timestamp),\n \"Reward distribution is not running\"\n );\n _;\n }\n\n /**\n * @dev Add details to rewards contract at the time of deployment\n * @param _maxRewardPerSeller Maximum reward to be distributed from\n * each seller\n * @param _timeWindow A time window, in seconds, where purchases\n * will be rewarded with tokens\n * @param _escrowContractAddress Escrow address to be considered for\n * rewards distribution.\n * @param obTokenAddress Address of the reward token\n */\n constructor(\n uint256 _maxRewardPerSeller,\n uint256 _timeWindow,\n address _escrowContractAddress, // this should be a trusted contract\n address obTokenAddress\n )\n public\n nonZeroAddress(_escrowContractAddress)\n nonZeroAddress(obTokenAddress)\n {\n\n require(\n _maxRewardPerSeller > 0,\n \"Maximum reward must be greater than 0\"\n );\n\n require(\n _timeWindow > 0,\n \"Time window must be greater than 0\"\n );\n\n maxRewardPerSeller = _maxRewardPerSeller;\n timeWindow = _timeWindow;\n escrowContract = IEscrow(_escrowContractAddress);\n obToken = ITokenContract(obTokenAddress);\n maxRewardToBuyerPerSeller = uint256(50).mul(\n 10 ** uint256(obToken.decimals())\n );\n\n }\n\n /**\n * @dev Allows owner to add new promoted sellers. Previous ones will\n * remain untouched\n * @param sellers List of sellers to be marked as promoted\n * No Seller out of this list should already be promoted, otherwise\n * transaction will fail\n */\n function addPromotedSellers(address[] sellers) external onlyOwner {\n\n for (uint256 i = 0; i < sellers.length; i++) {\n\n require(\n !promotedSellers[sellers[i]],\n \"One of the sellers is already promoted\"\n ); //Also protects against the same being address passed twice.\n\n promotedSellers[sellers[i]] = true;\n }\n emit PromotedSellersAdded(sellers);\n }\n\n /**\n * @dev Remove exisiting promoted sellers\n * @param sellers List of sellers to be removed\n */\n function removePromotedSellers(address[] sellers) external onlyOwner {\n\n for (uint256 i = 0; i < sellers.length; i++) {\n\n promotedSellers[sellers[i]] = false;\n }\n emit PromotedSellersRemoved(sellers);\n }\n\n /**\n * @dev Returns list of buyers that have been rewarded for purchasing from\n * a given seller\n * @param seller Address of promoted seller\n * @return buyers List of Buyers\n */\n function getRewardedBuyers(\n address seller\n )\n external\n view\n returns (address[] buyers)\n {\n buyers = sellerVsBuyers[seller];\n return buyers;\n }\n\n /**\n * @dev Return reward info for a buyer against a promoted seller\n * @param seller Address of promoted seller\n * @param buyer The buyer who reward info has to be fetched\n * @return rewardAmount\n */\n function getBuyerRewardInfo(\n address seller,\n address buyer\n )\n external\n view\n returns(\n uint256 rewardAmount\n )\n {\n return sellerVsBuyerRewards[seller][buyer];\n }\n\n /**\n * @dev Total reward distributed for a promoted seller so far\n * @param seller Promoted seller's address\n * @return Amount of tokens distributed as reward for a seller\n */\n function getDistributedReward(\n address seller\n )\n external\n view\n returns (uint256 rewardDistributed)\n {\n rewardDistributed = sellerVsRewardsDistributed[seller];\n return rewardDistributed;\n }\n\n /**\n * @dev Allows the owner of the contract to transfer all remaining tokens to\n * an address of their choosing.\n * @param receiver The receiver's address\n */\n function transferRemainingTokens(\n address receiver\n )\n external\n onlyOwner\n nonZeroAddress(receiver)\n {\n uint256 amount = obToken.balanceOf(this);\n\n obToken.transfer(receiver, amount);\n }\n\n /**\n * @dev Method to allow the onwer to adjust the maximum reward per seller\n * @param _maxRewardPerSeller Max reward to be distributed for each seller\n */\n function changeMaxRewardPerSeller(\n uint256 _maxRewardPerSeller\n )\n external\n onlyOwner\n {\n maxRewardPerSeller = _maxRewardPerSeller;\n }\n\n /**\n * @dev Method to allow the owner to change the timeWindow variable\n * @param _timeWindow A time window in seconds\n */\n function changeTimeWindow(uint256 _timeWindow) external onlyOwner {\n timeWindow = _timeWindow;\n }\n\n /**\n * @dev Returns the number of rewarded buyers associated with a given seller\n * @param seller Address of the promoted seller\n */\n function noOfRewardedBuyers(\n address seller\n )\n external\n view\n returns (uint256 size)\n {\n size = sellerVsBuyers[seller].length;\n return size;\n }\n\n /**\n * @dev Method to get rewarded buyer address at specific index for a seller\n * @param seller Seller for whom the rewarded buyer is requested\n * @param index Index at which buyer has to be retrieved\n */\n function getRewardedBuyer(\n address seller,\n uint256 index\n )\n external\n view\n returns (address buyer)\n {\n require(\n sellerVsBuyers[seller].length > index,\n \"Array index out of bound\"\n );\n buyer = sellerVsBuyers[seller][index];\n return buyer;\n }\n\n /**\n * @dev Allows the owner of the contract to turn on the rewards distribution\n * Only if it was not previously turned on\n */\n function turnOnRewards() external onlyOwner {\n require(!rewardsOn, \"Rewards distribution is already on\");\n\n rewardsOn = true;\n\n emit RewardsOn();\n }\n\n /**\n * @dev ALlows owner to set endDate\n * @param _endDate date the promotion ends\n */\n function setEndDate(uint256 _endDate) external onlyOwner {\n require(\n _endDate > block.timestamp,\n \"End date should be greater than current date\"\n );\n\n endDate = _endDate;\n\n emit EndDateChanged(endDate);\n }\n\n function isRewardsRunning() external view returns (bool running) {\n running = rewardsOn && (endDate > block.timestamp);\n return running;\n }\n\n /**\n * @dev Buyer can call this method to calculate the reward for their\n * transaction\n * @param scriptHash Script hash of the transaction\n */\n function calculateReward(\n bytes32 scriptHash\n )\n public\n view\n returns (uint256 amount)\n {\n (\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n ) = _getTransaction(scriptHash);\n\n amount = _getTokensToReward(\n scriptHash,\n buyer,\n seller,\n status,\n lastModified\n );\n\n return amount;\n }\n\n /**\n * @dev Using this method user can choose to execute their transaction and\n * claim their rewards in one go. This will save one transaction.\n * Users can only use this method if their trade is using escrowContract\n * for escrow.\n * See the execute() method Escrow_v1_0.sol for more information.\n */\n function executeAndClaim(\n uint8[] sigV,\n bytes32[] sigR,\n bytes32[] sigS,\n bytes32 scriptHash,\n address[] destinations,\n uint256[] amounts\n )\n public\n rewardsRunning\n\n {\n //1. Execute transaction\n //SECURITY NOTE: `escrowContract` is a known and trusted contract, but\n //the `execute` function transfers ETH or Tokens, and therefore hands\n //over control of the logic flow to a potential attacker.\n escrowContract.execute(\n sigV,\n sigR,\n sigS,\n scriptHash,\n destinations,\n amounts\n );\n\n //2. Claim Reward\n bytes32[] memory scriptHashes = new bytes32[](1);\n scriptHashes[0] = scriptHash;\n\n claimRewards(scriptHashes);\n }\n\n /**\n * @dev Function to claim tokens\n * @param scriptHashes Array of scriptHashes of OB trades for which\n * the buyer wants to claim reward tokens.\n * Note that a Buyer can perform trades with multiple promoted sellers and\n * then can claim their reward tokens all at once for all those trades using\n * this function.\n * Be mindful of the block gas limit (do not pass too many scripthashes).\n */\n function claimRewards(bytes32[] scriptHashes) public rewardsRunning {\n\n require(scriptHashes.length > 0, \"No script hash passed\");\n\n for (uint256 i = 0; i < scriptHashes.length; i++) {\n\n //1. Get the transaction from Escrow contract\n (\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n ) = _getTransaction(scriptHashes[i]);\n\n //2. Check that the transaction exists\n //3. Check seller is promoted seller and the\n //timeWindow has not closed\n //4. Get the number of tokens to be given as reward\n //5. The seller must be one of the beneficiaries\n uint256 rewardAmount = _getTokensToReward(\n scriptHashes[i],\n buyer,\n seller,\n status,\n lastModified\n );\n\n uint256 contractBalance = obToken.balanceOf(this);\n\n if (rewardAmount > contractBalance) {\n rewardAmount = contractBalance;\n }\n\n if (rewardAmount == 0) {\n emit UnsuccessfulClaim(scriptHashes[i], seller, buyer);\n continue;\n }\n\n //6. Update state\n sellerVsBuyers[seller].push(buyer);\n\n sellerVsBuyerRewards[seller][buyer] = sellerVsBuyerRewards[\n seller\n ][\n buyer\n ].add(rewardAmount);\n\n sellerVsRewardsDistributed[seller] = sellerVsRewardsDistributed[\n seller\n ].add(rewardAmount);\n\n totalTokensDistributed = totalTokensDistributed.add(rewardAmount);\n\n //7. Emit event\n emit SuccessfulClaim(\n scriptHashes[i],\n seller,\n buyer,\n rewardAmount\n );\n\n //8. Transfer token\n obToken.transfer(buyer, rewardAmount);\n }\n\n }\n\n //Private method to get transaction info out from the escrow contract\n function _getTransaction(\n bytes32 _scriptHash\n )\n private\n view\n returns(\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n {\n // calling a trusted contract's view function\n (\n ,\n lastModified,\n status,\n ,,,\n buyer,\n seller,\n\n ) = escrowContract.transactions(_scriptHash);\n\n return (buyer, seller, status, lastModified);\n }\n\n /**\n * @dev Checks -:\n * 1. If transaction exists\n * 2. If seller is promoted\n * 3. Transaction has been closed/released\n * 4. Transaction happened with the time window.\n * 5. Seller must be one of the beneficiaries of the transaction execution\n * @param scriptHash Script hash of the transaction\n * @param buyer Buyer in the transaction\n * @param seller Seller in the transaction\n * @param status Status of the transaction\n * @param lastModified Last modified time of the transaction\n * @return bool Returns whether transaction is valid and eligible\n * for rewards\n */\n function _verifyTransactionData(\n bytes32 scriptHash,\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n private\n view\n returns (bool verified)\n {\n\n verified = true;\n\n if (buyer == address(0)) {\n //If buyer is a zero address then we treat the transaction as\n //a not verified\n verified = false;\n }\n\n else if (!promotedSellers[seller]) {\n //seller of the transaction is not a promoted seller\n verified = false;\n }\n else if (status != 1) {\n //Transaction has not been released\n verified = false;\n }\n else if (\n //Calling a trusted contract's view function\n !escrowContract.checkVote(scriptHash, seller)\n )\n {\n //Seller was not one of the signers\n verified = false;\n }\n else if (\n //Calling a trusted contract's view function\n !escrowContract.checkBeneficiary(scriptHash, seller)\n ) {\n //Seller was not one of the beneficiaries.\n //This means the transaction was either cancelled or\n //completely refunded.\n verified = false;\n }\n else if (lastModified.add(timeWindow) < block.timestamp) {\n //timeWindow has been exceeded\n verified = false;\n }\n\n return verified;\n }\n\n /**\n * @dev Private function to get Tokens to be distributed as reward\n * Checks whether transaction is verified or not and computes the\n * amount of the rewards using the _calculateReward() method\n */\n function _getTokensToReward(\n bytes32 scriptHash,\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n private\n view\n returns (uint256 amount)\n {\n\n if (\n !_verifyTransactionData(\n scriptHash,\n buyer,\n seller,\n status,\n lastModified\n )\n )\n {\n amount = 0;\n }\n\n else {\n amount = _calculateReward(buyer, seller);\n }\n\n return amount;\n }\n\n /**\n * @dev Private function to calculate reward.\n * Please see link for rewards calculation algo\n * https://github.com/OB1Company/openbazaar-smart-contracts/issues/10\n */\n function _calculateReward(\n address buyer,\n address seller\n )\n private\n view\n returns (uint256 amount)\n {\n\n if (sellerVsRewardsDistributed[seller] >= maxRewardPerSeller) {\n //No more rewards can be distributed for buying from the\n //given seller\n amount = 0;\n }\n\n else {\n //maxRewardToBuyerPerSeller tokens will be given to each buyer per\n //seller until the maximum amount of rewards for the seller has\n //been exhausted\n amount = maxRewardToBuyerPerSeller.sub(sellerVsBuyerRewards[seller][buyer]);\n\n //Check that we are not disbursing more rewards than are\n //allocated per seller\n if (sellerVsRewardsDistributed[seller].add(amount) > maxRewardPerSeller) {\n amount = maxRewardPerSeller.sub(sellerVsRewardsDistributed[seller]);\n }\n\n }\n\n return amount;\n\n }\n\n\n}\n", + "bytecode": "0x60806040523480156200001157600080fd5b506040516080806200320d83398101806040528101908080519060200190929190805190602001909291908051906020019092919080519060200190929190505050336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a381600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515620001b6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156200025d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600086111515620002fc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001807f4d6178696d756d20726577617264206d7573742062652067726561746572207481526020017f68616e203000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6000851115156200039b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f54696d652077696e646f77206d7573742062652067726561746572207468616e81526020017f203000000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b856002819055508460058190555083600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600b60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555062000518600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b158015620004b657600080fd5b505af1158015620004cb573d6000803e3d6000fd5b505050506040513d6020811015620004e257600080fd5b810190808051906020019092919050505060ff16600a0a60326200052a6401000000000262002c27179091906401000000009004565b6003819055505050505050506200056c565b600080600084141562000541576000915062000565565b82840290508284828115156200055357fe5b041415156200056157600080fd5b8091505b5092915050565b612c91806200057c6000396000f300608060405260043610610175576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063040f9a5e1461017a5780630d80149d146101bd5780630f3c34d11461021857806311fe9ec61461027e5780632aea50fe146102d55780633784f0001461031a5780635963537514610347578063676c4771146103825780636a3467a5146103ad578063715018a61461040457806385788f6f1461041b5780638c3bc195146104465780638da5cb5b146104bd5780638f32d59b14610514578063b05f86c214610543578063b08d687a146105d0578063ba9b865f14610750578063baf3c0ae1461078b578063c24a0f8b146107b8578063c7285a73146107e3578063c828b4791461087b578063cb97c585146108a8578063d2f343c7146108ff578063d8f163ab1461092a578063e42a96e714610955578063f26d8ce8146109ac578063f2fde38b146109c3578063f6c5aeb214610a06578063f90b112f14610a35575b600080fd5b34801561018657600080fd5b506101bb600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610a64565b005b3480156101c957600080fd5b506101fe600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d1f565b604051808215151515815260200191505060405180910390f35b34801561022457600080fd5b5061027c60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610d3f565b005b34801561028a57600080fd5b506102bf600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611582565b6040518082815260200191505060405180910390f35b3480156102e157600080fd5b5061030460048036038101908080356000191690602001909291905050506115ce565b6040518082815260200191505060405180910390f35b34801561032657600080fd5b5061034560048036038101908080359060200190929190505050611602565b005b34801561035357600080fd5b506103806004803603810190808035906020019082018035906020019190919293919293905050506116f5565b005b34801561038e57600080fd5b50610397611802565b6040518082815260200191505060405180910390f35b3480156103b957600080fd5b506103c2611808565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561041057600080fd5b5061041961182e565b005b34801561042757600080fd5b50610430611900565b6040518082815260200191505060405180910390f35b34801561045257600080fd5b506104a7600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611906565b6040518082815260200191505060405180910390f35b3480156104c957600080fd5b506104d261198d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561052057600080fd5b506105296119b6565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061058e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a0d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156105dc57600080fd5b5061074e60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091929192908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080356000191690602001909291908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050611b4a565b005b34801561075c57600080fd5b50610789600480360381019080803590602001908201803590602001919091929391929390505050611e8e565b005b34801561079757600080fd5b506107b6600480360381019080803590602001909291905050506121a1565b005b3480156107c457600080fd5b506107cd6121be565b6040518082815260200191505060405180910390f35b3480156107ef57600080fd5b50610824600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506121c4565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561086757808201518184015260208101905061084c565b505050509050019250505060405180910390f35b34801561088757600080fd5b506108a660048036038101908080359060200190929190505050612294565b005b3480156108b457600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506122b1565b6040518082815260200191505060405180910390f35b34801561090b57600080fd5b50610914612300565b6040518082815260200191505060405180910390f35b34801561093657600080fd5b5061093f612306565b6040518082815260200191505060405180910390f35b34801561096157600080fd5b5061096a61230c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156109b857600080fd5b506109c1612332565b005b3480156109cf57600080fd5b50610a04600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612439565b005b348015610a1257600080fd5b50610a1b612458565b604051808215151515815260200191505060405180910390f35b348015610a4157600080fd5b50610a4a61246b565b604051808215151515815260200191505060405180910390f35b6000610a6e6119b6565b1515610a7957600080fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610b1f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610bdc57600080fd5b505af1158015610bf0573d6000803e3d6000fd5b505050506040513d6020811015610c0657600080fd5b81019080805190602001909291905050509150600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb84846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610cde57600080fd5b505af1158015610cf2573d6000803e3d6000fd5b505050506040513d6020811015610d0857600080fd5b810190808051906020019092919050505050505050565b60016020528060005260406000206000915054906101000a900460ff1681565b6000806000806000806000600b60149054906101000a900460ff168015610d67575042600c54115b1515610e01576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008851111515610e7a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20736372697074206861736820706173736564000000000000000000000081525060200191505060405180910390fd5b600096505b875187101561157857610ea88888815181101515610e9957fe5b90602001906020020151612492565b9550955095509550610ed48888815181101515610ec157fe5b90602001906020020151878787876125fa565b9150600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610f9357600080fd5b505af1158015610fa7573d6000803e3d6000fd5b505050506040513d6020811015610fbd57600080fd5b8101908080519060200190929190505050905080821115610fdc578091505b6000821415611060578573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561102157fe5b90602001906020020151600019167ff939e9640bc0433f3e944a23fbb977ee3d326f2523da16c258cce16734a1c4cf60405160405180910390a461156b565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611229576001600760008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208690806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b6112b882600860008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b600860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061138a82600960008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113e28260045461263190919063ffffffff16565b6004819055508573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561142457fe5b90602001906020020151600019167fdb28ff209f2a631171420977162edbe85659d93149d92f69f81260675f546a3a856040518082815260200191505060405180910390a4600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb87846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561152e57600080fd5b505af1158015611542573d6000803e3d6000fd5b505050506040513d602081101561155857600080fd5b8101908080519060200190929190505050505b8680600101975050610e7f565b5050505050505050565b6000600960008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050809050919050565b60008060008060006115df86612492565b93509350935093506115f486858585856125fa565b945084945050505050919050565b61160a6119b6565b151561161557600080fd5b42811115156116b2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f456e6420646174652073686f756c642062652067726561746572207468616e2081526020017f63757272656e742064617465000000000000000000000000000000000000000081525060400191505060405180910390fd5b80600c819055507f78f20fcb2c7d71918cb4f6b5e6c6eb0bf4ed26c77d48c64a29c6f448c40d9ae8600c546040518082815260200191505060405180910390a150565b60006116ff6119b6565b151561170a57600080fd5b600090505b828290508110156117a957600060016000858585818110151561172e57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550808060010191505061170f565b7f5d3cc1ddd817cba6d86bf4cb3d582965e47b25685de10dcfe87dcb8607ba56308383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b60025481565b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6118366119b6565b151561184157600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60035481565b6000600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b600081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080549050111515611ac8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f417272617920696e646578206f7574206f6620626f756e64000000000000000081525060200191505060405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002082815481101515611b1457fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080905092915050565b6060600b60149054906101000a900460ff168015611b69575042600c54115b1515611c03576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e4ec8b008888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808060200180602001806020018760001916600019168152602001806020018060200186810386528c818151815260200191508051906020019060200280838360005b83811015611cd3578082015181840152602081019050611cb8565b5050505090500186810385528b818151815260200191508051906020019060200280838360005b83811015611d15578082015181840152602081019050611cfa565b5050505090500186810384528a818151815260200191508051906020019060200280838360005b83811015611d57578082015181840152602081019050611d3c565b50505050905001868103835288818151815260200191508051906020019060200280838360005b83811015611d99578082015181840152602081019050611d7e565b50505050905001868103825287818151815260200191508051906020019060200280838360005b83811015611ddb578082015181840152602081019050611dc0565b505050509050019b505050505050505050505050600060405180830381600087803b158015611e0957600080fd5b505af1158015611e1d573d6000803e3d6000fd5b505050506001604051908082528060200260200182016040528015611e515781602001602082028038833980820191505090505b50905083816000815181101515611e6457fe5b906020019060200201906000191690816000191681525050611e8581610d3f565b50505050505050565b6000611e986119b6565b1515611ea357600080fd5b600090505b8282905081101561214857600073ffffffffffffffffffffffffffffffffffffffff168383838181101515611ed957fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515611fa8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260288152602001807f5a65726f20616464726573732063616e6e6f7420626520612070726f6d6f746581526020017f642073656c6c657200000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600160008484848181101515611fba57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156120ba576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4f6e65206f66207468652073656c6c65727320697320616c726561647920707281526020017f6f6d6f746564000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600180600085858581811015156120cd57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508080600101915050611ea8565b7fa61ea6f08d34b0cf93586736a7fdd8becfc2d5f8443cd5fa4e27d7ae0f0c99758383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b6121a96119b6565b15156121b457600080fd5b8060058190555050565b600c5481565b6060600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561228557602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001906001019080831161223b575b50505050509050809050919050565b61229c6119b6565b15156122a757600080fd5b8060028190555050565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490509050809050919050565b60055481565b60045481565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61233a6119b6565b151561234557600080fd5b600b60149054906101000a900460ff161515156123f0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5265776172647320646973747269627574696f6e20697320616c72656164792081526020017f6f6e00000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6001600b60146101000a81548160ff0219169083151502179055507ffb3ffd640eb2af7384a797d8a341f421615d81ef4e03359874984268cbd9003a60405160405180910390a1565b6124416119b6565b151561244c57600080fd5b61245581612652565b50565b600b60149054906101000a900460ff1681565b6000600b60149054906101000a900460ff16801561248a575042600c54115b905080905090565b600080600080600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663642f2eaf866040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505061012060405180830381600087803b15801561253257600080fd5b505af1158015612546573d6000803e3d6000fd5b505050506040513d61012081101561255d57600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090919293949596975090919293945090919293509091925050809650819750829550839450505050508383838393509350935093509193509193565b6000612609868686868661274c565b15156126185760009050612625565b6126228585612a62565b90505b80905095945050505050565b600080828401905083811015151561264857600080fd5b8091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561268e57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600060019050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1614156127905760009050612a56565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156127ec5760009050612a55565b60018360ff161415156128025760009050612a54565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663f078656287866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156128cf57600080fd5b505af11580156128e3573d6000803e3d6000fd5b505050506040513d60208110156128f957600080fd5b810190808051906020019092919050505015156129195760009050612a53565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b0550c6687866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156129e657600080fd5b505af11580156129fa573d6000803e3d6000fd5b505050506040513d6020811015612a1057600080fd5b81019080805190602001909291905050501515612a305760009050612a52565b42612a466005548461263190919063ffffffff16565b1015612a5157600090505b5b5b5b5b5b80905095945050505050565b6000600254600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515612ab75760009050612bfd565b612b48600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054600354612c0690919063ffffffff16565b9050600254612b9f82600960008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b1115612bfc57612bf9600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054600254612c0690919063ffffffff16565b90505b5b80905092915050565b600080838311151515612c1857600080fd5b82840390508091505092915050565b6000806000841415612c3c5760009150612c5e565b8284029050828482811515612c4d57fe5b04141515612c5a57600080fd5b8091505b50929150505600a165627a7a7230582052f15fc472026db479d9bcc02193ca6d5207d3ba864f47a3133ca5fce69955500029", + "deployedBytecode": "0x608060405260043610610175576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063040f9a5e1461017a5780630d80149d146101bd5780630f3c34d11461021857806311fe9ec61461027e5780632aea50fe146102d55780633784f0001461031a5780635963537514610347578063676c4771146103825780636a3467a5146103ad578063715018a61461040457806385788f6f1461041b5780638c3bc195146104465780638da5cb5b146104bd5780638f32d59b14610514578063b05f86c214610543578063b08d687a146105d0578063ba9b865f14610750578063baf3c0ae1461078b578063c24a0f8b146107b8578063c7285a73146107e3578063c828b4791461087b578063cb97c585146108a8578063d2f343c7146108ff578063d8f163ab1461092a578063e42a96e714610955578063f26d8ce8146109ac578063f2fde38b146109c3578063f6c5aeb214610a06578063f90b112f14610a35575b600080fd5b34801561018657600080fd5b506101bb600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610a64565b005b3480156101c957600080fd5b506101fe600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610d1f565b604051808215151515815260200191505060405180910390f35b34801561022457600080fd5b5061027c60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050610d3f565b005b34801561028a57600080fd5b506102bf600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611582565b6040518082815260200191505060405180910390f35b3480156102e157600080fd5b5061030460048036038101908080356000191690602001909291905050506115ce565b6040518082815260200191505060405180910390f35b34801561032657600080fd5b5061034560048036038101908080359060200190929190505050611602565b005b34801561035357600080fd5b506103806004803603810190808035906020019082018035906020019190919293919293905050506116f5565b005b34801561038e57600080fd5b50610397611802565b6040518082815260200191505060405180910390f35b3480156103b957600080fd5b506103c2611808565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561041057600080fd5b5061041961182e565b005b34801561042757600080fd5b50610430611900565b6040518082815260200191505060405180910390f35b34801561045257600080fd5b506104a7600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611906565b6040518082815260200191505060405180910390f35b3480156104c957600080fd5b506104d261198d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561052057600080fd5b506105296119b6565b604051808215151515815260200191505060405180910390f35b34801561054f57600080fd5b5061058e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050611a0d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156105dc57600080fd5b5061074e60048036038101908080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091929192908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080356000191690602001909291908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509192919290505050611b4a565b005b34801561075c57600080fd5b50610789600480360381019080803590602001908201803590602001919091929391929390505050611e8e565b005b34801561079757600080fd5b506107b6600480360381019080803590602001909291905050506121a1565b005b3480156107c457600080fd5b506107cd6121be565b6040518082815260200191505060405180910390f35b3480156107ef57600080fd5b50610824600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506121c4565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561086757808201518184015260208101905061084c565b505050509050019250505060405180910390f35b34801561088757600080fd5b506108a660048036038101908080359060200190929190505050612294565b005b3480156108b457600080fd5b506108e9600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506122b1565b6040518082815260200191505060405180910390f35b34801561090b57600080fd5b50610914612300565b6040518082815260200191505060405180910390f35b34801561093657600080fd5b5061093f612306565b6040518082815260200191505060405180910390f35b34801561096157600080fd5b5061096a61230c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156109b857600080fd5b506109c1612332565b005b3480156109cf57600080fd5b50610a04600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612439565b005b348015610a1257600080fd5b50610a1b612458565b604051808215151515815260200191505060405180910390f35b348015610a4157600080fd5b50610a4a61246b565b604051808215151515815260200191505060405180910390f35b6000610a6e6119b6565b1515610a7957600080fd5b81600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614151515610b1f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5a65726f2061646472657373206e6f7420616c6c6f776564000000000000000081525060200191505060405180910390fd5b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610bdc57600080fd5b505af1158015610bf0573d6000803e3d6000fd5b505050506040513d6020811015610c0657600080fd5b81019080805190602001909291905050509150600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb84846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b158015610cde57600080fd5b505af1158015610cf2573d6000803e3d6000fd5b505050506040513d6020811015610d0857600080fd5b810190808051906020019092919050505050505050565b60016020528060005260406000206000915054906101000a900460ff1681565b6000806000806000806000600b60149054906101000a900460ff168015610d67575042600c54115b1515610e01576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008851111515610e7a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4e6f20736372697074206861736820706173736564000000000000000000000081525060200191505060405180910390fd5b600096505b875187101561157857610ea88888815181101515610e9957fe5b90602001906020020151612492565b9550955095509550610ed48888815181101515610ec157fe5b90602001906020020151878787876125fa565b9150600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166370a08231306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600087803b158015610f9357600080fd5b505af1158015610fa7573d6000803e3d6000fd5b505050506040513d6020811015610fbd57600080fd5b8101908080519060200190929190505050905080821115610fdc578091505b6000821415611060578573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561102157fe5b90602001906020020151600019167ff939e9640bc0433f3e944a23fbb977ee3d326f2523da16c258cce16734a1c4cf60405160405180910390a461156b565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515611229576001600760008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208690806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b6112b882600860008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b600860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555061138a82600960008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b600960008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113e28260045461263190919063ffffffff16565b6004819055508573ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16898981518110151561142457fe5b90602001906020020151600019167fdb28ff209f2a631171420977162edbe85659d93149d92f69f81260675f546a3a856040518082815260200191505060405180910390a4600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb87846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b15801561152e57600080fd5b505af1158015611542573d6000803e3d6000fd5b505050506040513d602081101561155857600080fd5b8101908080519060200190929190505050505b8680600101975050610e7f565b5050505050505050565b6000600960008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050809050919050565b60008060008060006115df86612492565b93509350935093506115f486858585856125fa565b945084945050505050919050565b61160a6119b6565b151561161557600080fd5b42811115156116b2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602c8152602001807f456e6420646174652073686f756c642062652067726561746572207468616e2081526020017f63757272656e742064617465000000000000000000000000000000000000000081525060400191505060405180910390fd5b80600c819055507f78f20fcb2c7d71918cb4f6b5e6c6eb0bf4ed26c77d48c64a29c6f448c40d9ae8600c546040518082815260200191505060405180910390a150565b60006116ff6119b6565b151561170a57600080fd5b600090505b828290508110156117a957600060016000858585818110151561172e57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550808060010191505061170f565b7f5d3cc1ddd817cba6d86bf4cb3d582965e47b25685de10dcfe87dcb8607ba56308383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b60025481565b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6118366119b6565b151561184157600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60035481565b6000600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b600081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080549050111515611ac8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f417272617920696e646578206f7574206f6620626f756e64000000000000000081525060200191505060405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002082815481101515611b1457fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080905092915050565b6060600b60149054906101000a900460ff168015611b69575042600c54115b1515611c03576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f52657761726420646973747269627574696f6e206973206e6f742072756e6e6981526020017f6e6700000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e4ec8b008888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808060200180602001806020018760001916600019168152602001806020018060200186810386528c818151815260200191508051906020019060200280838360005b83811015611cd3578082015181840152602081019050611cb8565b5050505090500186810385528b818151815260200191508051906020019060200280838360005b83811015611d15578082015181840152602081019050611cfa565b5050505090500186810384528a818151815260200191508051906020019060200280838360005b83811015611d57578082015181840152602081019050611d3c565b50505050905001868103835288818151815260200191508051906020019060200280838360005b83811015611d99578082015181840152602081019050611d7e565b50505050905001868103825287818151815260200191508051906020019060200280838360005b83811015611ddb578082015181840152602081019050611dc0565b505050509050019b505050505050505050505050600060405180830381600087803b158015611e0957600080fd5b505af1158015611e1d573d6000803e3d6000fd5b505050506001604051908082528060200260200182016040528015611e515781602001602082028038833980820191505090505b50905083816000815181101515611e6457fe5b906020019060200201906000191690816000191681525050611e8581610d3f565b50505050505050565b6000611e986119b6565b1515611ea357600080fd5b600090505b8282905081101561214857600073ffffffffffffffffffffffffffffffffffffffff168383838181101515611ed957fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515611fa8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260288152602001807f5a65726f20616464726573732063616e6e6f7420626520612070726f6d6f746581526020017f642073656c6c657200000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600160008484848181101515611fba57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156120ba576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001807f4f6e65206f66207468652073656c6c65727320697320616c726561647920707281526020017f6f6d6f746564000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b600180600085858581811015156120cd57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508080600101915050611ea8565b7fa61ea6f08d34b0cf93586736a7fdd8becfc2d5f8443cd5fa4e27d7ae0f0c99758383604051808060200182810382528484828181526020019250602002808284378201915050935050505060405180910390a1505050565b6121a96119b6565b15156121b457600080fd5b8060058190555050565b600c5481565b6060600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561228557602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001906001019080831161223b575b50505050509050809050919050565b61229c6119b6565b15156122a757600080fd5b8060028190555050565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490509050809050919050565b60055481565b60045481565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61233a6119b6565b151561234557600080fd5b600b60149054906101000a900460ff161515156123f0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001807f5265776172647320646973747269627574696f6e20697320616c72656164792081526020017f6f6e00000000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b6001600b60146101000a81548160ff0219169083151502179055507ffb3ffd640eb2af7384a797d8a341f421615d81ef4e03359874984268cbd9003a60405160405180910390a1565b6124416119b6565b151561244c57600080fd5b61245581612652565b50565b600b60149054906101000a900460ff1681565b6000600b60149054906101000a900460ff16801561248a575042600c54115b905080905090565b600080600080600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663642f2eaf866040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505061012060405180830381600087803b15801561253257600080fd5b505af1158015612546573d6000803e3d6000fd5b505050506040513d61012081101561255d57600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919050505090919293949596975090919293945090919293509091925050809650819750829550839450505050508383838393509350935093509193509193565b6000612609868686868661274c565b15156126185760009050612625565b6126228585612a62565b90505b80905095945050505050565b600080828401905083811015151561264857600080fd5b8091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561268e57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600060019050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1614156127905760009050612a56565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615156127ec5760009050612a55565b60018360ff161415156128025760009050612a54565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663f078656287866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156128cf57600080fd5b505af11580156128e3573d6000803e3d6000fd5b505050506040513d60208110156128f957600080fd5b810190808051906020019092919050505015156129195760009050612a53565b600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b0550c6687866040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600019166000191681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600087803b1580156129e657600080fd5b505af11580156129fa573d6000803e3d6000fd5b505050506040513d6020811015612a1057600080fd5b81019080805190602001909291905050501515612a305760009050612a52565b42612a466005548461263190919063ffffffff16565b1015612a5157600090505b5b5b5b5b5b80905095945050505050565b6000600254600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515612ab75760009050612bfd565b612b48600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054600354612c0690919063ffffffff16565b9050600254612b9f82600960008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461263190919063ffffffff16565b1115612bfc57612bf9600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054600254612c0690919063ffffffff16565b90505b5b80905092915050565b600080838311151515612c1857600080fd5b82840390508091505092915050565b6000806000841415612c3c5760009150612c5e565b8284029050828482811515612c4d57fe5b04141515612c5a57600080fd5b8091505b50929150505600a165627a7a7230582052f15fc472026db479d9bcc02193ca6d5207d3ba864f47a3133ca5fce69955500029", + "sourceMap": "510:18127:5:-;;;3443:834;8:9:-1;5:2;;;30:1;27;20:12;5:2;3443:834:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;518:10:11;509:6;;:19;;;;;;;;;;;;;;;;;;572:6;;;;;;;;;;;539:40;;568:1;539:40;;;;;;;;;;;;3674:22:5;2775:1;2755:22;;:8;:22;;;;2747:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3721:14;2775:1;2755:22;;:8;:22;;;;2747:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3795:1;3773:19;:23;3752:107;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3905:1;3891:11;:15;3870:96;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3998:19;3977:18;:40;;;;4040:11;4027:10;:24;;;;4086:22;4061:14;;:48;;;;;;;;;;;;;;;;;;4144:14;4119:7;;:40;;;;;;;;;;;;;;;;;;4197:72;4240:7;;;;;;;;;;;:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4240:18:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4240:18:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4240:18:5;;;;;;;;;;;;;;;;4232:27;;4226:2;:33;4205:2;4197:15;;;;;;:72;;;;;:::i;:::-;4169:25;:100;;;;2816:1;3443:834;;;;;510:18127;;204:381:10;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o;510:18127:5:-;;;;;;;", + "deployedSourceMap": "510:18127:5:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6967:239;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6967:239:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;614:47;;8:9:-1;5:2;;;30:1;27;20:12;5:2;614:47:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11806:2137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11806:2137:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6542:243;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6542:243:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9747:477;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9747:477:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9160:259;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9160:259:5;;;;;;;;;;;;;;;;;;;;;;;;;;5241:238;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5241:238:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;668:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;668:33:5;;;;;;;;;;;;;;;;;;;;;;;2039:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2039:29:5;;;;;;;;;;;;;;;;;;;;;;;;;;;1273:127:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1273:127:11;;;;;;708:40:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;708:40:5;;;;;;;;;;;;;;;;;;;;;;;6110:234;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6110:234:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;639:70:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;639:70:11;;;;;;;;;;;;;;;;;;;;;;;;;;;926:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;926:83:11;;;;;;;;;;;;;;;;;;;;;;;;;;;8386:349:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8386:349:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10555:821;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10555:821:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4554:570;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4554:570:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7697:107;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7697:107:5;;;;;;;;;;;;;;;;;;;;;;;;;;2202:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2202:22:5;;;;;;;;;;;;;;;;;;;;;;;5682:202;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5682:202:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;5682:202:5;;;;;;;;;;;;;;;;;7382:173;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7382:173:5;;;;;;;;;;;;;;;;;;;;;;;;;;7956:202;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7956:202:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1045:25;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1045:25:5;;;;;;;;;;;;;;;;;;;;;;;755:37;;8:9:-1;5:2;;;30:1;27;20:12;5:2;755:37:5;;;;;;;;;;;;;;;;;;;;;;;1937:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1937:29:5;;;;;;;;;;;;;;;;;;;;;;;;;;;8882:172;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8882:172:5;;;;;;1561:101:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1561:101:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;2142:21:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2142:21:5;;;;;;;;;;;;;;;;;;;;;;;;;;;9425:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9425:156:5;;;;;;;;;;;;;;;;;;;;;;;;;;;6967:239;7114:14;824:9:11;:7;:9::i;:::-;816:18;;;;;;;;7090:8:5;2775:1;2755:22;;:8;:22;;;;2747:59;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7131:7;;;;;;;;;;;:17;;;7149:4;7131:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7131:23:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7131:23:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7131:23:5;;;;;;;;;;;;;;;;7114:40;;7165:7;;;;;;;;;;;:16;;;7182:8;7192:6;7165:34;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7165:34:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7165:34:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;7165:34:5;;;;;;;;;;;;;;;;;840:1:11;6967:239:5;;:::o;614:47::-;;;;;;;;;;;;;;;;;;;;;;:::o;11806:2137::-;11958:9;12094:13;12125:14;12157:12;12187:20;12544;12748:23;2887:9;;;;;;;;;;;:40;;;;;2911:15;2901:7;;:25;2887:40;2866:121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11915:1;11893:12;:19;:23;11885:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11970:1;11958:13;;11953:1983;11977:12;:19;11973:1;:23;11953:1983;;;12224:32;12240:12;12253:1;12240:15;;;;;;;;;;;;;;;;;;12224;:32::i;:::-;12076:180;;;;;;;;12567:166;12603:12;12616:1;12603:15;;;;;;;;;;;;;;;;;;12636:5;12659:6;12683;12707:12;12567:18;:166::i;:::-;12544:189;;12774:7;;;;;;;;;;;:17;;;12792:4;12774:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12774:23:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12774:23:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;12774:23:5;;;;;;;;;;;;;;;;12748:49;;12831:15;12816:12;:30;12812:99;;;12881:15;12866:30;;12812:99;12945:1;12929:12;:17;12925:136;;;13014:5;12971:49;;13006:6;12971:49;;12989:12;13002:1;12989:15;;;;;;;;;;;;;;;;;;12971:49;;;;;;;;;;;;;13038:8;;12925:136;13110:18;:26;13129:6;13110:26;;;;;;;;;;;;;;;:33;13137:5;13110:33;;;;;;;;;;;;;;;;;;;;;;;;;13109:34;13105:170;;;13199:4;13163:18;:26;13182:6;13163:26;;;;;;;;;;;;;;;:33;13190:5;13163:33;;;;;;;;;;;;;;;;:40;;;;;;;;;;;;;;;;;;13221:19;:27;13241:6;13221:27;;;;;;;;;;;;;;;13254:5;13221:39;;39:1:-1;33:3;27:10;23:18;57:10;52:3;45:23;79:10;72:17;;0:93;13221:39:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;13105:170;13327:113;13427:12;13327:20;:58;13365:6;13327:58;;;;;;;;;;;;;;;:95;13403:5;13327:95;;;;;;;;;;;;;;;;:99;;:113;;;;:::i;:::-;13289:20;:28;13310:6;13289:28;;;;;;;;;;;;;;;:35;13318:5;13289:35;;;;;;;;;;;;;;;:151;;;;13492:82;13561:12;13492:26;:64;13536:6;13492:64;;;;;;;;;;;;;;;;:68;;:82;;;;:::i;:::-;13455:26;:34;13482:6;13455:34;;;;;;;;;;;;;;;:119;;;;13614:40;13641:12;13614:22;;:26;;:40;;;;:::i;:::-;13589:22;:65;;;;13792:5;13702:139;;13768:6;13702:139;;13735:12;13748:1;13735:15;;;;;;;;;;;;;;;;;;13702:139;;;;13815:12;13702:139;;;;;;;;;;;;;;;;;;13888:7;;;;;;;;;;;:16;;;13905:5;13912:12;13888:37;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13888:37:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13888:37:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;13888:37:5;;;;;;;;;;;;;;;;;11953:1983;11998:3;;;;;;;11953:1983;;;11806:2137;;;;;;;;:::o;6542:243::-;6649:25;6710:26;:34;6737:6;6710:34;;;;;;;;;;;;;;;;6690:54;;6761:17;6754:24;;6542:243;;;:::o;9747:477::-;9851:14;9895:13;9922:14;9950:12;9976:20;10009:27;10025:10;10009:15;:27::i;:::-;9881:155;;;;;;;;10056:137;10088:10;10112:5;10131:6;10151;10171:12;10056:18;:137::i;:::-;10047:146;;10211:6;10204:13;;9747:477;;;;;;;:::o;9160:259::-;824:9:11;:7;:9::i;:::-;816:18;;;;;;;;9259:15:5;9248:8;:26;9227:117;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9365:8;9355:7;:18;;;;9389:23;9404:7;;9389:23;;;;;;;;;;;;;;;;;;9160:259;:::o;5241:238::-;5326:9;824::11;:7;:9::i;:::-;816:18;;;;;;;;5338:1:5;5326:13;;5321:106;5345:7;;:14;;5341:1;:18;5321:106;;;5411:5;5381:15;:27;5397:7;;5405:1;5397:10;;;;;;;;;;;;;;;;;5381:27;;;;;;;;;;;;;;;;:35;;;;;;;;;;;;;;;;;;5361:3;;;;;;;5321:106;;;5441:31;5464:7;;5441:31;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5241:238;;;:::o;668:33::-;;;;:::o;2039:29::-;;;;;;;;;;;;;:::o;1273:127:11:-;824:9;:7;:9::i;:::-;816:18;;;;;;;;1367:1;1330:40;;1351:6;;;;;;;;;;;1330:40;;;;;;;;;;;;1393:1;1376:6;;:19;;;;;;;;;;;;;;;;;;1273:127::o;708:40:5:-;;;;:::o;6110:234::-;6250:20;6302;:28;6323:6;6302:28;;;;;;;;;;;;;;;:35;6331:5;6302:35;;;;;;;;;;;;;;;;6295:42;;6110:234;;;;:::o;639:70:11:-;676:7;698:6;;;;;;;;;;;691:13;;639:70;:::o;926:83::-;965:4;998:6;;;;;;;;;;;984:20;;:10;:20;;;977:27;;926:83;:::o;8386:349:5:-;8512:13;8599:5;8562:19;:27;8582:6;8562:27;;;;;;;;;;;;;;;:34;;;;:42;8541:113;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8672:19;:27;8692:6;8672:27;;;;;;;;;;;;;;;8700:5;8672:34;;;;;;;;;;;;;;;;;;;;;;;;;;;8664:42;;8723:5;8716:12;;8386:349;;;;:::o;10555:821::-;11246:29;2887:9;;;;;;;;;;;:40;;;;;2911:15;2901:7;;:25;2887:40;2866:121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;11052:14;;;;;;;;;;;:22;;;11088:4;11106;11124;11142:10;11166:12;11192:7;11052:157;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11052:157:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11052:157:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11052:157:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11052:157:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;99:1;94:3;90:11;84:18;80:1;75:3;71:11;64:39;52:2;49:1;45:10;40:15;;8:100;;;12:14;11052:157:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11052:157:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11052:157:5;;;;11292:1;11278:16;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;148:4;140:6;136:17;126:27;;0:157;11278:16:5;;;;11246:48;;11322:10;11304:12;11317:1;11304:15;;;;;;;;;;;;;;;;;:28;;;;;;;;;;;;;11343:26;11356:12;11343;:26::i;:::-;10555:821;;;;;;;:::o;4554:570::-;4636:9;824::11;:7;:9::i;:::-;816:18;;;;;;;;4648:1:5;4636:13;;4631:443;4655:7;;:14;;4651:1;:18;4631:443;;;4737:1;4715:24;;:7;;4723:1;4715:10;;;;;;;;;;;;;;;;;:24;;;;4690:123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4854:15;:27;4870:7;;4878:1;4870:10;;;;;;;;;;;;;;;;;4854:27;;;;;;;;;;;;;;;;;;;;;;;;;4853:28;4828:125;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5059:4;5029:15;:27;5045:7;;5053:1;5045:10;;;;;;;;;;;;;;;;;5029:27;;;;;;;;;;;;;;;;:34;;;;;;;;;;;;;;;;;;4671:3;;;;;;;4631:443;;;5088:29;5109:7;;5088:29;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4554:570;;;:::o;7697:107::-;824:9:11;:7;:9::i;:::-;816:18;;;;;;;;7786:11:5;7773:10;:24;;;;7697:107;:::o;2202:22::-;;;;:::o;5682:202::-;5786:16;5827:19;:27;5847:6;5827:27;;;;;;;;;;;;;;;5818:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5871:6;5864:13;;5682:202;;;:::o;7382:173::-;824:9:11;:7;:9::i;:::-;816:18;;;;;;;;7529:19:5;7508:18;:40;;;;7382:173;:::o;7956:202::-;8061:12;8096:19;:27;8116:6;8096:27;;;;;;;;;;;;;;;:34;;;;8089:41;;8147:4;8140:11;;7956:202;;;:::o;1045:25::-;;;;:::o;755:37::-;;;;:::o;1937:29::-;;;;;;;;;;;;;:::o;8882:172::-;824:9:11;:7;:9::i;:::-;816:18;;;;;;;;8945:9:5;;;;;;;;;;;8944:10;8936:57;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;9016:4;9004:9;;:16;;;;;;;;;;;;;;;;;;9036:11;;;;;;;;;;8882:172::o;1561:101:11:-;824:9;:7;:9::i;:::-;816:18;;;;;;;;1629:28;1648:8;1629:18;:28::i;:::-;1561:101;:::o;2142:21:5:-;;;;;;;;;;;;;:::o;9425:156::-;9476:12;9510:9;;;;;;;;;;;:40;;;;;9534:15;9524:7;;:25;9510:40;9500:50;;9567:7;9560:14;;9425:156;:::o;14023:534::-;14141:13;14168:14;14196:12;14222:20;14455:14;;;;;;;;;;;:27;;;14483:11;14455:40;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14455:40:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14455:40:5;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;14455:40:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14325:170;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;14514:5;14521:6;14529;14537:12;14506:44;;;;;;;;14023:534;;;;;:::o;16880:585::-;17087:14;17136:165;17176:10;17204:5;17227:6;17251;17275:12;17136:22;:165::i;:::-;17135:166;17118:317;;;17343:1;17334:10;;17118:317;;;17393:31;17410:5;17417:6;17393:16;:31::i;:::-;17384:40;;17118:317;17452:6;17445:13;;16880:585;;;;;;;:::o;1272:131:10:-;1330:7;1345:9;1361:1;1357;:5;1345:17;;1381:1;1376;:6;;1368:15;;;;;;;;1397:1;1390:8;;1272:131;;;;;:::o;1796:169:11:-;1885:1;1865:22;;:8;:22;;;;1857:31;;;;;;;;1928:8;1899:38;;1920:6;;;;;;;;;;;1899:38;;;;;;;;;;;;1952:8;1943:6;;:17;;;;;;;;;;;;;;;;;;1796:169;:::o;15179:1477:5:-;15390:13;15431:4;15420:15;;15467:1;15450:19;;:5;:19;;;15446:1178;;;15599:5;15588:16;;15446:1178;;;15635:15;:23;15651:6;15635:23;;;;;;;;;;;;;;;;;;;;;;;;;15634:24;15630:994;;;15750:5;15739:16;;15630:994;;;15794:1;15784:6;:11;;;;15780:844;;;15870:5;15859:16;;15780:844;;;15975:14;;;;;;;;;;;:24;;;16000:10;16012:6;15975:44;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;15975:44:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;15975:44:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;15975:44:5;;;;;;;;;;;;;;;;15974:45;15900:724;;;16111:5;16100:16;;15900:724;;;16216:14;;;;;;;;;;;:31;;;16248:10;16260:6;16216:51;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;16216:51:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;16216:51:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;16216:51:5;;;;;;;;;;;;;;;;16215:52;16141:483;;;16458:5;16447:16;;16141:483;;;16523:15;16492:28;16509:10;;16492:12;:16;;:28;;;;:::i;:::-;:46;16488:136;;;16608:5;16597:16;;16488:136;16141:483;15900:724;15780:844;15630:994;15446:1178;16641:8;16634:15;;15179:1477;;;;;;;:::o;17660:973::-;17785:14;17858:18;;17820:26;:34;17847:6;17820:34;;;;;;;;;;;;;;;;:56;;17816:786;;;17997:1;17988:10;;17816:786;;;18233:66;18263:20;:28;18284:6;18263:28;;;;;;;;;;;;;;;:35;18292:5;18263:35;;;;;;;;;;;;;;;;18233:25;;:29;;:66;;;;:::i;:::-;18224:75;;18471:18;;18422:46;18461:6;18422:26;:34;18449:6;18422:34;;;;;;;;;;;;;;;;:38;;:46;;;;:::i;:::-;:67;18418:173;;;18518:58;18541:26;:34;18568:6;18541:34;;;;;;;;;;;;;;;;18518:18;;:22;;:58;;;;:::i;:::-;18509:67;;18418:173;17816:786;18619:6;18612:13;;17660:973;;;;:::o;1078:131:10:-;1136:7;1172:9;1164:1;1159;:6;;1151:15;;;;;;;;1188:1;1184;:5;1172:17;;1203:1;1196:8;;1078:131;;;;;:::o;204:381::-;262:7;523:9;491:1;486;:6;482:35;;;509:1;502:8;;;;482:35;539:1;535;:5;523:17;;563:1;558;554;:5;;;;;;;;:10;546:19;;;;;;;;579:1;572:8;;204:381;;;;;;:::o", + "source": "/* solium-disable security/no-block-members */\n\npragma solidity 0.4.24;\n\nimport \"openzeppelin-solidity/contracts/math/SafeMath.sol\";\nimport \"openzeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"../token/ITokenContract.sol\";\nimport \"../escrow/IEscrow.sol\";\n\n\n/**\n* @dev This contract will distribute tokens to the buyers who purchase items from\n* the OB verified sellers\n* For more information please visit below mentioned link\n* https://github.com/OB1Company/openbazaar-smart-contracts/issues/10\n*/\ncontract OBRewards is Ownable {\n\n using SafeMath for uint256;\n\n //Mapping of promoted sellers\n mapping(address => bool) public promotedSellers;\n\n uint256 public maxRewardPerSeller;\n\n uint256 public maxRewardToBuyerPerSeller;\n\n uint256 public totalTokensDistributed;\n\n //A time window in seconds where purchases between A and B will be\n //rewarded with tokens. Ie if a trade is completed satisfactorily at\n //time X, then the buyer can claim their reward any time after X and\n //before X + timeWindow.\n uint256 public timeWindow;\n\n //Mapping of seller to all buyers who received rewards by purchasing\n //from that seller.\n mapping(address => address[]) sellerVsBuyersArray;\n\n //Mapping of seller and buyer to a bool indicating whether the buyers has\n //claimed any rewards from that seller.\n mapping(address => mapping(address => bool)) sellerVsBuyersBool;\n\n //Given a seller and a buyer, this will return the amount of tokens that\n //have been rewarded to the buyer for purchasing from the seller.\n mapping(address => mapping(address => uint256)) sellerVsBuyerRewards;\n\n //For each seller, this returns the total number of tokens that have been\n //given out as rewards for purchasing from that seller.\n mapping(address => uint256) sellerVsRewardsDistributed;\n\n //Escrow contract address which will be used to calculate and validate\n //transactions\n IEscrow public escrowContract;\n\n //Address of the reward Token to be distributed to the buyers\n ITokenContract public obToken;\n\n //Bool to signify whether reward distribution is active or not\n bool public rewardsOn;\n\n //End date of the promotion\n uint256 public endDate;\n\n event SuccessfulClaim(\n bytes32 indexed scriptHash,\n address indexed seller,\n address indexed buyer,\n uint256 amount\n );\n\n event UnsuccessfulClaim(\n bytes32 indexed scriptHash,\n address indexed seller,\n address indexed buyer\n );\n\n event PromotedSellersAdded(address[] seller);\n\n event PromotedSellersRemoved(address[] seller);\n\n event RewardsOn();\n\n event EndDateChanged(uint256 endDate);\n\n modifier nonZeroAddress(address _address) {\n require(_address != address(0), \"Zero address not allowed\");\n _;\n }\n\n modifier rewardsRunning() {\n require(\n rewardsOn && (endDate > block.timestamp),\n \"Reward distribution is not running\"\n );\n _;\n }\n\n /**\n * @dev Add details to rewards contract at the time of deployment\n * @param _maxRewardPerSeller Maximum reward to be distributed from\n * each seller\n * @param _timeWindow A time window, in seconds, where purchases\n * will be rewarded with tokens\n * @param _escrowContractAddress Escrow address to be considered for\n * rewards distribution.\n * @param obTokenAddress Address of the reward token\n */\n constructor(\n uint256 _maxRewardPerSeller,\n uint256 _timeWindow,\n address _escrowContractAddress, // this should be a trusted contract\n address obTokenAddress\n )\n public\n nonZeroAddress(_escrowContractAddress)\n nonZeroAddress(obTokenAddress)\n {\n\n require(\n _maxRewardPerSeller > 0,\n \"Maximum reward must be greater than 0\"\n );\n\n require(\n _timeWindow > 0,\n \"Time window must be greater than 0\"\n );\n\n maxRewardPerSeller = _maxRewardPerSeller;\n timeWindow = _timeWindow;\n escrowContract = IEscrow(_escrowContractAddress);\n obToken = ITokenContract(obTokenAddress);\n maxRewardToBuyerPerSeller = uint256(50).mul(\n 10 ** uint256(obToken.decimals())\n );\n\n }\n\n /**\n * @dev Allows owner to add new promoted sellers. Previous ones will\n * remain untouched\n * @param sellers List of sellers to be marked as promoted\n * No Seller out of this list should already be promoted, otherwise\n * transaction will fail\n */\n function addPromotedSellers(address[] sellers) external onlyOwner {\n\n for (uint256 i = 0; i < sellers.length; i++) {\n require(\n sellers[i] != address(0),\n \"Zero address cannot be a promoted seller\"\n );\n\n require(\n !promotedSellers[sellers[i]],\n \"One of the sellers is already promoted\"\n ); //Also protects against the same being address passed twice.\n\n promotedSellers[sellers[i]] = true;\n }\n emit PromotedSellersAdded(sellers);\n }\n\n /**\n * @dev Remove exisiting promoted sellers\n * @param sellers List of sellers to be removed\n */\n function removePromotedSellers(address[] sellers) external onlyOwner {\n\n for (uint256 i = 0; i < sellers.length; i++) {\n\n promotedSellers[sellers[i]] = false;\n }\n emit PromotedSellersRemoved(sellers);\n }\n\n /**\n * @dev Returns list of buyers that have been rewarded for purchasing from\n * a given seller\n * @param seller Address of promoted seller\n * @return buyers List of Buyers\n */\n function getRewardedBuyers(\n address seller\n )\n external\n view\n returns (address[] buyers)\n {\n buyers = sellerVsBuyersArray[seller];\n return buyers;\n }\n\n /**\n * @dev Return reward info for a buyer against a promoted seller\n * @param seller Address of promoted seller\n * @param buyer The buyer who reward info has to be fetched\n * @return rewardAmount\n */\n function getBuyerRewardInfo(\n address seller,\n address buyer\n )\n external\n view\n returns(\n uint256 rewardAmount\n )\n {\n return sellerVsBuyerRewards[seller][buyer];\n }\n\n /**\n * @dev Total reward distributed for a promoted seller so far\n * @param seller Promoted seller's address\n * @return Amount of tokens distributed as reward for a seller\n */\n function getDistributedReward(\n address seller\n )\n external\n view\n returns (uint256 rewardDistributed)\n {\n rewardDistributed = sellerVsRewardsDistributed[seller];\n return rewardDistributed;\n }\n\n /**\n * @dev Allows the owner of the contract to transfer all remaining tokens to\n * an address of their choosing.\n * @param receiver The receiver's address\n */\n function transferRemainingTokens(\n address receiver\n )\n external\n onlyOwner\n nonZeroAddress(receiver)\n {\n uint256 amount = obToken.balanceOf(this);\n\n obToken.transfer(receiver, amount);\n }\n\n /**\n * @dev Method to allow the owner to adjust the maximum reward per seller\n * @param _maxRewardPerSeller Max reward to be distributed for each seller\n */\n function changeMaxRewardPerSeller(\n uint256 _maxRewardPerSeller\n )\n external\n onlyOwner\n {\n maxRewardPerSeller = _maxRewardPerSeller;\n }\n\n /**\n * @dev Method to allow the owner to change the timeWindow variable\n * @param _timeWindow A time window in seconds\n */\n function changeTimeWindow(uint256 _timeWindow) external onlyOwner {\n timeWindow = _timeWindow;\n }\n\n /**\n * @dev Returns the number of rewarded buyers associated with a given seller\n * @param seller Address of the promoted seller\n */\n function noOfRewardedBuyers(\n address seller\n )\n external\n view\n returns (uint256 size)\n {\n size = sellerVsBuyersArray[seller].length;\n return size;\n }\n\n /**\n * @dev Method to get rewarded buyer address at specific index for a seller\n * @param seller Seller for whom the rewarded buyer is requested\n * @param index Index at which buyer has to be retrieved\n */\n function getRewardedBuyer(\n address seller,\n uint256 index\n )\n external\n view\n returns (address buyer)\n {\n require(\n sellerVsBuyersArray[seller].length > index,\n \"Array index out of bound\"\n );\n buyer = sellerVsBuyersArray[seller][index];\n return buyer;\n }\n\n /**\n * @dev Allows the owner of the contract to turn on the rewards distribution\n * Only if it was not previously turned on\n */\n function turnOnRewards() external onlyOwner {\n require(!rewardsOn, \"Rewards distribution is already on\");\n\n rewardsOn = true;\n\n emit RewardsOn();\n }\n\n /**\n * @dev ALlows owner to set endDate\n * @param _endDate date the promotion ends\n */\n function setEndDate(uint256 _endDate) external onlyOwner {\n require(\n _endDate > block.timestamp,\n \"End date should be greater than current date\"\n );\n\n endDate = _endDate;\n\n emit EndDateChanged(endDate);\n }\n\n function isRewardsRunning() external view returns (bool running) {\n running = rewardsOn && (endDate > block.timestamp);\n return running;\n }\n\n /**\n * @dev Buyer can call this method to calculate the reward for their\n * transaction\n * @param scriptHash Script hash of the transaction\n */\n function calculateReward(\n bytes32 scriptHash\n )\n public\n view\n returns (uint256 amount)\n {\n (\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n ) = _getTransaction(scriptHash);\n\n amount = _getTokensToReward(\n scriptHash,\n buyer,\n seller,\n status,\n lastModified\n );\n\n return amount;\n }\n\n /**\n * @dev Using this method user can choose to execute their transaction and\n * claim their rewards in one go. This will save one transaction.\n * Users can only use this method if their trade is using escrowContract\n * for escrow.\n * See the execute() method Escrow_v1_0.sol for more information.\n */\n function executeAndClaim(\n uint8[] sigV,\n bytes32[] sigR,\n bytes32[] sigS,\n bytes32 scriptHash,\n address[] destinations,\n uint256[] amounts\n )\n public\n rewardsRunning\n\n {\n //1. Execute transaction\n //SECURITY NOTE: `escrowContract` is a known and trusted contract, but\n //the `execute` function transfers ETH or Tokens, and therefore hands\n //over control of the logic flow to a potential attacker.\n escrowContract.execute(\n sigV,\n sigR,\n sigS,\n scriptHash,\n destinations,\n amounts\n );\n\n //2. Claim Reward\n bytes32[] memory scriptHashes = new bytes32[](1);\n scriptHashes[0] = scriptHash;\n\n claimRewards(scriptHashes);\n }\n\n /**\n * @dev Function to claim tokens\n * @param scriptHashes Array of scriptHashes of OB trades for which\n * the buyer wants to claim reward tokens.\n * Note that a Buyer can perform trades with multiple promoted sellers and\n * then can claim their reward tokens all at once for all those trades using\n * this function.\n * Be mindful of the block gas limit (do not pass too many scripthashes).\n */\n function claimRewards(bytes32[] scriptHashes) public rewardsRunning {\n\n require(scriptHashes.length > 0, \"No script hash passed\");\n\n for (uint256 i = 0; i < scriptHashes.length; i++) {\n\n //1. Get the transaction from Escrow contract\n (\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n ) = _getTransaction(scriptHashes[i]);\n\n //2. Check that the transaction exists\n //3. Check seller is promoted seller and the\n //timeWindow has not closed\n //4. Get the number of tokens to be given as reward\n //5. The seller must be one of the beneficiaries\n uint256 rewardAmount = _getTokensToReward(\n scriptHashes[i],\n buyer,\n seller,\n status,\n lastModified\n );\n\n uint256 contractBalance = obToken.balanceOf(this);\n\n if (rewardAmount > contractBalance) {\n rewardAmount = contractBalance;\n }\n\n if (rewardAmount == 0) {\n emit UnsuccessfulClaim(scriptHashes[i], seller, buyer);\n continue;\n }\n\n //6. Update state\n if (!sellerVsBuyersBool[seller][buyer]) {\n sellerVsBuyersBool[seller][buyer] = true;\n sellerVsBuyersArray[seller].push(buyer);\n }\n\n sellerVsBuyerRewards[seller][buyer] = sellerVsBuyerRewards[\n seller\n ][\n buyer\n ].add(rewardAmount);\n\n sellerVsRewardsDistributed[seller] = sellerVsRewardsDistributed[\n seller\n ].add(rewardAmount);\n\n totalTokensDistributed = totalTokensDistributed.add(rewardAmount);\n\n //7. Emit event\n emit SuccessfulClaim(\n scriptHashes[i],\n seller,\n buyer,\n rewardAmount\n );\n\n //8. Transfer token\n obToken.transfer(buyer, rewardAmount);\n }\n\n }\n\n //Private method to get transaction info out from the escrow contract\n function _getTransaction(\n bytes32 _scriptHash\n )\n private\n view\n returns(\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n {\n // calling a trusted contract's view function\n (\n ,\n lastModified,\n status,\n ,,,\n buyer,\n seller,\n\n ) = escrowContract.transactions(_scriptHash);\n\n return (buyer, seller, status, lastModified);\n }\n\n /**\n * @dev Checks -:\n * 1. If transaction exists\n * 2. If seller is promoted\n * 3. Transaction has been closed/released\n * 4. Transaction happened with the time window.\n * 5. Seller must be one of the beneficiaries of the transaction execution\n * @param scriptHash Script hash of the transaction\n * @param buyer Buyer in the transaction\n * @param seller Seller in the transaction\n * @param status Status of the transaction\n * @param lastModified Last modified time of the transaction\n * @return bool Returns whether transaction is valid and eligible\n * for rewards\n */\n function _verifyTransactionData(\n bytes32 scriptHash,\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n private\n view\n returns (bool verified)\n {\n\n verified = true;\n\n if (buyer == address(0)) {\n //If buyer is a zero address then we treat the transaction as\n //a not verified\n verified = false;\n }\n\n else if (!promotedSellers[seller]) {\n //seller of the transaction is not a promoted seller\n verified = false;\n }\n else if (status != 1) {\n //Transaction has not been released\n verified = false;\n }\n else if (\n //Calling a trusted contract's view function\n !escrowContract.checkVote(scriptHash, seller)\n )\n {\n //Seller was not one of the signers\n verified = false;\n }\n else if (\n //Calling a trusted contract's view function\n !escrowContract.checkBeneficiary(scriptHash, seller)\n ) {\n //Seller was not one of the beneficiaries.\n //This means the transaction was either cancelled or\n //completely refunded.\n verified = false;\n }\n else if (lastModified.add(timeWindow) < block.timestamp) {\n //timeWindow has been exceeded\n verified = false;\n }\n\n return verified;\n }\n\n /**\n * @dev Private function to get Tokens to be distributed as reward\n * Checks whether transaction is verified or not and computes the\n * amount of the rewards using the _calculateReward() method\n */\n function _getTokensToReward(\n bytes32 scriptHash,\n address buyer,\n address seller,\n uint8 status,\n uint256 lastModified\n )\n private\n view\n returns (uint256 amount)\n {\n\n if (\n !_verifyTransactionData(\n scriptHash,\n buyer,\n seller,\n status,\n lastModified\n )\n )\n {\n amount = 0;\n }\n\n else {\n amount = _calculateReward(buyer, seller);\n }\n\n return amount;\n }\n\n /**\n * @dev Private function to calculate reward.\n * Please see link for rewards calculation algo\n * https://github.com/OB1Company/openbazaar-smart-contracts/issues/10\n */\n function _calculateReward(\n address buyer,\n address seller\n )\n private\n view\n returns (uint256 amount)\n {\n\n if (sellerVsRewardsDistributed[seller] >= maxRewardPerSeller) {\n //No more rewards can be distributed for buying from the\n //given seller\n amount = 0;\n }\n\n else {\n //maxRewardToBuyerPerSeller tokens will be given to each buyer per\n //seller until the maximum amount of rewards for the seller has\n //been exhausted\n amount = maxRewardToBuyerPerSeller.sub(sellerVsBuyerRewards[seller][buyer]);\n\n //Check that we are not disbursing more rewards than are\n //allocated per seller\n if (sellerVsRewardsDistributed[seller].add(amount) > maxRewardPerSeller) {\n amount = maxRewardPerSeller.sub(sellerVsRewardsDistributed[seller]);\n }\n\n }\n\n return amount;\n\n }\n\n\n}\n", "sourcePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/rewards/OBRewards.sol", "ast": { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/rewards/OBRewards.sol", "exportedSymbols": { "OBRewards": [ - 2226 + 3265 ] }, - "id": 2227, + "id": 3266, "nodeType": "SourceUnit", "nodes": [ { - "id": 1324, + "id": 2330, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "48:23:2" + "src": "48:23:5" }, { "absolutePath": "openzeppelin-solidity/contracts/math/SafeMath.sol", "file": "openzeppelin-solidity/contracts/math/SafeMath.sol", - "id": 1325, + "id": 2331, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2406, - "src": "73:59:2", + "scope": 3266, + "sourceUnit": 4623, + "src": "73:59:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "openzeppelin-solidity/contracts/ownership/Ownable.sol", "file": "openzeppelin-solidity/contracts/ownership/Ownable.sol", - "id": 1326, + "id": 2332, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2515, - "src": "133:63:2", + "scope": 3266, + "sourceUnit": 4732, + "src": "133:63:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/token/ITokenContract.sol", "file": "../token/ITokenContract.sol", - "id": 1327, + "id": 2333, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2278, - "src": "197:37:2", + "scope": 3266, + "sourceUnit": 4446, + "src": "197:37:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/IEscrow.sol", "file": "../escrow/IEscrow.sol", - "id": 1328, + "id": 2334, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 1323, - "src": "235:31:2", + "scope": 3266, + "sourceUnit": 1381, + "src": "235:31:5", "symbolAliases": [], "unitAlias": "" }, @@ -668,56 +705,56 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 1329, + "id": 2335, "name": "Ownable", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2514, - "src": "532:7:2", + "referencedDeclaration": 4731, + "src": "532:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_Ownable_$2514", + "typeIdentifier": "t_contract$_Ownable_$4731", "typeString": "contract Ownable" } }, - "id": 1330, + "id": 2336, "nodeType": "InheritanceSpecifier", - "src": "532:7:2" + "src": "532:7:5" } ], "contractDependencies": [ - 2514 + 4731 ], "contractKind": "contract", "documentation": "@dev This contract will distribute tokens to the buyers who purchase items from\nthe OB verified sellers\nFor more information please visit below mentioned link\nhttps://github.com/OB1Company/openbazaar-smart-contracts/issues/10", "fullyImplemented": true, - "id": 2226, + "id": 3265, "linearizedBaseContracts": [ - 2226, - 2514 + 3265, + 4731 ], "name": "OBRewards", "nodeType": "ContractDefinition", "nodes": [ { - "id": 1333, + "id": 2339, "libraryName": { "contractScope": null, - "id": 1331, + "id": 2337, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2405, - "src": "553:8:2", + "referencedDeclaration": 4622, + "src": "553:8:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$2405", + "typeIdentifier": "t_contract$_SafeMath_$4622", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "547:27:2", + "src": "547:27:5", "typeName": { - "id": 1332, + "id": 2338, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "566:7:2", + "src": "566:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -726,11 +763,11 @@ }, { "constant": false, - "id": 1337, + "id": 2343, "name": "promotedSellers", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "614:47:2", + "scope": 3265, + "src": "614:47:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -738,28 +775,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 1336, + "id": 2342, "keyType": { - "id": 1334, + "id": 2340, "name": "address", "nodeType": "ElementaryTypeName", - "src": "622:7:2", + "src": "622:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "614:24:2", + "src": "614:24:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 1335, + "id": 2341, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "633:4:2", + "src": "633:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -771,11 +808,11 @@ }, { "constant": false, - "id": 1339, + "id": 2345, "name": "maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "668:33:2", + "scope": 3265, + "src": "668:33:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -783,10 +820,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1338, + "id": 2344, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "668:7:2", + "src": "668:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -797,11 +834,11 @@ }, { "constant": false, - "id": 1341, + "id": 2347, "name": "maxRewardToBuyerPerSeller", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "708:40:2", + "scope": 3265, + "src": "708:40:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -809,10 +846,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1340, + "id": 2346, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "708:7:2", + "src": "708:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -823,11 +860,11 @@ }, { "constant": false, - "id": 1343, + "id": 2349, "name": "totalTokensDistributed", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "755:37:2", + "scope": 3265, + "src": "755:37:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -835,10 +872,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1342, + "id": 2348, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "755:7:2", + "src": "755:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -849,11 +886,11 @@ }, { "constant": false, - "id": 1345, + "id": 2351, "name": "timeWindow", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1045:25:2", + "scope": 3265, + "src": "1045:25:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -861,10 +898,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1344, + "id": 2350, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1045:7:2", + "src": "1045:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -875,11 +912,11 @@ }, { "constant": false, - "id": 1350, - "name": "sellerVsBuyers", + "id": 2356, + "name": "sellerVsBuyersArray", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1178:44:2", + "scope": 3265, + "src": "1174:49:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -887,38 +924,38 @@ "typeString": "mapping(address => address[])" }, "typeName": { - "id": 1349, + "id": 2355, "keyType": { - "id": 1346, + "id": 2352, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1186:7:2", + "src": "1182:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1178:29:2", + "src": "1174:29:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[])" }, "valueType": { "baseType": { - "id": 1347, + "id": 2353, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1197:7:2", + "src": "1193:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1348, + "id": 2354, "length": null, "nodeType": "ArrayTypeName", - "src": "1197:9:2", + "src": "1193:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -930,11 +967,75 @@ }, { "constant": false, - "id": 1356, + "id": 2362, + "name": "sellerVsBuyersBool", + "nodeType": "VariableDeclaration", + "scope": 3265, + "src": "1352:63:5", + "stateVariable": true, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + }, + "typeName": { + "id": 2361, + "keyType": { + "id": 2357, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1360:7:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "Mapping", + "src": "1352:44:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + }, + "valueType": { + "id": 2360, + "keyType": { + "id": 2358, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1379:7:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "Mapping", + "src": "1371:24:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + }, + "valueType": { + "id": 2359, + "name": "bool", + "nodeType": "ElementaryTypeName", + "src": "1390:4:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + } + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2368, "name": "sellerVsBuyerRewards", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1376:68:2", + "scope": 3265, + "src": "1569:68:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -942,46 +1043,46 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "typeName": { - "id": 1355, + "id": 2367, "keyType": { - "id": 1351, + "id": 2363, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1384:7:2", + "src": "1577:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1376:47:2", + "src": "1569:47:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" }, "valueType": { - "id": 1354, + "id": 2366, "keyType": { - "id": 1352, + "id": 2364, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1403:7:2", + "src": "1596:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1395:27:2", + "src": "1588:27:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 1353, + "id": 2365, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1414:7:2", + "src": "1607:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -994,11 +1095,11 @@ }, { "constant": false, - "id": 1360, + "id": 2372, "name": "sellerVsRewardsDistributed", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1589:54:2", + "scope": 3265, + "src": "1782:54:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1006,28 +1107,28 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 1359, + "id": 2371, "keyType": { - "id": 1357, + "id": 2369, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1597:7:2", + "src": "1790:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1589:27:2", + "src": "1782:27:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 1358, + "id": 2370, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1608:7:2", + "src": "1801:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1039,26 +1140,26 @@ }, { "constant": false, - "id": 1362, + "id": 2374, "name": "escrowContract", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1744:29:2", + "scope": 3265, + "src": "1937:29:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" }, "typeName": { "contractScope": null, - "id": 1361, + "id": 2373, "name": "IEscrow", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1322, - "src": "1744:7:2", + "referencedDeclaration": 1380, + "src": "1937:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, @@ -1067,26 +1168,26 @@ }, { "constant": false, - "id": 1364, + "id": 2376, "name": "obToken", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1846:29:2", + "scope": 3265, + "src": "2039:29:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 1363, + "id": 2375, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "1846:14:2", + "referencedDeclaration": 4445, + "src": "2039:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -1095,11 +1196,11 @@ }, { "constant": false, - "id": 1366, + "id": 2378, "name": "rewardsOn", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1949:21:2", + "scope": 3265, + "src": "2142:21:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1107,10 +1208,10 @@ "typeString": "bool" }, "typeName": { - "id": 1365, + "id": 2377, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1949:4:2", + "src": "2142:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1121,11 +1222,11 @@ }, { "constant": false, - "id": 1368, + "id": 2380, "name": "endDate", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "2009:22:2", + "scope": 3265, + "src": "2202:22:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1133,10 +1234,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1367, + "id": 2379, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2009:7:2", + "src": "2202:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1148,21 +1249,21 @@ { "anonymous": false, "documentation": null, - "id": 1378, + "id": 2390, "name": "SuccessfulClaim", "nodeType": "EventDefinition", "parameters": { - "id": 1377, + "id": 2389, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1370, + "id": 2382, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2069:26:2", + "scope": 2390, + "src": "2262:26:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1170,10 +1271,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1369, + "id": 2381, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2069:7:2", + "src": "2262:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1184,12 +1285,12 @@ }, { "constant": false, - "id": 1372, + "id": 2384, "indexed": true, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2105:22:2", + "scope": 2390, + "src": "2298:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1197,10 +1298,10 @@ "typeString": "address" }, "typeName": { - "id": 1371, + "id": 2383, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2105:7:2", + "src": "2298:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1211,12 +1312,12 @@ }, { "constant": false, - "id": 1374, + "id": 2386, "indexed": true, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2137:21:2", + "scope": 2390, + "src": "2330:21:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1224,10 +1325,10 @@ "typeString": "address" }, "typeName": { - "id": 1373, + "id": 2385, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2137:7:2", + "src": "2330:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1238,12 +1339,12 @@ }, { "constant": false, - "id": 1376, + "id": 2388, "indexed": false, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2168:14:2", + "scope": 2390, + "src": "2361:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1251,10 +1352,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1375, + "id": 2387, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2168:7:2", + "src": "2361:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1264,28 +1365,28 @@ "visibility": "internal" } ], - "src": "2059:129:2" + "src": "2252:129:5" }, - "src": "2038:151:2" + "src": "2231:151:5" }, { "anonymous": false, "documentation": null, - "id": 1386, + "id": 2398, "name": "UnsuccessfulClaim", "nodeType": "EventDefinition", "parameters": { - "id": 1385, + "id": 2397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1380, + "id": 2392, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2228:26:2", + "scope": 2398, + "src": "2421:26:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1293,10 +1394,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1379, + "id": 2391, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2228:7:2", + "src": "2421:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1307,12 +1408,12 @@ }, { "constant": false, - "id": 1382, + "id": 2394, "indexed": true, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2264:22:2", + "scope": 2398, + "src": "2457:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1320,10 +1421,10 @@ "typeString": "address" }, "typeName": { - "id": 1381, + "id": 2393, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2264:7:2", + "src": "2457:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1334,12 +1435,12 @@ }, { "constant": false, - "id": 1384, + "id": 2396, "indexed": true, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2296:21:2", + "scope": 2398, + "src": "2489:21:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1347,10 +1448,10 @@ "typeString": "address" }, "typeName": { - "id": 1383, + "id": 2395, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2296:7:2", + "src": "2489:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1360,28 +1461,28 @@ "visibility": "internal" } ], - "src": "2218:105:2" + "src": "2411:105:5" }, - "src": "2195:129:2" + "src": "2388:129:5" }, { "anonymous": false, "documentation": null, - "id": 1391, + "id": 2403, "name": "PromotedSellersAdded", "nodeType": "EventDefinition", "parameters": { - "id": 1390, + "id": 2402, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1389, + "id": 2401, "indexed": false, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1391, - "src": "2357:16:2", + "scope": 2403, + "src": "2550:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1390,19 +1491,19 @@ }, "typeName": { "baseType": { - "id": 1387, + "id": 2399, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2357:7:2", + "src": "2550:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1388, + "id": 2400, "length": null, "nodeType": "ArrayTypeName", - "src": "2357:9:2", + "src": "2550:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -1412,28 +1513,28 @@ "visibility": "internal" } ], - "src": "2356:18:2" + "src": "2549:18:5" }, - "src": "2330:45:2" + "src": "2523:45:5" }, { "anonymous": false, "documentation": null, - "id": 1396, + "id": 2408, "name": "PromotedSellersRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 1395, + "id": 2407, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1394, + "id": 2406, "indexed": false, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1396, - "src": "2410:16:2", + "scope": 2408, + "src": "2603:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1442,19 +1543,19 @@ }, "typeName": { "baseType": { - "id": 1392, + "id": 2404, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2410:7:2", + "src": "2603:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1393, + "id": 2405, "length": null, "nodeType": "ArrayTypeName", - "src": "2410:9:2", + "src": "2603:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -1464,42 +1565,42 @@ "visibility": "internal" } ], - "src": "2409:18:2" + "src": "2602:18:5" }, - "src": "2381:47:2" + "src": "2574:47:5" }, { "anonymous": false, "documentation": null, - "id": 1398, + "id": 2410, "name": "RewardsOn", "nodeType": "EventDefinition", "parameters": { - "id": 1397, + "id": 2409, "nodeType": "ParameterList", "parameters": [], - "src": "2449:2:2" + "src": "2642:2:5" }, - "src": "2434:18:2" + "src": "2627:18:5" }, { "anonymous": false, "documentation": null, - "id": 1402, + "id": 2414, "name": "EndDateChanged", "nodeType": "EventDefinition", "parameters": { - "id": 1401, + "id": 2413, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1400, + "id": 2412, "indexed": false, "name": "endDate", "nodeType": "VariableDeclaration", - "scope": 1402, - "src": "2479:15:2", + "scope": 2414, + "src": "2672:15:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1507,10 +1608,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1399, + "id": 2411, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2479:7:2", + "src": "2672:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1520,15 +1621,15 @@ "visibility": "internal" } ], - "src": "2478:17:2" + "src": "2671:17:5" }, - "src": "2458:38:2" + "src": "2651:38:5" }, { "body": { - "id": 1416, + "id": 2428, "nodeType": "Block", - "src": "2544:87:2", + "src": "2737:87:5", "statements": [ { "expression": { @@ -1540,19 +1641,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1411, + "id": 2423, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1407, + "id": 2419, "name": "_address", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1404, - "src": "2562:8:2", + "referencedDeclaration": 2416, + "src": "2755:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1566,14 +1667,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1409, + "id": 2421, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2582:1:2", + "src": "2775:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1589,20 +1690,20 @@ "typeString": "int_const 0" } ], - "id": 1408, + "id": 2420, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2574:7:2", + "src": "2767:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 1410, + "id": 2422, "isConstant": false, "isLValue": false, "isPure": true, @@ -1610,13 +1711,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2574:10:2", + "src": "2767:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2562:22:2", + "src": "2755:22:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1625,14 +1726,14 @@ { "argumentTypes": null, "hexValue": "5a65726f2061646472657373206e6f7420616c6c6f776564", - "id": 1412, + "id": 2424, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2586:26:2", + "src": "2779:26:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_d15a1b642cacf87a72fab94030672bbfc7860df6ebdb084f3df815612067f9d8", @@ -1652,21 +1753,21 @@ "typeString": "literal_string \"Zero address not allowed\"" } ], - "id": 1406, + "id": 2418, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2554:7:2", + "referencedDeclaration": 5313, + "src": "2747:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1413, + "id": 2425, "isConstant": false, "isLValue": false, "isPure": false, @@ -1674,38 +1775,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2554:59:2", + "src": "2747:59:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1414, + "id": 2426, "nodeType": "ExpressionStatement", - "src": "2554:59:2" + "src": "2747:59:5" }, { - "id": 1415, + "id": 2427, "nodeType": "PlaceholderStatement", - "src": "2623:1:2" + "src": "2816:1:5" } ] }, "documentation": null, - "id": 1417, + "id": 2429, "name": "nonZeroAddress", "nodeType": "ModifierDefinition", "parameters": { - "id": 1405, + "id": 2417, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1404, + "id": 2416, "name": "_address", "nodeType": "VariableDeclaration", - "scope": 1417, - "src": "2526:16:2", + "scope": 2429, + "src": "2719:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1713,10 +1814,10 @@ "typeString": "address" }, "typeName": { - "id": 1403, + "id": 2415, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2526:7:2", + "src": "2719:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1726,16 +1827,16 @@ "visibility": "internal" } ], - "src": "2525:18:2" + "src": "2718:18:5" }, - "src": "2502:129:2", + "src": "2695:129:5", "visibility": "internal" }, { "body": { - "id": 1431, + "id": 2443, "nodeType": "Block", - "src": "2663:149:2", + "src": "2856:149:5", "statements": [ { "expression": { @@ -1747,19 +1848,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1426, + "id": 2438, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1420, + "id": 2432, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "2694:9:2", + "referencedDeclaration": 2378, + "src": "2887:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1776,19 +1877,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1424, + "id": 2436, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1421, + "id": 2433, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "2708:7:2", + "referencedDeclaration": 2380, + "src": "2901:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1800,18 +1901,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1422, + "id": 2434, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "2718:5:2", + "referencedDeclaration": 5299, + "src": "2911:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1423, + "id": 2435, "isConstant": false, "isLValue": false, "isPure": false, @@ -1819,33 +1920,33 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2718:15:2", + "src": "2911:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2708:25:2", + "src": "2901:25:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1425, + "id": 2437, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "2707:27:2", + "src": "2900:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "2694:40:2", + "src": "2887:40:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1854,14 +1955,14 @@ { "argumentTypes": null, "hexValue": "52657761726420646973747269627574696f6e206973206e6f742072756e6e696e67", - "id": 1427, + "id": 2439, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2748:36:2", + "src": "2941:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_00c42f839bb2f27122856d6b35c4e9c8ab107f03b40c8f1523281f6de7fa943d", @@ -1881,21 +1982,21 @@ "typeString": "literal_string \"Reward distribution is not running\"" } ], - "id": 1419, + "id": 2431, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2673:7:2", + "referencedDeclaration": 5313, + "src": "2866:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1428, + "id": 2440, "isConstant": false, "isLValue": false, "isPure": false, @@ -1903,41 +2004,41 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2673:121:2", + "src": "2866:121:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1429, + "id": 2441, "nodeType": "ExpressionStatement", - "src": "2673:121:2" + "src": "2866:121:5" }, { - "id": 1430, + "id": 2442, "nodeType": "PlaceholderStatement", - "src": "2804:1:2" + "src": "2997:1:5" } ] }, "documentation": null, - "id": 1432, + "id": 2444, "name": "rewardsRunning", "nodeType": "ModifierDefinition", "parameters": { - "id": 1418, + "id": 2430, "nodeType": "ParameterList", "parameters": [], - "src": "2660:2:2" + "src": "2853:2:5" }, - "src": "2637:175:2", + "src": "2830:175:5", "visibility": "internal" }, { "body": { - "id": 1498, + "id": 2510, "nodeType": "Block", - "src": "3548:536:2", + "src": "3741:536:5", "statements": [ { "expression": { @@ -1949,19 +2050,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1452, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1450, + "id": 2462, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1434, - "src": "3580:19:2", + "referencedDeclaration": 2446, + "src": "3773:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1972,14 +2073,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1451, + "id": 2463, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3602:1:2", + "src": "3795:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1987,7 +2088,7 @@ }, "value": "0" }, - "src": "3580:23:2", + "src": "3773:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1996,14 +2097,14 @@ { "argumentTypes": null, "hexValue": "4d6178696d756d20726577617264206d7573742062652067726561746572207468616e2030", - "id": 1453, + "id": 2465, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3617:39:2", + "src": "3810:39:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_c099dc9fddd25952bad7e605258079253092faa14e344e0cb4cb516db0126987", @@ -2023,21 +2124,21 @@ "typeString": "literal_string \"Maximum reward must be greater than 0\"" } ], - "id": 1449, + "id": 2461, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "3559:7:2", + "referencedDeclaration": 5313, + "src": "3752:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1454, + "id": 2466, "isConstant": false, "isLValue": false, "isPure": false, @@ -2045,15 +2146,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3559:107:2", + "src": "3752:107:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1455, + "id": 2467, "nodeType": "ExpressionStatement", - "src": "3559:107:2" + "src": "3752:107:5" }, { "expression": { @@ -2065,19 +2166,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1459, + "id": 2471, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1457, + "id": 2469, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1436, - "src": "3698:11:2", + "referencedDeclaration": 2448, + "src": "3891:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2088,14 +2189,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1458, + "id": 2470, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3712:1:2", + "src": "3905:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2103,7 +2204,7 @@ }, "value": "0" }, - "src": "3698:15:2", + "src": "3891:15:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2112,14 +2213,14 @@ { "argumentTypes": null, "hexValue": "54696d652077696e646f77206d7573742062652067726561746572207468616e2030", - "id": 1460, + "id": 2472, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3727:36:2", + "src": "3920:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5d2f27eabb47631245572e2d5e23b624d4d61c30aebba7f7b875c803aaee095c", @@ -2139,21 +2240,21 @@ "typeString": "literal_string \"Time window must be greater than 0\"" } ], - "id": 1456, + "id": 2468, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "3677:7:2", + "referencedDeclaration": 5313, + "src": "3870:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1461, + "id": 2473, "isConstant": false, "isLValue": false, "isPure": false, @@ -2161,32 +2262,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3677:96:2", + "src": "3870:96:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1462, + "id": 2474, "nodeType": "ExpressionStatement", - "src": "3677:96:2" + "src": "3870:96:5" }, { "expression": { "argumentTypes": null, - "id": 1465, + "id": 2477, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1463, + "id": 2475, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "3784:18:2", + "referencedDeclaration": 2345, + "src": "3977:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2196,43 +2297,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1464, + "id": 2476, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1434, - "src": "3805:19:2", + "referencedDeclaration": 2446, + "src": "3998:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3784:40:2", + "src": "3977:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1466, + "id": 2478, "nodeType": "ExpressionStatement", - "src": "3784:40:2" + "src": "3977:40:5" }, { "expression": { "argumentTypes": null, - "id": 1469, + "id": 2481, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1467, + "id": 2479, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "3834:10:2", + "referencedDeclaration": 2351, + "src": "4027:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2242,45 +2343,45 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1468, + "id": 2480, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1436, - "src": "3847:11:2", + "referencedDeclaration": 2448, + "src": "4040:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3834:24:2", + "src": "4027:24:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1470, + "id": 2482, "nodeType": "ExpressionStatement", - "src": "3834:24:2" + "src": "4027:24:5" }, { "expression": { "argumentTypes": null, - "id": 1475, + "id": 2487, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1471, + "id": 2483, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "3868:14:2", + "referencedDeclaration": 2374, + "src": "4061:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, @@ -2291,12 +2392,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1473, + "id": 2485, "name": "_escrowContractAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1438, - "src": "3893:22:2", + "referencedDeclaration": 2450, + "src": "4086:22:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2310,18 +2411,18 @@ "typeString": "address" } ], - "id": 1472, + "id": 2484, "name": "IEscrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1322, - "src": "3885:7:2", + "referencedDeclaration": 1380, + "src": "4078:7:5", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IEscrow_$1322_$", + "typeIdentifier": "t_type$_t_contract$_IEscrow_$1380_$", "typeString": "type(contract IEscrow)" } }, - "id": 1474, + "id": 2486, "isConstant": false, "isLValue": false, "isPure": false, @@ -2329,40 +2430,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3885:31:2", + "src": "4078:31:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "src": "3868:48:2", + "src": "4061:48:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 1476, + "id": 2488, "nodeType": "ExpressionStatement", - "src": "3868:48:2" + "src": "4061:48:5" }, { "expression": { "argumentTypes": null, - "id": 1481, + "id": 2493, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1477, + "id": 2489, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "3926:7:2", + "referencedDeclaration": 2376, + "src": "4119:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -2373,12 +2474,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1479, + "id": 2491, "name": "obTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "3951:14:2", + "referencedDeclaration": 2452, + "src": "4144:14:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2392,18 +2493,18 @@ "typeString": "address" } ], - "id": 1478, + "id": 2490, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "3936:14:2", + "referencedDeclaration": 4445, + "src": "4129:14:5", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 1480, + "id": 2492, "isConstant": false, "isLValue": false, "isPure": false, @@ -2411,38 +2512,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3936:30:2", + "src": "4129:30:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "src": "3926:40:2", + "src": "4119:40:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1482, + "id": 2494, "nodeType": "ExpressionStatement", - "src": "3926:40:2" + "src": "4119:40:5" }, { "expression": { "argumentTypes": null, - "id": 1496, + "id": 2508, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1483, + "id": 2495, "name": "maxRewardToBuyerPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "3976:25:2", + "referencedDeclaration": 2347, + "src": "4169:25:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2459,7 +2560,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1494, + "id": 2506, "isConstant": false, "isLValue": false, "isPure": false, @@ -2467,14 +2568,14 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 1488, + "id": 2500, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4033:2:2", + "src": "4226:2:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_10_by_1", @@ -2494,32 +2595,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 1490, + "id": 2502, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "4047:7:2", + "referencedDeclaration": 2376, + "src": "4240:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1491, + "id": 2503, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "decimals", "nodeType": "MemberAccess", - "referencedDeclaration": 2276, - "src": "4047:16:2", + "referencedDeclaration": 4444, + "src": "4240:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_uint8_$", "typeString": "function () view external returns (uint8)" } }, - "id": 1492, + "id": 2504, "isConstant": false, "isLValue": false, "isPure": false, @@ -2527,7 +2628,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4047:18:2", + "src": "4240:18:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -2541,20 +2642,20 @@ "typeString": "uint8" } ], - "id": 1489, + "id": 2501, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4039:7:2", + "src": "4232:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1493, + "id": 2505, "isConstant": false, "isLValue": false, "isPure": false, @@ -2562,13 +2663,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4039:27:2", + "src": "4232:27:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4033:33:2", + "src": "4226:33:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2588,14 +2689,14 @@ { "argumentTypes": null, "hexValue": "3530", - "id": 1485, + "id": 2497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4012:2:2", + "src": "4205:2:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_50_by_1", @@ -2611,20 +2712,20 @@ "typeString": "int_const 50" } ], - "id": 1484, + "id": 2496, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4004:7:2", + "src": "4197:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1486, + "id": 2498, "isConstant": false, "isLValue": false, "isPure": true, @@ -2632,27 +2733,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4004:11:2", + "src": "4197:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1487, + "id": 2499, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 2312, - "src": "4004:15:2", + "referencedDeclaration": 4529, + "src": "4197:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1495, + "id": 2507, "isConstant": false, "isLValue": false, "isPure": false, @@ -2660,26 +2761,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4004:72:2", + "src": "4197:72:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3976:100:2", + "src": "4169:100:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1497, + "id": 2509, "nodeType": "ExpressionStatement", - "src": "3976:100:2" + "src": "4169:100:5" } ] }, "documentation": "@dev Add details to rewards contract at the time of deployment\n@param _maxRewardPerSeller Maximum reward to be distributed from\neach seller\n@param _timeWindow A time window, in seconds, where purchases\nwill be rewarded with tokens\n@param _escrowContractAddress Escrow address to be considered for\nrewards distribution.\n@param obTokenAddress Address of the reward token", - "id": 1499, + "id": 2511, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -2688,82 +2789,82 @@ "arguments": [ { "argumentTypes": null, - "id": 1443, + "id": 2455, "name": "_escrowContractAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1438, - "src": "3481:22:2", + "referencedDeclaration": 2450, + "src": "3674:22:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1444, + "id": 2456, "modifierName": { "argumentTypes": null, - "id": 1442, + "id": 2454, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "3466:14:2", + "referencedDeclaration": 2429, + "src": "3659:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "3466:38:2" + "src": "3659:38:5" }, { "arguments": [ { "argumentTypes": null, - "id": 1446, + "id": 2458, "name": "obTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "3528:14:2", + "referencedDeclaration": 2452, + "src": "3721:14:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1447, + "id": 2459, "modifierName": { "argumentTypes": null, - "id": 1445, + "id": 2457, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "3513:14:2", + "referencedDeclaration": 2429, + "src": "3706:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "3513:30:2" + "src": "3706:30:5" } ], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1441, + "id": 2453, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1434, + "id": 2446, "name": "_maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3271:27:2", + "scope": 2511, + "src": "3464:27:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2771,10 +2872,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1433, + "id": 2445, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3271:7:2", + "src": "3464:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2785,11 +2886,11 @@ }, { "constant": false, - "id": 1436, + "id": 2448, "name": "_timeWindow", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3308:19:2", + "scope": 2511, + "src": "3501:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2797,10 +2898,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1435, + "id": 2447, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3308:7:2", + "src": "3501:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2811,11 +2912,11 @@ }, { "constant": false, - "id": 1438, + "id": 2450, "name": "_escrowContractAddress", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3337:30:2", + "scope": 2511, + "src": "3530:30:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2823,10 +2924,10 @@ "typeString": "address" }, "typeName": { - "id": 1437, + "id": 2449, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3337:7:2", + "src": "3530:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2837,11 +2938,11 @@ }, { "constant": false, - "id": 1440, + "id": 2452, "name": "obTokenAddress", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3414:22:2", + "scope": 2511, + "src": "3607:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2849,10 +2950,10 @@ "typeString": "address" }, "typeName": { - "id": 1439, + "id": 2451, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3414:7:2", + "src": "3607:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2862,32 +2963,32 @@ "visibility": "internal" } ], - "src": "3261:181:2" + "src": "3454:181:5" }, "payable": false, "returnParameters": { - "id": 1448, + "id": 2460, "nodeType": "ParameterList", "parameters": [], - "src": "3548:0:2" + "src": "3741:0:5" }, - "scope": 2226, - "src": "3250:834:2", + "scope": 3265, + "src": "3443:834:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1542, + "id": 2565, "nodeType": "Block", - "src": "4427:367:2", + "src": "4620:504:5", "statements": [ { "body": { - "id": 1536, + "id": 2559, "nodeType": "Block", - "src": "4483:261:2", + "src": "4676:398:5", "statements": [ { "expression": { @@ -2895,7 +2996,188 @@ "arguments": [ { "argumentTypes": null, - "id": 1524, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 2537, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2531, + "name": "sellers", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2514, + "src": "4715:7:5", + "typeDescriptions": { + "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", + "typeString": "address[] calldata" + } + }, + "id": 2533, + "indexExpression": { + "argumentTypes": null, + "id": 2532, + "name": "i", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2520, + "src": "4723:1:5", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "4715:10:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "30", + "id": 2535, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "4737:1:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + }, + "value": "0" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "id": 2534, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "4729:7:5", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 2536, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4729:10:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "4715:24:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "5a65726f20616464726573732063616e6e6f7420626520612070726f6d6f7465642073656c6c6572", + "id": 2538, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "4757:42:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_ccd6447a9fa8fbdd02ec18199b79f41ceff21c9af6e397077aa3909629bee939", + "typeString": "literal_string \"Zero address cannot be a promoted seller\"" + }, + "value": "Zero address cannot be a promoted seller" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_ccd6447a9fa8fbdd02ec18199b79f41ceff21c9af6e397077aa3909629bee939", + "typeString": "literal_string \"Zero address cannot be a promoted seller\"" + } + ], + "id": 2530, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5312, + 5313 + ], + "referencedDeclaration": 5313, + "src": "4690:7:5", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2539, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4690:123:5", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2540, + "nodeType": "ExpressionStatement", + "src": "4690:123:5" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2547, "isConstant": false, "isLValue": false, "isPure": false, @@ -2903,47 +3185,47 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "4523:28:2", + "src": "4853:28:5", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1519, + "id": 2542, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "4524:15:2", + "referencedDeclaration": 2343, + "src": "4854:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1523, + "id": 2546, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1520, + "id": 2543, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4540:7:2", + "referencedDeclaration": 2514, + "src": "4870:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1522, + "id": 2545, "indexExpression": { "argumentTypes": null, - "id": 1521, + "id": 2544, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4548:1:2", + "referencedDeclaration": 2520, + "src": "4878:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2954,7 +3236,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4540:10:2", + "src": "4870:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2965,7 +3247,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4524:27:2", + "src": "4854:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2979,14 +3261,14 @@ { "argumentTypes": null, "hexValue": "4f6e65206f66207468652073656c6c65727320697320616c72656164792070726f6d6f746564", - "id": 1525, + "id": 2548, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4569:40:2", + "src": "4899:40:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_861779356d821ea92acd5b35b679332541f56a3478b73fda7aa49fb208cc4104", @@ -3006,21 +3288,21 @@ "typeString": "literal_string \"One of the sellers is already promoted\"" } ], - "id": 1518, + "id": 2541, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "4498:7:2", + "referencedDeclaration": 5313, + "src": "4828:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1526, + "id": 2549, "isConstant": false, "isLValue": false, "isPure": false, @@ -3028,20 +3310,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4498:125:2", + "src": "4828:125:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1527, + "id": 2550, "nodeType": "ExpressionStatement", - "src": "4498:125:2" + "src": "4828:125:5" }, { "expression": { "argumentTypes": null, - "id": 1534, + "id": 2557, "isConstant": false, "isLValue": false, "isPure": false, @@ -3050,42 +3332,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1528, + "id": 2551, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "4699:15:2", + "referencedDeclaration": 2343, + "src": "5029:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1532, + "id": 2555, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1529, + "id": 2552, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4715:7:2", + "referencedDeclaration": 2514, + "src": "5045:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1531, + "id": 2554, "indexExpression": { "argumentTypes": null, - "id": 1530, + "id": 2553, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4723:1:2", + "referencedDeclaration": 2520, + "src": "5053:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3096,7 +3378,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4715:10:2", + "src": "5045:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3107,7 +3389,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "4699:27:2", + "src": "5029:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3118,14 +3400,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1533, + "id": 2556, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "4729:4:2", + "src": "5059:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -3133,15 +3415,15 @@ }, "value": "true" }, - "src": "4699:34:2", + "src": "5029:34:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1535, + "id": 2558, "nodeType": "ExpressionStatement", - "src": "4699:34:2" + "src": "5029:34:5" } ] }, @@ -3151,19 +3433,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1514, + "id": 2526, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1511, + "id": 2523, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4458:1:2", + "referencedDeclaration": 2520, + "src": "4651:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3175,18 +3457,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1512, + "id": 2524, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4462:7:2", + "referencedDeclaration": 2514, + "src": "4655:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1513, + "id": 2525, "isConstant": false, "isLValue": false, "isPure": false, @@ -3194,31 +3476,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4462:14:2", + "src": "4655:14:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4458:18:2", + "src": "4651:18:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1537, + "id": 2560, "initializationExpression": { "assignments": [ - 1508 + 2520 ], "declarations": [ { "constant": false, - "id": 1508, + "id": 2520, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1543, - "src": "4443:9:2", + "scope": 2566, + "src": "4636:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3226,10 +3508,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1507, + "id": 2519, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4443:7:2", + "src": "4636:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3239,18 +3521,18 @@ "visibility": "internal" } ], - "id": 1510, + "id": 2522, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1509, + "id": 2521, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4455:1:2", + "src": "4648:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3259,12 +3541,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4443:13:2" + "src": "4636:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1516, + "id": 2528, "isConstant": false, "isLValue": false, "isPure": false, @@ -3272,15 +3554,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "4478:3:2", + "src": "4671:3:5", "subExpression": { "argumentTypes": null, - "id": 1515, + "id": 2527, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4478:1:2", + "referencedDeclaration": 2520, + "src": "4671:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3291,12 +3573,12 @@ "typeString": "uint256" } }, - "id": 1517, + "id": 2529, "nodeType": "ExpressionStatement", - "src": "4478:3:2" + "src": "4671:3:5" }, "nodeType": "ForStatement", - "src": "4438:306:2" + "src": "4631:443:5" }, { "eventCall": { @@ -3304,12 +3586,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1539, + "id": 2562, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4779:7:2", + "referencedDeclaration": 2514, + "src": "5109:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -3323,18 +3605,18 @@ "typeString": "address[] calldata" } ], - "id": 1538, + "id": 2561, "name": "PromotedSellersAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1391, - "src": "4758:20:2", + "referencedDeclaration": 2403, + "src": "5088:20:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 1540, + "id": 2563, "isConstant": false, "isLValue": false, "isPure": false, @@ -3342,57 +3624,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4758:29:2", + "src": "5088:29:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1541, + "id": 2564, "nodeType": "EmitStatement", - "src": "4753:34:2" + "src": "5083:34:5" } ] }, "documentation": "@dev Allows owner to add new promoted sellers. Previous ones will\nremain untouched\n@param sellers List of sellers to be marked as promoted\nNo Seller out of this list should already be promoted, otherwise\ntransaction will fail", - "id": 1543, + "id": 2566, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1505, + "id": 2517, "modifierName": { "argumentTypes": null, - "id": 1504, + "id": 2516, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "4417:9:2", + "referencedDeclaration": 4665, + "src": "4610:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4417:9:2" + "src": "4610:9:5" } ], "name": "addPromotedSellers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1503, + "id": 2515, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1502, + "id": 2514, "name": "sellers", "nodeType": "VariableDeclaration", - "scope": 1543, - "src": "4389:17:2", + "scope": 2566, + "src": "4582:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3401,19 +3683,19 @@ }, "typeName": { "baseType": { - "id": 1500, + "id": 2512, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4389:7:2", + "src": "4582:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1501, + "id": 2513, "length": null, "nodeType": "ArrayTypeName", - "src": "4389:9:2", + "src": "4582:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -3423,37 +3705,37 @@ "visibility": "internal" } ], - "src": "4388:19:2" + "src": "4581:19:5" }, "payable": false, "returnParameters": { - "id": 1506, + "id": 2518, "nodeType": "ParameterList", "parameters": [], - "src": "4427:0:2" + "src": "4620:0:5" }, - "scope": 2226, - "src": "4361:433:2", + "scope": 3265, + "src": "4554:570:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1576, + "id": 2599, "nodeType": "Block", - "src": "4980:169:2", + "src": "5310:169:5", "statements": [ { "body": { - "id": 1570, + "id": 2593, "nodeType": "Block", - "src": "5036:61:2", + "src": "5366:61:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1568, + "id": 2591, "isConstant": false, "isLValue": false, "isPure": false, @@ -3462,42 +3744,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1562, + "id": 2585, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "5051:15:2", + "referencedDeclaration": 2343, + "src": "5381:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1566, + "id": 2589, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1563, + "id": 2586, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5067:7:2", + "referencedDeclaration": 2569, + "src": "5397:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1565, + "id": 2588, "indexExpression": { "argumentTypes": null, - "id": 1564, + "id": 2587, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5075:1:2", + "referencedDeclaration": 2575, + "src": "5405:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3508,7 +3790,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5067:10:2", + "src": "5397:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3519,7 +3801,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5051:27:2", + "src": "5381:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3530,14 +3812,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1567, + "id": 2590, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "5081:5:2", + "src": "5411:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -3545,15 +3827,15 @@ }, "value": "false" }, - "src": "5051:35:2", + "src": "5381:35:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1569, + "id": 2592, "nodeType": "ExpressionStatement", - "src": "5051:35:2" + "src": "5381:35:5" } ] }, @@ -3563,19 +3845,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1558, + "id": 2581, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1555, + "id": 2578, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5011:1:2", + "referencedDeclaration": 2575, + "src": "5341:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3587,18 +3869,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1556, + "id": 2579, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5015:7:2", + "referencedDeclaration": 2569, + "src": "5345:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1557, + "id": 2580, "isConstant": false, "isLValue": false, "isPure": false, @@ -3606,31 +3888,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5015:14:2", + "src": "5345:14:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5011:18:2", + "src": "5341:18:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1571, + "id": 2594, "initializationExpression": { "assignments": [ - 1552 + 2575 ], "declarations": [ { "constant": false, - "id": 1552, + "id": 2575, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1577, - "src": "4996:9:2", + "scope": 2600, + "src": "5326:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3638,10 +3920,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1551, + "id": 2574, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4996:7:2", + "src": "5326:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3651,18 +3933,18 @@ "visibility": "internal" } ], - "id": 1554, + "id": 2577, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1553, + "id": 2576, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5008:1:2", + "src": "5338:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3671,12 +3953,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4996:13:2" + "src": "5326:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1560, + "id": 2583, "isConstant": false, "isLValue": false, "isPure": false, @@ -3684,15 +3966,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "5031:3:2", + "src": "5361:3:5", "subExpression": { "argumentTypes": null, - "id": 1559, + "id": 2582, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5031:1:2", + "referencedDeclaration": 2575, + "src": "5361:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3703,12 +3985,12 @@ "typeString": "uint256" } }, - "id": 1561, + "id": 2584, "nodeType": "ExpressionStatement", - "src": "5031:3:2" + "src": "5361:3:5" }, "nodeType": "ForStatement", - "src": "4991:106:2" + "src": "5321:106:5" }, { "eventCall": { @@ -3716,12 +3998,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1573, + "id": 2596, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5134:7:2", + "referencedDeclaration": 2569, + "src": "5464:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -3735,18 +4017,18 @@ "typeString": "address[] calldata" } ], - "id": 1572, + "id": 2595, "name": "PromotedSellersRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1396, - "src": "5111:22:2", + "referencedDeclaration": 2408, + "src": "5441:22:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 1574, + "id": 2597, "isConstant": false, "isLValue": false, "isPure": false, @@ -3754,57 +4036,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5111:31:2", + "src": "5441:31:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1575, + "id": 2598, "nodeType": "EmitStatement", - "src": "5106:36:2" + "src": "5436:36:5" } ] }, "documentation": "@dev Remove exisiting promoted sellers\n@param sellers List of sellers to be removed", - "id": 1577, + "id": 2600, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1549, + "id": 2572, "modifierName": { "argumentTypes": null, - "id": 1548, + "id": 2571, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "4970:9:2", + "referencedDeclaration": 4665, + "src": "5300:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4970:9:2" + "src": "5300:9:5" } ], "name": "removePromotedSellers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1547, + "id": 2570, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1546, + "id": 2569, "name": "sellers", "nodeType": "VariableDeclaration", - "scope": 1577, - "src": "4942:17:2", + "scope": 2600, + "src": "5272:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3813,19 +4095,19 @@ }, "typeName": { "baseType": { - "id": 1544, + "id": 2567, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4942:7:2", + "src": "5272:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1545, + "id": 2568, "length": null, "nodeType": "ArrayTypeName", - "src": "4942:9:2", + "src": "5272:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -3835,43 +4117,43 @@ "visibility": "internal" } ], - "src": "4941:19:2" + "src": "5271:19:5" }, "payable": false, "returnParameters": { - "id": 1550, + "id": 2573, "nodeType": "ParameterList", "parameters": [], - "src": "4980:0:2" + "src": "5310:0:5" }, - "scope": 2226, - "src": "4911:238:2", + "scope": 3265, + "src": "5241:238:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1593, + "id": 2616, "nodeType": "Block", - "src": "5478:71:2", + "src": "5808:76:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1589, + "id": 2612, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1585, + "id": 2608, "name": "buyers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "5488:6:2", + "referencedDeclaration": 2606, + "src": "5818:6:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -3883,26 +4165,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1586, - "name": "sellerVsBuyers", + "id": 2609, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "5497:14:2", + "referencedDeclaration": 2356, + "src": "5827:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1588, + "id": 2611, "indexExpression": { "argumentTypes": null, - "id": 1587, + "id": 2610, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "5512:6:2", + "referencedDeclaration": 2602, + "src": "5847:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3913,45 +4195,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5497:22:2", + "src": "5827:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "src": "5488:31:2", + "src": "5818:36:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 1590, + "id": 2613, "nodeType": "ExpressionStatement", - "src": "5488:31:2" + "src": "5818:36:5" }, { "expression": { "argumentTypes": null, - "id": 1591, + "id": 2614, "name": "buyers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "5536:6:2", + "referencedDeclaration": 2606, + "src": "5871:6:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "functionReturnParameters": 1584, - "id": 1592, + "functionReturnParameters": 2607, + "id": 2615, "nodeType": "Return", - "src": "5529:13:2" + "src": "5864:13:5" } ] }, "documentation": "@dev Returns list of buyers that have been rewarded for purchasing from\na given seller\n@param seller Address of promoted seller\n@return buyers List of Buyers", - "id": 1594, + "id": 2617, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -3959,16 +4241,16 @@ "name": "getRewardedBuyers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1580, + "id": 2603, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1579, + "id": 2602, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1594, - "src": "5388:14:2", + "scope": 2617, + "src": "5718:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3976,10 +4258,10 @@ "typeString": "address" }, "typeName": { - "id": 1578, + "id": 2601, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5388:7:2", + "src": "5718:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3989,20 +4271,20 @@ "visibility": "internal" } ], - "src": "5378:30:2" + "src": "5708:30:5" }, "payable": false, "returnParameters": { - "id": 1584, + "id": 2607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1583, + "id": 2606, "name": "buyers", "nodeType": "VariableDeclaration", - "scope": 1594, - "src": "5456:16:2", + "scope": 2617, + "src": "5786:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4011,19 +4293,19 @@ }, "typeName": { "baseType": { - "id": 1581, + "id": 2604, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5456:7:2", + "src": "5786:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1582, + "id": 2605, "length": null, "nodeType": "ArrayTypeName", - "src": "5456:9:2", + "src": "5786:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -4033,19 +4315,19 @@ "visibility": "internal" } ], - "src": "5455:18:2" + "src": "5785:18:5" }, - "scope": 2226, - "src": "5352:197:2", + "scope": 3265, + "src": "5682:202:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1609, + "id": 2632, "nodeType": "Block", - "src": "5950:59:2", + "src": "6285:59:5", "statements": [ { "expression": { @@ -4054,26 +4336,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1603, + "id": 2626, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "5967:20:2", + "referencedDeclaration": 2368, + "src": "6302:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1605, + "id": 2628, "indexExpression": { "argumentTypes": null, - "id": 1604, + "id": 2627, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1596, - "src": "5988:6:2", + "referencedDeclaration": 2619, + "src": "6323:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4084,21 +4366,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5967:28:2", + "src": "6302:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1607, + "id": 2630, "indexExpression": { "argumentTypes": null, - "id": 1606, + "id": 2629, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1598, - "src": "5996:5:2", + "referencedDeclaration": 2621, + "src": "6331:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4109,21 +4391,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5967:35:2", + "src": "6302:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1602, - "id": 1608, + "functionReturnParameters": 2625, + "id": 2631, "nodeType": "Return", - "src": "5960:42:2" + "src": "6295:42:5" } ] }, "documentation": "@dev Return reward info for a buyer against a promoted seller\n@param seller Address of promoted seller\n@param buyer The buyer who reward info has to be fetched\n@return rewardAmount", - "id": 1610, + "id": 2633, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -4131,16 +4413,16 @@ "name": "getBuyerRewardInfo", "nodeType": "FunctionDefinition", "parameters": { - "id": 1599, + "id": 2622, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1596, + "id": 2619, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5812:14:2", + "scope": 2633, + "src": "6147:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4148,10 +4430,10 @@ "typeString": "address" }, "typeName": { - "id": 1595, + "id": 2618, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5812:7:2", + "src": "6147:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4162,11 +4444,11 @@ }, { "constant": false, - "id": 1598, + "id": 2621, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5836:13:2", + "scope": 2633, + "src": "6171:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4174,10 +4456,10 @@ "typeString": "address" }, "typeName": { - "id": 1597, + "id": 2620, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5836:7:2", + "src": "6171:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4187,20 +4469,20 @@ "visibility": "internal" } ], - "src": "5802:53:2" + "src": "6137:53:5" }, "payable": false, "returnParameters": { - "id": 1602, + "id": 2625, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1601, + "id": 2624, "name": "rewardAmount", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5915:20:2", + "scope": 2633, + "src": "6250:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4208,10 +4490,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1600, + "id": 2623, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5915:7:2", + "src": "6250:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4221,36 +4503,36 @@ "visibility": "internal" } ], - "src": "5901:44:2" + "src": "6236:44:5" }, - "scope": 2226, - "src": "5775:234:2", + "scope": 3265, + "src": "6110:234:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1625, + "id": 2648, "nodeType": "Block", - "src": "6345:105:2", + "src": "6680:105:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1621, + "id": 2644, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1617, + "id": 2640, "name": "rewardDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1615, - "src": "6355:17:2", + "referencedDeclaration": 2638, + "src": "6690:17:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4262,26 +4544,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1618, + "id": 2641, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "6375:26:2", + "referencedDeclaration": 2372, + "src": "6710:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1620, + "id": 2643, "indexExpression": { "argumentTypes": null, - "id": 1619, + "id": 2642, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1612, - "src": "6402:6:2", + "referencedDeclaration": 2635, + "src": "6737:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4292,45 +4574,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6375:34:2", + "src": "6710:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6355:54:2", + "src": "6690:54:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1622, + "id": 2645, "nodeType": "ExpressionStatement", - "src": "6355:54:2" + "src": "6690:54:5" }, { "expression": { "argumentTypes": null, - "id": 1623, + "id": 2646, "name": "rewardDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1615, - "src": "6426:17:2", + "referencedDeclaration": 2638, + "src": "6761:17:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1616, - "id": 1624, + "functionReturnParameters": 2639, + "id": 2647, "nodeType": "Return", - "src": "6419:24:2" + "src": "6754:24:5" } ] }, "documentation": "@dev Total reward distributed for a promoted seller so far\n@param seller Promoted seller's address\n@return Amount of tokens distributed as reward for a seller", - "id": 1626, + "id": 2649, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -4338,16 +4620,16 @@ "name": "getDistributedReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 1613, + "id": 2636, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1612, + "id": 2635, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1626, - "src": "6246:14:2", + "scope": 2649, + "src": "6581:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4355,10 +4637,10 @@ "typeString": "address" }, "typeName": { - "id": 1611, + "id": 2634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6246:7:2", + "src": "6581:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4368,20 +4650,20 @@ "visibility": "internal" } ], - "src": "6236:30:2" + "src": "6571:30:5" }, "payable": false, "returnParameters": { - "id": 1616, + "id": 2639, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1615, + "id": 2638, "name": "rewardDistributed", "nodeType": "VariableDeclaration", - "scope": 1626, - "src": "6314:25:2", + "scope": 2649, + "src": "6649:25:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4389,10 +4671,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1614, + "id": 2637, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6314:7:2", + "src": "6649:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4402,32 +4684,32 @@ "visibility": "internal" } ], - "src": "6313:27:2" + "src": "6648:27:5" }, - "scope": 2226, - "src": "6207:243:2", + "scope": 3265, + "src": "6542:243:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1650, + "id": 2673, "nodeType": "Block", - "src": "6769:102:2", + "src": "7104:102:5", "statements": [ { "assignments": [ - 1637 + 2660 ], "declarations": [ { "constant": false, - "id": 1637, + "id": 2660, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1651, - "src": "6779:14:2", + "scope": 2674, + "src": "7114:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4435,10 +4717,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1636, + "id": 2659, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6779:7:2", + "src": "7114:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4448,20 +4730,20 @@ "visibility": "internal" } ], - "id": 1642, + "id": 2665, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1640, + "id": 2663, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2552, - "src": "6814:4:2", + "referencedDeclaration": 5340, + "src": "7149:4:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } } @@ -4469,38 +4751,38 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } ], "expression": { "argumentTypes": null, - "id": 1638, + "id": 2661, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "6796:7:2", + "referencedDeclaration": 2376, + "src": "7131:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1639, + "id": 2662, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 2235, - "src": "6796:17:2", + "referencedDeclaration": 4403, + "src": "7131:17:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 1641, + "id": 2664, "isConstant": false, "isLValue": false, "isPure": false, @@ -4508,14 +4790,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6796:23:2", + "src": "7131:23:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "6779:40:2" + "src": "7114:40:5" }, { "expression": { @@ -4523,12 +4805,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1646, + "id": 2669, "name": "receiver", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1628, - "src": "6847:8:2", + "referencedDeclaration": 2651, + "src": "7182:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4536,12 +4818,12 @@ }, { "argumentTypes": null, - "id": 1647, + "id": 2670, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1637, - "src": "6857:6:2", + "referencedDeclaration": 2660, + "src": "7192:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4561,32 +4843,32 @@ ], "expression": { "argumentTypes": null, - "id": 1643, + "id": 2666, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "6830:7:2", + "referencedDeclaration": 2376, + "src": "7165:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1645, + "id": 2668, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "6830:16:2", + "referencedDeclaration": 4412, + "src": "7165:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 1648, + "id": 2671, "isConstant": false, "isLValue": false, "isPure": false, @@ -4594,90 +4876,90 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6830:34:2", + "src": "7165:34:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1649, + "id": 2672, "nodeType": "ExpressionStatement", - "src": "6830:34:2" + "src": "7165:34:5" } ] }, "documentation": "@dev Allows the owner of the contract to transfer all remaining tokens to\nan address of their choosing.\n@param receiver The receiver's address", - "id": 1651, + "id": 2674, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1631, + "id": 2654, "modifierName": { "argumentTypes": null, - "id": 1630, + "id": 2653, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "6722:9:2", + "referencedDeclaration": 4665, + "src": "7057:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "6722:9:2" + "src": "7057:9:5" }, { "arguments": [ { "argumentTypes": null, - "id": 1633, + "id": 2656, "name": "receiver", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1628, - "src": "6755:8:2", + "referencedDeclaration": 2651, + "src": "7090:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1634, + "id": 2657, "modifierName": { "argumentTypes": null, - "id": 1632, + "id": 2655, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "6740:14:2", + "referencedDeclaration": 2429, + "src": "7075:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "6740:24:2" + "src": "7075:24:5" } ], "name": "transferRemainingTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1629, + "id": 2652, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1628, + "id": 2651, "name": "receiver", "nodeType": "VariableDeclaration", - "scope": 1651, - "src": "6674:16:2", + "scope": 2674, + "src": "7009:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4685,10 +4967,10 @@ "typeString": "address" }, "typeName": { - "id": 1627, + "id": 2650, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6674:7:2", + "src": "7009:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4698,43 +4980,43 @@ "visibility": "internal" } ], - "src": "6664:32:2" + "src": "6999:32:5" }, "payable": false, "returnParameters": { - "id": 1635, + "id": 2658, "nodeType": "ParameterList", "parameters": [], - "src": "6769:0:2" + "src": "7104:0:5" }, - "scope": 2226, - "src": "6632:239:2", + "scope": 3265, + "src": "6967:239:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1662, + "id": 2685, "nodeType": "Block", - "src": "7163:57:2", + "src": "7498:57:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1660, + "id": 2683, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1658, + "id": 2681, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "7173:18:2", + "referencedDeclaration": 2345, + "src": "7508:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4744,68 +5026,68 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1659, + "id": 2682, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1653, - "src": "7194:19:2", + "referencedDeclaration": 2676, + "src": "7529:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7173:40:2", + "src": "7508:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1661, + "id": 2684, "nodeType": "ExpressionStatement", - "src": "7173:40:2" + "src": "7508:40:5" } ] }, - "documentation": "@dev Method to allow the onwer to adjust the maximum reward per seller\n@param _maxRewardPerSeller Max reward to be distributed for each seller", - "id": 1663, + "documentation": "@dev Method to allow the owner to adjust the maximum reward per seller\n@param _maxRewardPerSeller Max reward to be distributed for each seller", + "id": 2686, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1656, + "id": 2679, "modifierName": { "argumentTypes": null, - "id": 1655, + "id": 2678, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "7149:9:2", + "referencedDeclaration": 4665, + "src": "7484:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "7149:9:2" + "src": "7484:9:5" } ], "name": "changeMaxRewardPerSeller", "nodeType": "FunctionDefinition", "parameters": { - "id": 1654, + "id": 2677, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1653, + "id": 2676, "name": "_maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 1663, - "src": "7090:27:2", + "scope": 2686, + "src": "7425:27:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4813,10 +5095,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1652, + "id": 2675, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7090:7:2", + "src": "7425:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4826,43 +5108,43 @@ "visibility": "internal" } ], - "src": "7080:43:2" + "src": "7415:43:5" }, "payable": false, "returnParameters": { - "id": 1657, + "id": 2680, "nodeType": "ParameterList", "parameters": [], - "src": "7163:0:2" + "src": "7498:0:5" }, - "scope": 2226, - "src": "7047:173:2", + "scope": 3265, + "src": "7382:173:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1674, + "id": 2697, "nodeType": "Block", - "src": "7428:41:2", + "src": "7763:41:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1672, + "id": 2695, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1670, + "id": 2693, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "7438:10:2", + "referencedDeclaration": 2351, + "src": "7773:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4872,68 +5154,68 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1671, + "id": 2694, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1665, - "src": "7451:11:2", + "referencedDeclaration": 2688, + "src": "7786:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7438:24:2", + "src": "7773:24:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1673, + "id": 2696, "nodeType": "ExpressionStatement", - "src": "7438:24:2" + "src": "7773:24:5" } ] }, "documentation": "@dev Method to allow the owner to change the timeWindow variable\n@param _timeWindow A time window in seconds", - "id": 1675, + "id": 2698, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1668, + "id": 2691, "modifierName": { "argumentTypes": null, - "id": 1667, + "id": 2690, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "7418:9:2", + "referencedDeclaration": 4665, + "src": "7753:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "7418:9:2" + "src": "7753:9:5" } ], "name": "changeTimeWindow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1666, + "id": 2689, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1665, + "id": 2688, "name": "_timeWindow", "nodeType": "VariableDeclaration", - "scope": 1675, - "src": "7388:19:2", + "scope": 2698, + "src": "7723:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4941,10 +5223,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1664, + "id": 2687, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7388:7:2", + "src": "7723:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4954,43 +5236,43 @@ "visibility": "internal" } ], - "src": "7387:21:2" + "src": "7722:21:5" }, "payable": false, "returnParameters": { - "id": 1669, + "id": 2692, "nodeType": "ParameterList", "parameters": [], - "src": "7428:0:2" + "src": "7763:0:5" }, - "scope": 2226, - "src": "7362:107:2", + "scope": 3265, + "src": "7697:107:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1691, + "id": 2714, "nodeType": "Block", - "src": "7744:74:2", + "src": "8079:79:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1687, + "id": 2710, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1682, + "id": 2705, "name": "size", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1680, - "src": "7754:4:2", + "referencedDeclaration": 2703, + "src": "8089:4:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5004,26 +5286,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1683, - "name": "sellerVsBuyers", + "id": 2706, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "7761:14:2", + "referencedDeclaration": 2356, + "src": "8096:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1685, + "id": 2708, "indexExpression": { "argumentTypes": null, - "id": 1684, + "id": 2707, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1677, - "src": "7776:6:2", + "referencedDeclaration": 2700, + "src": "8116:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5034,13 +5316,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7761:22:2", + "src": "8096:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1686, + "id": 2709, "isConstant": false, "isLValue": true, "isPure": false, @@ -5048,45 +5330,45 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7761:29:2", + "src": "8096:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7754:36:2", + "src": "8089:41:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1688, + "id": 2711, "nodeType": "ExpressionStatement", - "src": "7754:36:2" + "src": "8089:41:5" }, { "expression": { "argumentTypes": null, - "id": 1689, + "id": 2712, "name": "size", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1680, - "src": "7807:4:2", + "referencedDeclaration": 2703, + "src": "8147:4:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1681, - "id": 1690, + "functionReturnParameters": 2704, + "id": 2713, "nodeType": "Return", - "src": "7800:11:2" + "src": "8140:11:5" } ] }, "documentation": "@dev Returns the number of rewarded buyers associated with a given seller\n@param seller Address of the promoted seller", - "id": 1692, + "id": 2715, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5094,16 +5376,16 @@ "name": "noOfRewardedBuyers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1678, + "id": 2701, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1677, + "id": 2700, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1692, - "src": "7658:14:2", + "scope": 2715, + "src": "7993:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5111,10 +5393,10 @@ "typeString": "address" }, "typeName": { - "id": 1676, + "id": 2699, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7658:7:2", + "src": "7993:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5124,20 +5406,20 @@ "visibility": "internal" } ], - "src": "7648:30:2" + "src": "7983:30:5" }, "payable": false, "returnParameters": { - "id": 1681, + "id": 2704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1680, + "id": 2703, "name": "size", "nodeType": "VariableDeclaration", - "scope": 1692, - "src": "7726:12:2", + "scope": 2715, + "src": "8061:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5145,10 +5427,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1679, + "id": 2702, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7726:7:2", + "src": "8061:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5158,19 +5440,19 @@ "visibility": "internal" } ], - "src": "7725:14:2" + "src": "8060:14:5" }, - "scope": 2226, - "src": "7621:197:2", + "scope": 3265, + "src": "7956:202:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1721, + "id": 2744, "nodeType": "Block", - "src": "8191:194:2", + "src": "8531:204:5", "statements": [ { "expression": { @@ -5182,7 +5464,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1707, + "id": 2730, "isConstant": false, "isLValue": false, "isPure": false, @@ -5193,26 +5475,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1702, - "name": "sellerVsBuyers", + "id": 2725, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "8222:14:2", + "referencedDeclaration": 2356, + "src": "8562:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1704, + "id": 2727, "indexExpression": { "argumentTypes": null, - "id": 1703, + "id": 2726, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1694, - "src": "8237:6:2", + "referencedDeclaration": 2717, + "src": "8582:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5223,13 +5505,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8222:22:2", + "src": "8562:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1705, + "id": 2728, "isConstant": false, "isLValue": true, "isPure": false, @@ -5237,7 +5519,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8222:29:2", + "src": "8562:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5247,18 +5529,18 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1706, + "id": 2729, "name": "index", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1696, - "src": "8254:5:2", + "referencedDeclaration": 2719, + "src": "8599:5:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8222:37:2", + "src": "8562:42:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5267,14 +5549,14 @@ { "argumentTypes": null, "hexValue": "417272617920696e646578206f7574206f6620626f756e64", - "id": 1708, + "id": 2731, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8273:26:2", + "src": "8618:26:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_b1d904613212264f9084e8698869d0bfef475b2f25afa799450bc6f596eea8f4", @@ -5294,21 +5576,21 @@ "typeString": "literal_string \"Array index out of bound\"" } ], - "id": 1701, + "id": 2724, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8201:7:2", + "referencedDeclaration": 5313, + "src": "8541:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1709, + "id": 2732, "isConstant": false, "isLValue": false, "isPure": false, @@ -5316,32 +5598,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8201:108:2", + "src": "8541:113:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1710, + "id": 2733, "nodeType": "ExpressionStatement", - "src": "8201:108:2" + "src": "8541:113:5" }, { "expression": { "argumentTypes": null, - "id": 1717, + "id": 2740, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1711, + "id": 2734, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1699, - "src": "8319:5:2", + "referencedDeclaration": 2722, + "src": "8664:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5355,26 +5637,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1712, - "name": "sellerVsBuyers", + "id": 2735, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "8327:14:2", + "referencedDeclaration": 2356, + "src": "8672:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1714, + "id": 2737, "indexExpression": { "argumentTypes": null, - "id": 1713, + "id": 2736, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1694, - "src": "8342:6:2", + "referencedDeclaration": 2717, + "src": "8692:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5385,21 +5667,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8327:22:2", + "src": "8672:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1716, + "id": 2739, "indexExpression": { "argumentTypes": null, - "id": 1715, + "id": 2738, "name": "index", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1696, - "src": "8350:5:2", + "referencedDeclaration": 2719, + "src": "8700:5:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5410,45 +5692,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8327:29:2", + "src": "8672:34:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "8319:37:2", + "src": "8664:42:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1718, + "id": 2741, "nodeType": "ExpressionStatement", - "src": "8319:37:2" + "src": "8664:42:5" }, { "expression": { "argumentTypes": null, - "id": 1719, + "id": 2742, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1699, - "src": "8373:5:2", + "referencedDeclaration": 2722, + "src": "8723:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "functionReturnParameters": 1700, - "id": 1720, + "functionReturnParameters": 2723, + "id": 2743, "nodeType": "Return", - "src": "8366:12:2" + "src": "8716:12:5" } ] }, "documentation": "@dev Method to get rewarded buyer address at specific index for a seller\n@param seller Seller for whom the rewarded buyer is requested\n@param index Index at which buyer has to be retrieved", - "id": 1722, + "id": 2745, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -5456,16 +5738,16 @@ "name": "getRewardedBuyer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1697, + "id": 2720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1694, + "id": 2717, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8081:14:2", + "scope": 2745, + "src": "8421:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5473,10 +5755,10 @@ "typeString": "address" }, "typeName": { - "id": 1693, + "id": 2716, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8081:7:2", + "src": "8421:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5487,11 +5769,11 @@ }, { "constant": false, - "id": 1696, + "id": 2719, "name": "index", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8105:13:2", + "scope": 2745, + "src": "8445:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5499,10 +5781,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1695, + "id": 2718, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8105:7:2", + "src": "8445:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5512,20 +5794,20 @@ "visibility": "internal" } ], - "src": "8071:53:2" + "src": "8411:53:5" }, "payable": false, "returnParameters": { - "id": 1700, + "id": 2723, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1699, + "id": 2722, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8172:13:2", + "scope": 2745, + "src": "8512:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5533,10 +5815,10 @@ "typeString": "address" }, "typeName": { - "id": 1698, + "id": 2721, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8172:7:2", + "src": "8512:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5546,19 +5828,19 @@ "visibility": "internal" } ], - "src": "8171:15:2" + "src": "8511:15:5" }, - "scope": 2226, - "src": "8046:339:2", + "scope": 3265, + "src": "8386:349:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1740, + "id": 2763, "nodeType": "Block", - "src": "8576:128:2", + "src": "8926:128:5", "statements": [ { "expression": { @@ -5566,7 +5848,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1729, + "id": 2752, "isConstant": false, "isLValue": false, "isPure": false, @@ -5574,15 +5856,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "8594:10:2", + "src": "8944:10:5", "subExpression": { "argumentTypes": null, - "id": 1728, + "id": 2751, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "8595:9:2", + "referencedDeclaration": 2378, + "src": "8945:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5596,14 +5878,14 @@ { "argumentTypes": null, "hexValue": "5265776172647320646973747269627574696f6e20697320616c7265616479206f6e", - "id": 1730, + "id": 2753, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8606:36:2", + "src": "8956:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6076ec01a8df3d80acb436fe9e1c9f0fd3ba7f947212ecf4d4da281c3524dbf0", @@ -5623,21 +5905,21 @@ "typeString": "literal_string \"Rewards distribution is already on\"" } ], - "id": 1727, + "id": 2750, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8586:7:2", + "referencedDeclaration": 5313, + "src": "8936:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1731, + "id": 2754, "isConstant": false, "isLValue": false, "isPure": false, @@ -5645,32 +5927,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8586:57:2", + "src": "8936:57:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1732, + "id": 2755, "nodeType": "ExpressionStatement", - "src": "8586:57:2" + "src": "8936:57:5" }, { "expression": { "argumentTypes": null, - "id": 1735, + "id": 2758, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1733, + "id": 2756, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "8654:9:2", + "referencedDeclaration": 2378, + "src": "9004:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5681,14 +5963,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1734, + "id": 2757, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "8666:4:2", + "src": "9016:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -5696,15 +5978,15 @@ }, "value": "true" }, - "src": "8654:16:2", + "src": "9004:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1736, + "id": 2759, "nodeType": "ExpressionStatement", - "src": "8654:16:2" + "src": "9004:16:5" }, { "eventCall": { @@ -5712,18 +5994,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 1737, + "id": 2760, "name": "RewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1398, - "src": "8686:9:2", + "referencedDeclaration": 2410, + "src": "9036:9:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 1738, + "id": 2761, "isConstant": false, "isLValue": false, "isPure": false, @@ -5731,70 +6013,70 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8686:11:2", + "src": "9036:11:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1739, + "id": 2762, "nodeType": "EmitStatement", - "src": "8681:16:2" + "src": "9031:16:5" } ] }, "documentation": "@dev Allows the owner of the contract to turn on the rewards distribution\nOnly if it was not previously turned on", - "id": 1741, + "id": 2764, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1725, + "id": 2748, "modifierName": { "argumentTypes": null, - "id": 1724, + "id": 2747, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "8566:9:2", + "referencedDeclaration": 4665, + "src": "8916:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "8566:9:2" + "src": "8916:9:5" } ], "name": "turnOnRewards", "nodeType": "FunctionDefinition", "parameters": { - "id": 1723, + "id": 2746, "nodeType": "ParameterList", "parameters": [], - "src": "8554:2:2" + "src": "8904:2:5" }, "payable": false, "returnParameters": { - "id": 1726, + "id": 2749, "nodeType": "ParameterList", "parameters": [], - "src": "8576:0:2" + "src": "8926:0:5" }, - "scope": 2226, - "src": "8532:172:2", + "scope": 3265, + "src": "8882:172:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1764, + "id": 2787, "nodeType": "Block", - "src": "8867:202:2", + "src": "9217:202:5", "statements": [ { "expression": { @@ -5806,19 +6088,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1752, + "id": 2775, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1749, + "id": 2772, "name": "_endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1743, - "src": "8898:8:2", + "referencedDeclaration": 2766, + "src": "9248:8:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5830,18 +6112,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1750, + "id": 2773, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "8909:5:2", + "referencedDeclaration": 5299, + "src": "9259:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1751, + "id": 2774, "isConstant": false, "isLValue": false, "isPure": false, @@ -5849,13 +6131,13 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8909:15:2", + "src": "9259:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8898:26:2", + "src": "9248:26:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5864,14 +6146,14 @@ { "argumentTypes": null, "hexValue": "456e6420646174652073686f756c642062652067726561746572207468616e2063757272656e742064617465", - "id": 1753, + "id": 2776, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8938:46:2", + "src": "9288:46:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_60fe77c4466ec0f03aae146e7cfce08ed96412e26ce57b46795b5af31d6789df", @@ -5891,21 +6173,21 @@ "typeString": "literal_string \"End date should be greater than current date\"" } ], - "id": 1748, + "id": 2771, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8877:7:2", + "referencedDeclaration": 5313, + "src": "9227:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1754, + "id": 2777, "isConstant": false, "isLValue": false, "isPure": false, @@ -5913,32 +6195,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8877:117:2", + "src": "9227:117:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1755, + "id": 2778, "nodeType": "ExpressionStatement", - "src": "8877:117:2" + "src": "9227:117:5" }, { "expression": { "argumentTypes": null, - "id": 1758, + "id": 2781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1756, + "id": 2779, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9005:7:2", + "referencedDeclaration": 2380, + "src": "9355:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5948,26 +6230,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1757, + "id": 2780, "name": "_endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1743, - "src": "9015:8:2", + "referencedDeclaration": 2766, + "src": "9365:8:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9005:18:2", + "src": "9355:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1759, + "id": 2782, "nodeType": "ExpressionStatement", - "src": "9005:18:2" + "src": "9355:18:5" }, { "eventCall": { @@ -5975,12 +6257,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1761, + "id": 2784, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9054:7:2", + "referencedDeclaration": 2380, + "src": "9404:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5994,18 +6276,18 @@ "typeString": "uint256" } ], - "id": 1760, + "id": 2783, "name": "EndDateChanged", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1402, - "src": "9039:14:2", + "referencedDeclaration": 2414, + "src": "9389:14:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" } }, - "id": 1762, + "id": 2785, "isConstant": false, "isLValue": false, "isPure": false, @@ -6013,57 +6295,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9039:23:2", + "src": "9389:23:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1763, + "id": 2786, "nodeType": "EmitStatement", - "src": "9034:28:2" + "src": "9384:28:5" } ] }, "documentation": "@dev ALlows owner to set endDate\n@param _endDate date the promotion ends", - "id": 1765, + "id": 2788, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1746, + "id": 2769, "modifierName": { "argumentTypes": null, - "id": 1745, + "id": 2768, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "8857:9:2", + "referencedDeclaration": 4665, + "src": "9207:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "8857:9:2" + "src": "9207:9:5" } ], "name": "setEndDate", "nodeType": "FunctionDefinition", "parameters": { - "id": 1744, + "id": 2767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1743, + "id": 2766, "name": "_endDate", "nodeType": "VariableDeclaration", - "scope": 1765, - "src": "8830:16:2", + "scope": 2788, + "src": "9180:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6071,10 +6353,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1742, + "id": 2765, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8830:7:2", + "src": "9180:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6084,43 +6366,43 @@ "visibility": "internal" } ], - "src": "8829:18:2" + "src": "9179:18:5" }, "payable": false, "returnParameters": { - "id": 1747, + "id": 2770, "nodeType": "ParameterList", "parameters": [], - "src": "8867:0:2" + "src": "9217:0:5" }, - "scope": 2226, - "src": "8810:259:2", + "scope": 3265, + "src": "9160:259:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1782, + "id": 2805, "nodeType": "Block", - "src": "9140:91:2", + "src": "9490:91:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1778, + "id": 2801, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1770, + "id": 2793, "name": "running", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1768, - "src": "9150:7:2", + "referencedDeclaration": 2791, + "src": "9500:7:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6134,19 +6416,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1777, + "id": 2800, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1771, + "id": 2794, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "9160:9:2", + "referencedDeclaration": 2378, + "src": "9510:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6163,19 +6445,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1775, + "id": 2798, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1772, + "id": 2795, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9174:7:2", + "referencedDeclaration": 2380, + "src": "9524:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6187,18 +6469,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1773, + "id": 2796, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "9184:5:2", + "referencedDeclaration": 5299, + "src": "9534:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1774, + "id": 2797, "isConstant": false, "isLValue": false, "isPure": false, @@ -6206,71 +6488,71 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9184:15:2", + "src": "9534:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9174:25:2", + "src": "9524:25:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1776, + "id": 2799, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "9173:27:2", + "src": "9523:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "9160:40:2", + "src": "9510:40:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "9150:50:2", + "src": "9500:50:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1779, + "id": 2802, "nodeType": "ExpressionStatement", - "src": "9150:50:2" + "src": "9500:50:5" }, { "expression": { "argumentTypes": null, - "id": 1780, + "id": 2803, "name": "running", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1768, - "src": "9217:7:2", + "referencedDeclaration": 2791, + "src": "9567:7:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1769, - "id": 1781, + "functionReturnParameters": 2792, + "id": 2804, "nodeType": "Return", - "src": "9210:14:2" + "src": "9560:14:5" } ] }, "documentation": null, - "id": 1783, + "id": 2806, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -6278,23 +6560,23 @@ "name": "isRewardsRunning", "nodeType": "FunctionDefinition", "parameters": { - "id": 1766, + "id": 2789, "nodeType": "ParameterList", "parameters": [], - "src": "9100:2:2" + "src": "9450:2:5" }, "payable": false, "returnParameters": { - "id": 1769, + "id": 2792, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1768, + "id": 2791, "name": "running", "nodeType": "VariableDeclaration", - "scope": 1783, - "src": "9126:12:2", + "scope": 2806, + "src": "9476:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6302,10 +6584,10 @@ "typeString": "bool" }, "typeName": { - "id": 1767, + "id": 2790, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "9126:4:2", + "src": "9476:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6315,35 +6597,35 @@ "visibility": "internal" } ], - "src": "9125:14:2" + "src": "9475:14:5" }, - "scope": 2226, - "src": "9075:156:2", + "scope": 3265, + "src": "9425:156:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1814, + "id": 2837, "nodeType": "Block", - "src": "9521:353:2", + "src": "9871:353:5", "statements": [ { "assignments": [ - 1791, - 1793, - 1795, - 1797 + 2814, + 2816, + 2818, + 2820 ], "declarations": [ { "constant": false, - "id": 1791, + "id": 2814, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9545:13:2", + "scope": 2838, + "src": "9895:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6351,10 +6633,10 @@ "typeString": "address" }, "typeName": { - "id": 1790, + "id": 2813, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9545:7:2", + "src": "9895:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6365,11 +6647,11 @@ }, { "constant": false, - "id": 1793, + "id": 2816, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9572:14:2", + "scope": 2838, + "src": "9922:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6377,10 +6659,10 @@ "typeString": "address" }, "typeName": { - "id": 1792, + "id": 2815, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9572:7:2", + "src": "9922:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6391,11 +6673,11 @@ }, { "constant": false, - "id": 1795, + "id": 2818, "name": "status", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9600:12:2", + "scope": 2838, + "src": "9950:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6403,10 +6685,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1794, + "id": 2817, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "9600:5:2", + "src": "9950:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -6417,11 +6699,11 @@ }, { "constant": false, - "id": 1797, + "id": 2820, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9626:20:2", + "scope": 2838, + "src": "9976:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6429,10 +6711,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1796, + "id": 2819, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "9626:7:2", + "src": "9976:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6442,18 +6724,18 @@ "visibility": "internal" } ], - "id": 1801, + "id": 2824, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1799, + "id": 2822, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1785, - "src": "9675:10:2", + "referencedDeclaration": 2808, + "src": "10025:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6467,18 +6749,18 @@ "typeString": "bytes32" } ], - "id": 1798, + "id": 2821, "name": "_getTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2042, - "src": "9659:15:2", + "referencedDeclaration": 3081, + "src": "10009:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "function (bytes32) view returns (address,address,uint8,uint256)" } }, - "id": 1800, + "id": 2823, "isConstant": false, "isLValue": false, "isPure": false, @@ -6486,31 +6768,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9659:27:2", + "src": "10009:27:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "9531:155:2" + "src": "9881:155:5" }, { "expression": { "argumentTypes": null, - "id": 1810, + "id": 2833, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1802, + "id": 2825, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1788, - "src": "9697:6:2", + "referencedDeclaration": 2811, + "src": "10047:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6523,12 +6805,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1804, + "id": 2827, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1785, - "src": "9738:10:2", + "referencedDeclaration": 2808, + "src": "10088:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6536,12 +6818,12 @@ }, { "argumentTypes": null, - "id": 1805, + "id": 2828, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1791, - "src": "9762:5:2", + "referencedDeclaration": 2814, + "src": "10112:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6549,12 +6831,12 @@ }, { "argumentTypes": null, - "id": 1806, + "id": 2829, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1793, - "src": "9781:6:2", + "referencedDeclaration": 2816, + "src": "10131:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6562,12 +6844,12 @@ }, { "argumentTypes": null, - "id": 1807, + "id": 2830, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1795, - "src": "9801:6:2", + "referencedDeclaration": 2818, + "src": "10151:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -6575,12 +6857,12 @@ }, { "argumentTypes": null, - "id": 1808, + "id": 2831, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1797, - "src": "9821:12:2", + "referencedDeclaration": 2820, + "src": "10171:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6610,18 +6892,18 @@ "typeString": "uint256" } ], - "id": 1803, + "id": 2826, "name": "_getTokensToReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2171, - "src": "9706:18:2", + "referencedDeclaration": 3210, + "src": "10056:18:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (uint256)" } }, - "id": 1809, + "id": 2832, "isConstant": false, "isLValue": false, "isPure": false, @@ -6629,45 +6911,45 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9706:137:2", + "src": "10056:137:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9697:146:2", + "src": "10047:146:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1811, + "id": 2834, "nodeType": "ExpressionStatement", - "src": "9697:146:2" + "src": "10047:146:5" }, { "expression": { "argumentTypes": null, - "id": 1812, + "id": 2835, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1788, - "src": "9861:6:2", + "referencedDeclaration": 2811, + "src": "10211:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1789, - "id": 1813, + "functionReturnParameters": 2812, + "id": 2836, "nodeType": "Return", - "src": "9854:13:2" + "src": "10204:13:5" } ] }, "documentation": "@dev Buyer can call this method to calculate the reward for their\ntransaction\n@param scriptHash Script hash of the transaction", - "id": 1815, + "id": 2838, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -6675,16 +6957,16 @@ "name": "calculateReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 1786, + "id": 2809, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1785, + "id": 2808, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9431:18:2", + "scope": 2838, + "src": "9781:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6692,10 +6974,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1784, + "id": 2807, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "9431:7:2", + "src": "9781:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6705,20 +6987,20 @@ "visibility": "internal" } ], - "src": "9421:34:2" + "src": "9771:34:5" }, "payable": false, "returnParameters": { - "id": 1789, + "id": 2812, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1788, + "id": 2811, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9501:14:2", + "scope": 2838, + "src": "9851:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6726,10 +7008,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1787, + "id": 2810, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "9501:7:2", + "src": "9851:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6739,19 +7021,19 @@ "visibility": "internal" } ], - "src": "9500:16:2" + "src": "9850:16:5" }, - "scope": 2226, - "src": "9397:477:2", + "scope": 3265, + "src": "9747:477:5", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1868, + "id": 2891, "nodeType": "Block", - "src": "10436:590:2", + "src": "10786:590:5", "statements": [ { "expression": { @@ -6759,12 +7041,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1840, + "id": 2863, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1818, - "src": "10738:4:2", + "referencedDeclaration": 2841, + "src": "11088:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" @@ -6772,12 +7054,12 @@ }, { "argumentTypes": null, - "id": 1841, + "id": 2864, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1821, - "src": "10756:4:2", + "referencedDeclaration": 2844, + "src": "11106:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -6785,12 +7067,12 @@ }, { "argumentTypes": null, - "id": 1842, + "id": 2865, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1824, - "src": "10774:4:2", + "referencedDeclaration": 2847, + "src": "11124:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -6798,12 +7080,12 @@ }, { "argumentTypes": null, - "id": 1843, + "id": 2866, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1826, - "src": "10792:10:2", + "referencedDeclaration": 2849, + "src": "11142:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -6811,12 +7093,12 @@ }, { "argumentTypes": null, - "id": 1844, + "id": 2867, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1829, - "src": "10816:12:2", + "referencedDeclaration": 2852, + "src": "11166:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -6824,12 +7106,12 @@ }, { "argumentTypes": null, - "id": 1845, + "id": 2868, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1832, - "src": "10842:7:2", + "referencedDeclaration": 2855, + "src": "11192:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -6865,32 +7147,32 @@ ], "expression": { "argumentTypes": null, - "id": 1837, + "id": 2860, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "10702:14:2", + "referencedDeclaration": 2374, + "src": "11052:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 1839, + "id": 2862, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "execute", "nodeType": "MemberAccess", - "referencedDeclaration": 1303, - "src": "10702:22:2", + "referencedDeclaration": 1361, + "src": "11052:22:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory) external" } }, - "id": 1846, + "id": 2869, "isConstant": false, "isLValue": false, "isPure": false, @@ -6898,28 +7180,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10702:157:2", + "src": "11052:157:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1847, + "id": 2870, "nodeType": "ExpressionStatement", - "src": "10702:157:2" + "src": "11052:157:5" }, { "assignments": [ - 1851 + 2874 ], "declarations": [ { "constant": false, - "id": 1851, + "id": 2874, "name": "scriptHashes", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10896:29:2", + "scope": 2892, + "src": "11246:29:5", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -6928,19 +7210,19 @@ }, "typeName": { "baseType": { - "id": 1849, + "id": 2872, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10896:7:2", + "src": "11246:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1850, + "id": 2873, "length": null, "nodeType": "ArrayTypeName", - "src": "10896:9:2", + "src": "11246:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -6950,21 +7232,21 @@ "visibility": "internal" } ], - "id": 1857, + "id": 2880, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "31", - "id": 1855, + "id": 2878, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10942:1:2", + "src": "11292:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -6980,39 +7262,39 @@ "typeString": "int_const 1" } ], - "id": 1854, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "NewExpression", - "src": "10928:13:2", + "src": "11278:13:5", "typeDescriptions": { "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_$", "typeString": "function (uint256) pure returns (bytes32[] memory)" }, "typeName": { "baseType": { - "id": 1852, + "id": 2875, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10932:7:2", + "src": "11282:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1853, + "id": 2876, "length": null, "nodeType": "ArrayTypeName", - "src": "10932:9:2", + "src": "11282:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" } } }, - "id": 1856, + "id": 2879, "isConstant": false, "isLValue": false, "isPure": true, @@ -7020,19 +7302,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10928:16:2", + "src": "11278:16:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory", "typeString": "bytes32[] memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "10896:48:2" + "src": "11246:48:5" }, { "expression": { "argumentTypes": null, - "id": 1862, + "id": 2885, "isConstant": false, "isLValue": false, "isPure": false, @@ -7041,29 +7323,29 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1858, + "id": 2881, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "10954:12:2", + "referencedDeclaration": 2874, + "src": "11304:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1860, + "id": 2883, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1859, + "id": 2882, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10967:1:2", + "src": "11317:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -7076,7 +7358,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "10954:15:2", + "src": "11304:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7086,26 +7368,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1861, + "id": 2884, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1826, - "src": "10972:10:2", + "referencedDeclaration": 2849, + "src": "11322:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "10954:28:2", + "src": "11304:28:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1863, + "id": 2886, "nodeType": "ExpressionStatement", - "src": "10954:28:2" + "src": "11304:28:5" }, { "expression": { @@ -7113,12 +7395,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1865, + "id": 2888, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "11006:12:2", + "referencedDeclaration": 2874, + "src": "11356:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -7132,18 +7414,18 @@ "typeString": "bytes32[] memory" } ], - "id": 1864, + "id": 2887, "name": "claimRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2011, - "src": "10993:12:2", + "referencedDeclaration": 3050, + "src": "11343:12:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_bytes32_$dyn_memory_ptr_$returns$__$", "typeString": "function (bytes32[] memory)" } }, - "id": 1866, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, @@ -7151,57 +7433,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10993:26:2", + "src": "11343:26:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1867, + "id": 2890, "nodeType": "ExpressionStatement", - "src": "10993:26:2" + "src": "11343:26:5" } ] }, "documentation": "@dev Using this method user can choose to execute their transaction and\nclaim their rewards in one go. This will save one transaction.\nUsers can only use this method if their trade is using escrowContract\nfor escrow.\nSee the execute() method Escrow_v1_0.sol for more information.", - "id": 1869, + "id": 2892, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1835, + "id": 2858, "modifierName": { "argumentTypes": null, - "id": 1834, + "id": 2857, "name": "rewardsRunning", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1432, - "src": "10416:14:2", + "referencedDeclaration": 2444, + "src": "10766:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "10416:14:2" + "src": "10766:14:5" } ], "name": "executeAndClaim", "nodeType": "FunctionDefinition", "parameters": { - "id": 1833, + "id": 2856, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1818, + "id": 2841, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10239:12:2", + "scope": 2892, + "src": "10589:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7210,19 +7492,19 @@ }, "typeName": { "baseType": { - "id": 1816, + "id": 2839, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "10239:5:2", + "src": "10589:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 1817, + "id": 2840, "length": null, "nodeType": "ArrayTypeName", - "src": "10239:7:2", + "src": "10589:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -7233,11 +7515,11 @@ }, { "constant": false, - "id": 1821, + "id": 2844, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10261:14:2", + "scope": 2892, + "src": "10611:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7246,19 +7528,19 @@ }, "typeName": { "baseType": { - "id": 1819, + "id": 2842, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10261:7:2", + "src": "10611:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1820, + "id": 2843, "length": null, "nodeType": "ArrayTypeName", - "src": "10261:9:2", + "src": "10611:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -7269,11 +7551,11 @@ }, { "constant": false, - "id": 1824, + "id": 2847, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10285:14:2", + "scope": 2892, + "src": "10635:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7282,19 +7564,19 @@ }, "typeName": { "baseType": { - "id": 1822, + "id": 2845, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10285:7:2", + "src": "10635:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1823, + "id": 2846, "length": null, "nodeType": "ArrayTypeName", - "src": "10285:9:2", + "src": "10635:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -7305,11 +7587,11 @@ }, { "constant": false, - "id": 1826, + "id": 2849, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10309:18:2", + "scope": 2892, + "src": "10659:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7317,10 +7599,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1825, + "id": 2848, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10309:7:2", + "src": "10659:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7331,11 +7613,11 @@ }, { "constant": false, - "id": 1829, + "id": 2852, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10337:22:2", + "scope": 2892, + "src": "10687:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7344,19 +7626,19 @@ }, "typeName": { "baseType": { - "id": 1827, + "id": 2850, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10337:7:2", + "src": "10687:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1828, + "id": 2851, "length": null, "nodeType": "ArrayTypeName", - "src": "10337:9:2", + "src": "10687:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -7367,11 +7649,11 @@ }, { "constant": false, - "id": 1832, + "id": 2855, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10369:17:2", + "scope": 2892, + "src": "10719:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7380,19 +7662,19 @@ }, "typeName": { "baseType": { - "id": 1830, + "id": 2853, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "10369:7:2", + "src": "10719:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1831, + "id": 2854, "length": null, "nodeType": "ArrayTypeName", - "src": "10369:9:2", + "src": "10719:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -7402,26 +7684,26 @@ "visibility": "internal" } ], - "src": "10229:163:2" + "src": "10579:163:5" }, "payable": false, "returnParameters": { - "id": 1836, + "id": 2859, "nodeType": "ParameterList", "parameters": [], - "src": "10436:0:2" + "src": "10786:0:5" }, - "scope": 2226, - "src": "10205:821:2", + "scope": 3265, + "src": "10555:821:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2010, + "id": 3049, "nodeType": "Block", - "src": "11524:1934:2", + "src": "11874:2069:5", "statements": [ { "expression": { @@ -7433,7 +7715,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1881, + "id": 2904, "isConstant": false, "isLValue": false, "isPure": false, @@ -7442,18 +7724,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1878, + "id": 2901, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11543:12:2", + "referencedDeclaration": 2895, + "src": "11893:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1879, + "id": 2902, "isConstant": false, "isLValue": false, "isPure": false, @@ -7461,7 +7743,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11543:19:2", + "src": "11893:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7472,14 +7754,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1880, + "id": 2903, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11565:1:2", + "src": "11915:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -7487,7 +7769,7 @@ }, "value": "0" }, - "src": "11543:23:2", + "src": "11893:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7496,14 +7778,14 @@ { "argumentTypes": null, "hexValue": "4e6f20736372697074206861736820706173736564", - "id": 1882, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "11568:23:2", + "src": "11918:23:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_46f8f41d098c030bb008cbdf4a24767aacc6d5cef61408f79aaf44cad7d495f2", @@ -7523,21 +7805,21 @@ "typeString": "literal_string \"No script hash passed\"" } ], - "id": 1877, + "id": 2900, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "11535:7:2", + "referencedDeclaration": 5313, + "src": "11885:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1883, + "id": 2906, "isConstant": false, "isLValue": false, "isPure": false, @@ -7545,37 +7827,37 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11535:57:2", + "src": "11885:57:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1884, + "id": 2907, "nodeType": "ExpressionStatement", - "src": "11535:57:2" + "src": "11885:57:5" }, { "body": { - "id": 2008, + "id": 3047, "nodeType": "Block", - "src": "11653:1798:2", + "src": "12003:1933:5", "statements": [ { "assignments": [ - 1897, - 1899, - 1901, - 1903 + 2920, + 2922, + 2924, + 2926 ], "declarations": [ { "constant": false, - "id": 1897, + "id": 2920, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11744:13:2", + "scope": 3050, + "src": "12094:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7583,10 +7865,10 @@ "typeString": "address" }, "typeName": { - "id": 1896, + "id": 2919, "name": "address", "nodeType": "ElementaryTypeName", - "src": "11744:7:2", + "src": "12094:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7597,11 +7879,11 @@ }, { "constant": false, - "id": 1899, + "id": 2922, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11775:14:2", + "scope": 3050, + "src": "12125:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7609,10 +7891,10 @@ "typeString": "address" }, "typeName": { - "id": 1898, + "id": 2921, "name": "address", "nodeType": "ElementaryTypeName", - "src": "11775:7:2", + "src": "12125:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7623,11 +7905,11 @@ }, { "constant": false, - "id": 1901, + "id": 2924, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11807:12:2", + "scope": 3050, + "src": "12157:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7635,10 +7917,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1900, + "id": 2923, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "11807:5:2", + "src": "12157:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -7649,11 +7931,11 @@ }, { "constant": false, - "id": 1903, + "id": 2926, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11837:20:2", + "scope": 3050, + "src": "12187:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7661,10 +7943,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1902, + "id": 2925, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "11837:7:2", + "src": "12187:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7674,7 +7956,7 @@ "visibility": "internal" } ], - "id": 1909, + "id": 2932, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7682,26 +7964,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1905, + "id": 2928, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11890:12:2", + "referencedDeclaration": 2895, + "src": "12240:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1907, + "id": 2930, "indexExpression": { "argumentTypes": null, - "id": 1906, + "id": 2929, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11903:1:2", + "referencedDeclaration": 2909, + "src": "12253:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7712,7 +7994,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11890:15:2", + "src": "12240:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7726,18 +8008,18 @@ "typeString": "bytes32" } ], - "id": 1904, + "id": 2927, "name": "_getTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2042, - "src": "11874:15:2", + "referencedDeclaration": 3081, + "src": "12224:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "function (bytes32) view returns (address,address,uint8,uint256)" } }, - "id": 1908, + "id": 2931, "isConstant": false, "isLValue": false, "isPure": false, @@ -7745,27 +8027,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11874:32:2", + "src": "12224:32:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "11726:180:2" + "src": "12076:180:5" }, { "assignments": [ - 1911 + 2934 ], "declarations": [ { "constant": false, - "id": 1911, + "id": 2934, "name": "rewardAmount", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "12194:20:2", + "scope": 3050, + "src": "12544:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7773,10 +8055,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1910, + "id": 2933, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "12194:7:2", + "src": "12544:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7786,7 +8068,7 @@ "visibility": "internal" } ], - "id": 1921, + "id": 2944, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7794,26 +8076,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1913, + "id": 2936, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "12253:12:2", + "referencedDeclaration": 2895, + "src": "12603:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1915, + "id": 2938, "indexExpression": { "argumentTypes": null, - "id": 1914, + "id": 2937, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "12266:1:2", + "referencedDeclaration": 2909, + "src": "12616:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7824,7 +8106,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12253:15:2", + "src": "12603:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -7832,12 +8114,12 @@ }, { "argumentTypes": null, - "id": 1916, + "id": 2939, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12286:5:2", + "referencedDeclaration": 2920, + "src": "12636:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7845,12 +8127,12 @@ }, { "argumentTypes": null, - "id": 1917, + "id": 2940, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12309:6:2", + "referencedDeclaration": 2922, + "src": "12659:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7858,12 +8140,12 @@ }, { "argumentTypes": null, - "id": 1918, + "id": 2941, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1901, - "src": "12333:6:2", + "referencedDeclaration": 2924, + "src": "12683:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -7871,12 +8153,12 @@ }, { "argumentTypes": null, - "id": 1919, + "id": 2942, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1903, - "src": "12357:12:2", + "referencedDeclaration": 2926, + "src": "12707:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7906,18 +8188,18 @@ "typeString": "uint256" } ], - "id": 1912, + "id": 2935, "name": "_getTokensToReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2171, - "src": "12217:18:2", + "referencedDeclaration": 3210, + "src": "12567:18:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (uint256)" } }, - "id": 1920, + "id": 2943, "isConstant": false, "isLValue": false, "isPure": false, @@ -7925,27 +8207,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12217:166:2", + "src": "12567:166:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12194:189:2" + "src": "12544:189:5" }, { "assignments": [ - 1923 + 2946 ], "declarations": [ { "constant": false, - "id": 1923, + "id": 2946, "name": "contractBalance", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "12398:23:2", + "scope": 3050, + "src": "12748:23:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7953,10 +8235,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1922, + "id": 2945, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "12398:7:2", + "src": "12748:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7966,20 +8248,20 @@ "visibility": "internal" } ], - "id": 1928, + "id": 2951, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1926, + "id": 2949, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2552, - "src": "12442:4:2", + "referencedDeclaration": 5340, + "src": "12792:4:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } } @@ -7987,38 +8269,38 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } ], "expression": { "argumentTypes": null, - "id": 1924, + "id": 2947, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "12424:7:2", + "referencedDeclaration": 2376, + "src": "12774:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1925, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 2235, - "src": "12424:17:2", + "referencedDeclaration": 4403, + "src": "12774:17:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 1927, + "id": 2950, "isConstant": false, "isLValue": false, "isPure": false, @@ -8026,14 +8308,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12424:23:2", + "src": "12774:23:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12398:49:2" + "src": "12748:49:5" }, { "condition": { @@ -8042,19 +8324,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1931, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1929, + "id": 2952, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12466:12:2", + "referencedDeclaration": 2934, + "src": "12816:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8064,48 +8346,48 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1930, + "id": 2953, "name": "contractBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1923, - "src": "12481:15:2", + "referencedDeclaration": 2946, + "src": "12831:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12466:30:2", + "src": "12816:30:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1937, + "id": 2960, "nodeType": "IfStatement", - "src": "12462:99:2", + "src": "12812:99:5", "trueBody": { - "id": 1936, + "id": 2959, "nodeType": "Block", - "src": "12498:63:2", + "src": "12848:63:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1934, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1932, + "id": 2955, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12516:12:2", + "referencedDeclaration": 2934, + "src": "12866:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8115,26 +8397,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1933, + "id": 2956, "name": "contractBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1923, - "src": "12531:15:2", + "referencedDeclaration": 2946, + "src": "12881:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12516:30:2", + "src": "12866:30:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1935, + "id": 2958, "nodeType": "ExpressionStatement", - "src": "12516:30:2" + "src": "12866:30:5" } ] } @@ -8146,19 +8428,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1940, + "id": 2963, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1938, + "id": 2961, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12579:12:2", + "referencedDeclaration": 2934, + "src": "12929:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8169,14 +8451,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1939, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12595:1:2", + "src": "12945:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -8184,20 +8466,20 @@ }, "value": "0" }, - "src": "12579:17:2", + "src": "12929:17:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1951, + "id": 2974, "nodeType": "IfStatement", - "src": "12575:136:2", + "src": "12925:136:5", "trueBody": { - "id": 1950, + "id": 2973, "nodeType": "Block", - "src": "12598:113:2", + "src": "12948:113:5", "statements": [ { "eventCall": { @@ -8207,26 +8489,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1942, + "id": 2965, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "12639:12:2", + "referencedDeclaration": 2895, + "src": "12989:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1944, + "id": 2967, "indexExpression": { "argumentTypes": null, - "id": 1943, + "id": 2966, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "12652:1:2", + "referencedDeclaration": 2909, + "src": "13002:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8237,7 +8519,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12639:15:2", + "src": "12989:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8245,12 +8527,12 @@ }, { "argumentTypes": null, - "id": 1945, + "id": 2968, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12656:6:2", + "referencedDeclaration": 2922, + "src": "13006:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8258,12 +8540,12 @@ }, { "argumentTypes": null, - "id": 1946, + "id": 2969, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12664:5:2", + "referencedDeclaration": 2920, + "src": "13014:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8285,18 +8567,18 @@ "typeString": "address" } ], - "id": 1941, + "id": 2964, "name": "UnsuccessfulClaim", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1386, - "src": "12621:17:2", + "referencedDeclaration": 2398, + "src": "12971:17:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_address_$returns$__$", "typeString": "function (bytes32,address,address)" } }, - "id": 1947, + "id": 2970, "isConstant": false, "isLValue": false, "isPure": false, @@ -8304,73 +8586,62 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12621:49:2", + "src": "12971:49:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1948, + "id": 2971, "nodeType": "EmitStatement", - "src": "12616:54:2" + "src": "12966:54:5" }, { - "id": 1949, + "id": 2972, "nodeType": "Continue", - "src": "12688:8:2" + "src": "13038:8:5" } ] } }, { - "expression": { + "condition": { "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 1956, - "name": "buyer", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12783:5:2", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { + "id": 2980, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "nodeType": "UnaryOperation", + "operator": "!", + "prefix": true, + "src": "13109:34:5", + "subExpression": { + "argumentTypes": null, + "baseExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1952, - "name": "sellerVsBuyers", + "id": 2975, + "name": "sellerVsBuyersBool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "12755:14:2", + "referencedDeclaration": 2362, + "src": "13110:18:5", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", - "typeString": "mapping(address => address[] storage ref)" + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" } }, - "id": 1954, + "id": 2977, "indexExpression": { "argumentTypes": null, - "id": 1953, + "id": 2976, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12770:6:2", + "referencedDeclaration": 2922, + "src": "13129:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8381,78 +8652,290 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12755:22:2", + "src": "13110:26:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + } + }, + "id": 2979, + "indexExpression": { + "argumentTypes": null, + "id": 2978, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13137:5:5", "typeDescriptions": { - "typeIdentifier": "t_array$_t_address_$dyn_storage", - "typeString": "address[] storage ref" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 1955, "isConstant": false, - "isLValue": false, + "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "push", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "12755:27:2", + "nodeType": "IndexAccess", + "src": "13110:33:5", "typeDescriptions": { - "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) returns (uint256)" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 1957, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12755:34:2", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 1958, - "nodeType": "ExpressionStatement", - "src": "12755:34:2" - }, - { - "expression": { - "argumentTypes": null, - "id": 1972, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "baseExpression": { - "argumentTypes": null, - "baseExpression": { + "falseBody": null, + "id": 2997, + "nodeType": "IfStatement", + "src": "13105:170:5", + "trueBody": { + "id": 2996, + "nodeType": "Block", + "src": "13145:130:5", + "statements": [ + { + "expression": { "argumentTypes": null, - "id": 1959, + "id": 2987, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2981, + "name": "sellerVsBuyersBool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2362, + "src": "13163:18:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + } + }, + "id": 2984, + "indexExpression": { + "argumentTypes": null, + "id": 2982, + "name": "seller", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2922, + "src": "13182:6:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "13163:26:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + } + }, + "id": 2985, + "indexExpression": { + "argumentTypes": null, + "id": 2983, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13190:5:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, + "nodeType": "IndexAccess", + "src": "13163:33:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "hexValue": "74727565", + "id": 2986, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "bool", + "lValueRequested": false, + "nodeType": "Literal", + "src": "13199:4:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + "value": "true" + }, + "src": "13163:40:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "id": 2988, + "nodeType": "ExpressionStatement", + "src": "13163:40:5" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2993, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13254:5:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2989, + "name": "sellerVsBuyersArray", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2356, + "src": "13221:19:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", + "typeString": "mapping(address => address[] storage ref)" + } + }, + "id": 2991, + "indexExpression": { + "argumentTypes": null, + "id": 2990, + "name": "seller", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2922, + "src": "13241:6:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "13221:27:5", + "typeDescriptions": { + "typeIdentifier": "t_array$_t_address_$dyn_storage", + "typeString": "address[] storage ref" + } + }, + "id": 2992, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "push", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "13221:32:5", + "typeDescriptions": { + "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$", + "typeString": "function (address) returns (uint256)" + } + }, + "id": 2994, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13221:39:5", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2995, + "nodeType": "ExpressionStatement", + "src": "13221:39:5" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "id": 3011, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2998, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "12804:20:2", + "referencedDeclaration": 2368, + "src": "13289:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1962, + "id": 3001, "indexExpression": { "argumentTypes": null, - "id": 1960, + "id": 2999, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12825:6:2", + "referencedDeclaration": 2922, + "src": "13310:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8463,21 +8946,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12804:28:2", + "src": "13289:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1963, + "id": 3002, "indexExpression": { "argumentTypes": null, - "id": 1961, + "id": 3000, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12833:5:2", + "referencedDeclaration": 2920, + "src": "13318:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8488,7 +8971,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "12804:35:2", + "src": "13289:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8501,12 +8984,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1970, + "id": 3009, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12942:12:2", + "referencedDeclaration": 2934, + "src": "13427:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8526,26 +9009,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1964, + "id": 3003, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "12842:20:2", + "referencedDeclaration": 2368, + "src": "13327:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1966, + "id": 3005, "indexExpression": { "argumentTypes": null, - "id": 1965, + "id": 3004, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12880:6:2", + "referencedDeclaration": 2922, + "src": "13365:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8556,21 +9039,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12842:58:2", + "src": "13327:58:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1968, + "id": 3007, "indexExpression": { "argumentTypes": null, - "id": 1967, + "id": 3006, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12918:5:2", + "referencedDeclaration": 2920, + "src": "13403:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8581,27 +9064,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12842:95:2", + "src": "13327:95:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1969, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "12842:99:2", + "referencedDeclaration": 4601, + "src": "13327:99:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1971, + "id": 3010, "isConstant": false, "isLValue": false, "isPure": false, @@ -8609,26 +9092,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12842:113:2", + "src": "13327:113:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12804:151:2", + "src": "13289:151:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1973, + "id": 3012, "nodeType": "ExpressionStatement", - "src": "12804:151:2" + "src": "13289:151:5" }, { "expression": { "argumentTypes": null, - "id": 1983, + "id": 3022, "isConstant": false, "isLValue": false, "isPure": false, @@ -8637,26 +9120,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1974, + "id": 3013, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "12970:26:2", + "referencedDeclaration": 2372, + "src": "13455:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1976, + "id": 3015, "indexExpression": { "argumentTypes": null, - "id": 1975, + "id": 3014, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12997:6:2", + "referencedDeclaration": 2922, + "src": "13482:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8667,7 +9150,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "12970:34:2", + "src": "13455:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8680,12 +9163,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1981, + "id": 3020, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13076:12:2", + "referencedDeclaration": 2934, + "src": "13561:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8703,26 +9186,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1977, + "id": 3016, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "13007:26:2", + "referencedDeclaration": 2372, + "src": "13492:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1979, + "id": 3018, "indexExpression": { "argumentTypes": null, - "id": 1978, + "id": 3017, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "13051:6:2", + "referencedDeclaration": 2922, + "src": "13536:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8733,27 +9216,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13007:64:2", + "src": "13492:64:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1980, + "id": 3019, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "13007:68:2", + "referencedDeclaration": 4601, + "src": "13492:68:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1982, + "id": 3021, "isConstant": false, "isLValue": false, "isPure": false, @@ -8761,38 +9244,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13007:82:2", + "src": "13492:82:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12970:119:2", + "src": "13455:119:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1984, + "id": 3023, "nodeType": "ExpressionStatement", - "src": "12970:119:2" + "src": "13455:119:5" }, { "expression": { "argumentTypes": null, - "id": 1990, + "id": 3029, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1985, + "id": 3024, "name": "totalTokensDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1343, - "src": "13104:22:2", + "referencedDeclaration": 2349, + "src": "13589:22:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8805,12 +9288,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1988, + "id": 3027, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13156:12:2", + "referencedDeclaration": 2934, + "src": "13641:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8826,32 +9309,32 @@ ], "expression": { "argumentTypes": null, - "id": 1986, + "id": 3025, "name": "totalTokensDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1343, - "src": "13129:22:2", + "referencedDeclaration": 2349, + "src": "13614:22:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1987, + "id": 3026, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "13129:26:2", + "referencedDeclaration": 4601, + "src": "13614:26:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1989, + "id": 3028, "isConstant": false, "isLValue": false, "isPure": false, @@ -8859,21 +9342,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13129:40:2", + "src": "13614:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13104:65:2", + "src": "13589:65:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1991, + "id": 3030, "nodeType": "ExpressionStatement", - "src": "13104:65:2" + "src": "13589:65:5" }, { "eventCall": { @@ -8883,26 +9366,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1993, + "id": 3032, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "13250:12:2", + "referencedDeclaration": 2895, + "src": "13735:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1995, + "id": 3034, "indexExpression": { "argumentTypes": null, - "id": 1994, + "id": 3033, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "13263:1:2", + "referencedDeclaration": 2909, + "src": "13748:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8913,7 +9396,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13250:15:2", + "src": "13735:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -8921,12 +9404,12 @@ }, { "argumentTypes": null, - "id": 1996, + "id": 3035, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "13283:6:2", + "referencedDeclaration": 2922, + "src": "13768:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8934,12 +9417,12 @@ }, { "argumentTypes": null, - "id": 1997, + "id": 3036, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "13307:5:2", + "referencedDeclaration": 2920, + "src": "13792:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8947,12 +9430,12 @@ }, { "argumentTypes": null, - "id": 1998, + "id": 3037, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13330:12:2", + "referencedDeclaration": 2934, + "src": "13815:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8978,18 +9461,18 @@ "typeString": "uint256" } ], - "id": 1992, + "id": 3031, "name": "SuccessfulClaim", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1378, - "src": "13217:15:2", + "referencedDeclaration": 2390, + "src": "13702:15:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,address,uint256)" } }, - "id": 1999, + "id": 3038, "isConstant": false, "isLValue": false, "isPure": false, @@ -8997,15 +9480,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13217:139:2", + "src": "13702:139:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2000, + "id": 3039, "nodeType": "EmitStatement", - "src": "13212:144:2" + "src": "13697:144:5" }, { "expression": { @@ -9013,12 +9496,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2004, + "id": 3043, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "13420:5:2", + "referencedDeclaration": 2920, + "src": "13905:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9026,12 +9509,12 @@ }, { "argumentTypes": null, - "id": 2005, + "id": 3044, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13427:12:2", + "referencedDeclaration": 2934, + "src": "13912:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9051,32 +9534,32 @@ ], "expression": { "argumentTypes": null, - "id": 2001, + "id": 3040, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "13403:7:2", + "referencedDeclaration": 2376, + "src": "13888:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 2003, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "13403:16:2", + "referencedDeclaration": 4412, + "src": "13888:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2006, + "id": 3045, "isConstant": false, "isLValue": false, "isPure": false, @@ -9084,15 +9567,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13403:37:2", + "src": "13888:37:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2007, + "id": 3046, "nodeType": "ExpressionStatement", - "src": "13403:37:2" + "src": "13888:37:5" } ] }, @@ -9102,19 +9585,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1892, + "id": 2915, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1889, + "id": 2912, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11623:1:2", + "referencedDeclaration": 2909, + "src": "11973:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9126,18 +9609,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1890, + "id": 2913, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11627:12:2", + "referencedDeclaration": 2895, + "src": "11977:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1891, + "id": 2914, "isConstant": false, "isLValue": false, "isPure": false, @@ -9145,31 +9628,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11627:19:2", + "src": "11977:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11623:23:2", + "src": "11973:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2009, + "id": 3048, "initializationExpression": { "assignments": [ - 1886 + 2909 ], "declarations": [ { "constant": false, - "id": 1886, + "id": 2909, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11608:9:2", + "scope": 3050, + "src": "11958:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9177,10 +9660,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1885, + "id": 2908, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "11608:7:2", + "src": "11958:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9190,18 +9673,18 @@ "visibility": "internal" } ], - "id": 1888, + "id": 2911, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1887, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11620:1:2", + "src": "11970:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -9210,12 +9693,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "11608:13:2" + "src": "11958:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1894, + "id": 2917, "isConstant": false, "isLValue": false, "isPure": false, @@ -9223,15 +9706,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "11648:3:2", + "src": "11998:3:5", "subExpression": { "argumentTypes": null, - "id": 1893, + "id": 2916, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11648:1:2", + "referencedDeclaration": 2909, + "src": "11998:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9242,54 +9725,54 @@ "typeString": "uint256" } }, - "id": 1895, + "id": 2918, "nodeType": "ExpressionStatement", - "src": "11648:3:2" + "src": "11998:3:5" }, "nodeType": "ForStatement", - "src": "11603:1848:2" + "src": "11953:1983:5" } ] }, "documentation": "@dev Function to claim tokens\n@param scriptHashes Array of scriptHashes of OB trades for which\nthe buyer wants to claim reward tokens.\nNote that a Buyer can perform trades with multiple promoted sellers and\nthen can claim their reward tokens all at once for all those trades using\nthis function.\nBe mindful of the block gas limit (do not pass too many scripthashes).", - "id": 2011, + "id": 3050, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1875, + "id": 2898, "modifierName": { "argumentTypes": null, - "id": 1874, + "id": 2897, "name": "rewardsRunning", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1432, - "src": "11509:14:2", + "referencedDeclaration": 2444, + "src": "11859:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "11509:14:2" + "src": "11859:14:5" } ], "name": "claimRewards", "nodeType": "FunctionDefinition", "parameters": { - "id": 1873, + "id": 2896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1872, + "id": 2895, "name": "scriptHashes", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11478:22:2", + "scope": 3050, + "src": "11828:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9298,19 +9781,19 @@ }, "typeName": { "baseType": { - "id": 1870, + "id": 2893, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11478:7:2", + "src": "11828:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1871, + "id": 2894, "length": null, "nodeType": "ArrayTypeName", - "src": "11478:9:2", + "src": "11828:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -9320,31 +9803,31 @@ "visibility": "internal" } ], - "src": "11477:24:2" + "src": "11827:24:5" }, "payable": false, "returnParameters": { - "id": 1876, + "id": 2899, "nodeType": "ParameterList", "parameters": [], - "src": "11524:0:2" + "src": "11874:0:5" }, - "scope": 2226, - "src": "11456:2002:2", + "scope": 3265, + "src": "11806:2137:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2041, + "id": 3080, "nodeType": "Block", - "src": "13776:296:2", + "src": "14261:296:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2033, + "id": 3072, "isConstant": false, "isLValue": false, "isPure": false, @@ -9355,12 +9838,12 @@ null, { "argumentTypes": null, - "id": 2024, + "id": 3063, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2022, - "src": "13868:12:2", + "referencedDeclaration": 3061, + "src": "14353:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9368,12 +9851,12 @@ }, { "argumentTypes": null, - "id": 2025, + "id": 3064, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2020, - "src": "13894:6:2", + "referencedDeclaration": 3059, + "src": "14379:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -9384,12 +9867,12 @@ null, { "argumentTypes": null, - "id": 2026, + "id": 3065, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2016, - "src": "13930:5:2", + "referencedDeclaration": 3055, + "src": "14415:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9397,12 +9880,12 @@ }, { "argumentTypes": null, - "id": 2027, + "id": 3066, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2018, - "src": "13949:6:2", + "referencedDeclaration": 3057, + "src": "14434:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9410,14 +9893,14 @@ }, null ], - "id": 2028, + "id": 3067, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "13840:127:2", + "src": "14325:127:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$_t_uint256_$_t_uint8_$__$__$__$_t_address_$_t_address_$__$", "typeString": "tuple(,uint256,uint8,,,,address,address,)" @@ -9430,12 +9913,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2031, + "id": 3070, "name": "_scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2013, - "src": "13998:11:2", + "referencedDeclaration": 3052, + "src": "14483:11:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9451,32 +9934,32 @@ ], "expression": { "argumentTypes": null, - "id": 2029, + "id": 3068, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "13970:14:2", + "referencedDeclaration": 2374, + "src": "14455:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2030, + "id": 3069, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transactions", "nodeType": "MemberAccess", - "referencedDeclaration": 1233, - "src": "13970:27:2", + "referencedDeclaration": 1291, + "src": "14455:27:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint8_$_t_uint8_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint8,uint8,uint8,uint32,address,address,address)" } }, - "id": 2032, + "id": 3071, "isConstant": false, "isLValue": false, "isPure": false, @@ -9484,21 +9967,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13970:40:2", + "src": "14455:40:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint8_$_t_uint8_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$", "typeString": "tuple(uint256,uint256,uint8,uint8,uint8,uint32,address,address,address)" } }, - "src": "13840:170:2", + "src": "14325:170:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2034, + "id": 3073, "nodeType": "ExpressionStatement", - "src": "13840:170:2" + "src": "14325:170:5" }, { "expression": { @@ -9506,12 +9989,12 @@ "components": [ { "argumentTypes": null, - "id": 2035, + "id": 3074, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2016, - "src": "14029:5:2", + "referencedDeclaration": 3055, + "src": "14514:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9519,12 +10002,12 @@ }, { "argumentTypes": null, - "id": 2036, + "id": 3075, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2018, - "src": "14036:6:2", + "referencedDeclaration": 3057, + "src": "14521:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9532,12 +10015,12 @@ }, { "argumentTypes": null, - "id": 2037, + "id": 3076, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2020, - "src": "14044:6:2", + "referencedDeclaration": 3059, + "src": "14529:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -9545,40 +10028,40 @@ }, { "argumentTypes": null, - "id": 2038, + "id": 3077, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2022, - "src": "14052:12:2", + "referencedDeclaration": 3061, + "src": "14537:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 2039, + "id": 3078, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "14028:37:2", + "src": "14513:37:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, - "functionReturnParameters": 2023, - "id": 2040, + "functionReturnParameters": 3062, + "id": 3079, "nodeType": "Return", - "src": "14021:44:2" + "src": "14506:44:5" } ] }, "documentation": null, - "id": 2042, + "id": 3081, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -9586,16 +10069,16 @@ "name": "_getTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 2014, + "id": 3053, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2013, + "id": 3052, "name": "_scriptHash", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13572:19:2", + "scope": 3081, + "src": "14057:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9603,10 +10086,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2012, + "id": 3051, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13572:7:2", + "src": "14057:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -9616,20 +10099,20 @@ "visibility": "internal" } ], - "src": "13562:35:2" + "src": "14047:35:5" }, "payable": false, "returnParameters": { - "id": 2023, + "id": 3062, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2016, + "id": 3055, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13656:13:2", + "scope": 3081, + "src": "14141:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9637,10 +10120,10 @@ "typeString": "address" }, "typeName": { - "id": 2015, + "id": 3054, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13656:7:2", + "src": "14141:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9651,11 +10134,11 @@ }, { "constant": false, - "id": 2018, + "id": 3057, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13683:14:2", + "scope": 3081, + "src": "14168:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9663,10 +10146,10 @@ "typeString": "address" }, "typeName": { - "id": 2017, + "id": 3056, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13683:7:2", + "src": "14168:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9677,11 +10160,11 @@ }, { "constant": false, - "id": 2020, + "id": 3059, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13711:12:2", + "scope": 3081, + "src": "14196:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9689,10 +10172,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2019, + "id": 3058, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "13711:5:2", + "src": "14196:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -9703,11 +10186,11 @@ }, { "constant": false, - "id": 2022, + "id": 3061, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13737:20:2", + "scope": 3081, + "src": "14222:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9715,10 +10198,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2021, + "id": 3060, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "13737:7:2", + "src": "14222:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9728,36 +10211,36 @@ "visibility": "internal" } ], - "src": "13642:125:2" + "src": "14127:125:5" }, - "scope": 2226, - "src": "13538:534:2", + "scope": 3265, + "src": "14023:534:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2130, + "id": 3169, "nodeType": "Block", - "src": "14924:1247:2", + "src": "15409:1247:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2059, + "id": 3098, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2057, + "id": 3096, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "14935:8:2", + "referencedDeclaration": 3094, + "src": "15420:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9768,14 +10251,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2058, + "id": 3097, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "14946:4:2", + "src": "15431:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -9783,15 +10266,15 @@ }, "value": "true" }, - "src": "14935:15:2", + "src": "15420:15:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2060, + "id": 3099, "nodeType": "ExpressionStatement", - "src": "14935:15:2" + "src": "15420:15:5" }, { "condition": { @@ -9800,19 +10283,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2065, + "id": 3104, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2061, + "id": 3100, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2046, - "src": "14965:5:2", + "referencedDeclaration": 3085, + "src": "15450:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9826,14 +10309,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2063, + "id": 3102, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14982:1:2", + "src": "15467:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -9849,20 +10332,20 @@ "typeString": "int_const 0" } ], - "id": 2062, + "id": 3101, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "14974:7:2", + "src": "15459:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2064, + "id": 3103, "isConstant": false, "isLValue": false, "isPure": true, @@ -9870,13 +10353,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14974:10:2", + "src": "15459:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "14965:19:2", + "src": "15450:19:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9885,7 +10368,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2074, + "id": 3113, "isConstant": false, "isLValue": false, "isPure": false, @@ -9893,31 +10376,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15149:24:2", + "src": "15634:24:5", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2071, + "id": 3110, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "15150:15:2", + "referencedDeclaration": 2343, + "src": "15635:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2073, + "id": 3112, "indexExpression": { "argumentTypes": null, - "id": 2072, + "id": 3111, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15166:6:2", + "referencedDeclaration": 3087, + "src": "15651:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9928,7 +10411,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15150:23:2", + "src": "15635:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9946,19 +10429,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 2082, + "id": 3121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2080, + "id": 3119, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2050, - "src": "15299:6:2", + "referencedDeclaration": 3089, + "src": "15784:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -9969,14 +10452,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2081, + "id": 3120, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15309:1:2", + "src": "15794:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -9984,7 +10467,7 @@ }, "value": "1" }, - "src": "15299:11:2", + "src": "15784:11:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9993,7 +10476,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2093, + "id": 3132, "isConstant": false, "isLValue": false, "isPure": false, @@ -10001,18 +10484,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15489:45:2", + "src": "15974:45:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2090, + "id": 3129, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2044, - "src": "15515:10:2", + "referencedDeclaration": 3083, + "src": "16000:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10020,12 +10503,12 @@ }, { "argumentTypes": null, - "id": 2091, + "id": 3130, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15527:6:2", + "referencedDeclaration": 3087, + "src": "16012:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10045,32 +10528,32 @@ ], "expression": { "argumentTypes": null, - "id": 2088, + "id": 3127, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "15490:14:2", + "referencedDeclaration": 2374, + "src": "15975:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2089, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "checkVote", "nodeType": "MemberAccess", - "referencedDeclaration": 1321, - "src": "15490:24:2", + "referencedDeclaration": 1379, + "src": "15975:24:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_bool_$", "typeString": "function (bytes32,address) view external returns (bool)" } }, - "id": 2092, + "id": 3131, "isConstant": false, "isLValue": false, "isPure": false, @@ -10078,7 +10561,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15490:44:2", + "src": "15975:44:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10092,7 +10575,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2104, + "id": 3143, "isConstant": false, "isLValue": false, "isPure": false, @@ -10100,18 +10583,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15730:52:2", + "src": "16215:52:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2101, + "id": 3140, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2044, - "src": "15763:10:2", + "referencedDeclaration": 3083, + "src": "16248:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10119,12 +10602,12 @@ }, { "argumentTypes": null, - "id": 2102, + "id": 3141, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15775:6:2", + "referencedDeclaration": 3087, + "src": "16260:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10144,32 +10627,32 @@ ], "expression": { "argumentTypes": null, - "id": 2099, + "id": 3138, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "15731:14:2", + "referencedDeclaration": 2374, + "src": "16216:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2100, + "id": 3139, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "checkBeneficiary", "nodeType": "MemberAccess", - "referencedDeclaration": 1312, - "src": "15731:31:2", + "referencedDeclaration": 1370, + "src": "16216:31:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_bool_$", "typeString": "function (bytes32,address) view external returns (bool)" } }, - "id": 2103, + "id": 3142, "isConstant": false, "isLValue": false, "isPure": false, @@ -10177,7 +10660,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15731:51:2", + "src": "16216:51:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10195,7 +10678,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2116, + "id": 3155, "isConstant": false, "isLValue": false, "isPure": false, @@ -10205,12 +10688,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2112, + "id": 3151, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "16024:10:2", + "referencedDeclaration": 2351, + "src": "16509:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10226,32 +10709,32 @@ ], "expression": { "argumentTypes": null, - "id": 2110, + "id": 3149, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2052, - "src": "16007:12:2", + "referencedDeclaration": 3091, + "src": "16492:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2111, + "id": 3150, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "16007:16:2", + "referencedDeclaration": 4601, + "src": "16492:16:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2113, + "id": 3152, "isConstant": false, "isLValue": false, "isPure": false, @@ -10259,7 +10742,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16007:28:2", + "src": "16492:28:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10271,18 +10754,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2114, + "id": 3153, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "16038:5:2", + "referencedDeclaration": 5299, + "src": "16523:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 2115, + "id": 3154, "isConstant": false, "isLValue": false, "isPure": false, @@ -10290,43 +10773,43 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "16038:15:2", + "src": "16523:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16007:46:2", + "src": "16492:46:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2122, + "id": 3161, "nodeType": "IfStatement", - "src": "16003:136:2", + "src": "16488:136:5", "trueBody": { - "id": 2121, + "id": 3160, "nodeType": "Block", - "src": "16055:84:2", + "src": "16540:84:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2119, + "id": 3158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2117, + "id": 3156, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "16112:8:2", + "referencedDeclaration": 3094, + "src": "16597:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10337,14 +10820,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2118, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16123:5:2", + "src": "16608:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10352,43 +10835,43 @@ }, "value": "false" }, - "src": "16112:16:2", + "src": "16597:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2120, + "id": 3159, "nodeType": "ExpressionStatement", - "src": "16112:16:2" + "src": "16597:16:5" } ] } }, - "id": 2123, + "id": 3162, "nodeType": "IfStatement", - "src": "15656:483:2", + "src": "16141:483:5", "trueBody": { - "id": 2109, + "id": 3148, "nodeType": "Block", - "src": "15793:196:2", + "src": "16278:196:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2107, + "id": 3146, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2105, + "id": 3144, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15962:8:2", + "referencedDeclaration": 3094, + "src": "16447:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10399,14 +10882,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2106, + "id": 3145, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15973:5:2", + "src": "16458:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10414,43 +10897,43 @@ }, "value": "false" }, - "src": "15962:16:2", + "src": "16447:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2108, + "id": 3147, "nodeType": "ExpressionStatement", - "src": "15962:16:2" + "src": "16447:16:5" } ] } }, - "id": 2124, + "id": 3163, "nodeType": "IfStatement", - "src": "15415:724:2", + "src": "15900:724:5", "trueBody": { - "id": 2098, + "id": 3137, "nodeType": "Block", - "src": "15553:89:2", + "src": "16038:89:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2096, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2094, + "id": 3133, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15615:8:2", + "referencedDeclaration": 3094, + "src": "16100:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10461,14 +10944,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2095, + "id": 3134, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15626:5:2", + "src": "16111:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10476,43 +10959,43 @@ }, "value": "false" }, - "src": "15615:16:2", + "src": "16100:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2097, + "id": 3136, "nodeType": "ExpressionStatement", - "src": "15615:16:2" + "src": "16100:16:5" } ] } }, - "id": 2125, + "id": 3164, "nodeType": "IfStatement", - "src": "15295:844:2", + "src": "15780:844:5", "trueBody": { - "id": 2087, + "id": 3126, "nodeType": "Block", - "src": "15312:89:2", + "src": "15797:89:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2085, + "id": 3124, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2083, + "id": 3122, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15374:8:2", + "referencedDeclaration": 3094, + "src": "15859:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10523,14 +11006,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2084, + "id": 3123, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15385:5:2", + "src": "15870:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10538,43 +11021,43 @@ }, "value": "false" }, - "src": "15374:16:2", + "src": "15859:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2086, + "id": 3125, "nodeType": "ExpressionStatement", - "src": "15374:16:2" + "src": "15859:16:5" } ] } }, - "id": 2126, + "id": 3165, "nodeType": "IfStatement", - "src": "15145:994:2", + "src": "15630:994:5", "trueBody": { - "id": 2079, + "id": 3118, "nodeType": "Block", - "src": "15175:106:2", + "src": "15660:106:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2077, + "id": 3116, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2075, + "id": 3114, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15254:8:2", + "referencedDeclaration": 3094, + "src": "15739:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10585,14 +11068,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2076, + "id": 3115, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15265:5:2", + "src": "15750:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10600,43 +11083,43 @@ }, "value": "false" }, - "src": "15254:16:2", + "src": "15739:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2078, + "id": 3117, "nodeType": "ExpressionStatement", - "src": "15254:16:2" + "src": "15739:16:5" } ] } }, - "id": 2127, + "id": 3166, "nodeType": "IfStatement", - "src": "14961:1178:2", + "src": "15446:1178:5", "trueBody": { - "id": 2070, + "id": 3109, "nodeType": "Block", - "src": "14986:144:2", + "src": "15471:144:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2068, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2066, + "id": 3105, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15103:8:2", + "referencedDeclaration": 3094, + "src": "15588:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10647,14 +11130,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2067, + "id": 3106, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15114:5:2", + "src": "15599:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -10662,15 +11145,15 @@ }, "value": "false" }, - "src": "15103:16:2", + "src": "15588:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2069, + "id": 3108, "nodeType": "ExpressionStatement", - "src": "15103:16:2" + "src": "15588:16:5" } ] } @@ -10678,26 +11161,26 @@ { "expression": { "argumentTypes": null, - "id": 2128, + "id": 3167, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "16156:8:2", + "referencedDeclaration": 3094, + "src": "16641:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2056, - "id": 2129, + "functionReturnParameters": 3095, + "id": 3168, "nodeType": "Return", - "src": "16149:15:2" + "src": "16634:15:5" } ] }, "documentation": "@dev Checks -:\n1. If transaction exists\n2. If seller is promoted\n3. Transaction has been closed/released\n4. Transaction happened with the time window.\n5. Seller must be one of the beneficiaries of the transaction execution\n@param scriptHash Script hash of the transaction\n@param buyer Buyer in the transaction\n@param seller Seller in the transaction\n@param status Status of the transaction\n@param lastModified Last modified time of the transaction\n@return bool Returns whether transaction is valid and eligible\nfor rewards", - "id": 2131, + "id": 3170, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -10705,16 +11188,16 @@ "name": "_verifyTransactionData", "nodeType": "FunctionDefinition", "parameters": { - "id": 2053, + "id": 3092, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2044, + "id": 3083, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14735:18:2", + "scope": 3170, + "src": "15220:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10722,10 +11205,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2043, + "id": 3082, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14735:7:2", + "src": "15220:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10736,11 +11219,11 @@ }, { "constant": false, - "id": 2046, + "id": 3085, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14763:13:2", + "scope": 3170, + "src": "15248:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10748,10 +11231,10 @@ "typeString": "address" }, "typeName": { - "id": 2045, + "id": 3084, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14763:7:2", + "src": "15248:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10762,11 +11245,11 @@ }, { "constant": false, - "id": 2048, + "id": 3087, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14786:14:2", + "scope": 3170, + "src": "15271:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10774,10 +11257,10 @@ "typeString": "address" }, "typeName": { - "id": 2047, + "id": 3086, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14786:7:2", + "src": "15271:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10788,11 +11271,11 @@ }, { "constant": false, - "id": 2050, + "id": 3089, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14810:12:2", + "scope": 3170, + "src": "15295:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10800,10 +11283,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2049, + "id": 3088, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "14810:5:2", + "src": "15295:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -10814,11 +11297,11 @@ }, { "constant": false, - "id": 2052, + "id": 3091, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14832:20:2", + "scope": 3170, + "src": "15317:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10826,10 +11309,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2051, + "id": 3090, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14832:7:2", + "src": "15317:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10839,20 +11322,20 @@ "visibility": "internal" } ], - "src": "14725:133:2" + "src": "15210:133:5" }, "payable": false, "returnParameters": { - "id": 2056, + "id": 3095, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2055, + "id": 3094, "name": "verified", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14905:13:2", + "scope": 3170, + "src": "15390:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10860,10 +11343,10 @@ "typeString": "bool" }, "typeName": { - "id": 2054, + "id": 3093, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "14905:4:2", + "src": "15390:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10873,24 +11356,24 @@ "visibility": "internal" } ], - "src": "14904:15:2" + "src": "15389:15:5" }, - "scope": 2226, - "src": "14694:1477:2", + "scope": 3265, + "src": "15179:1477:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2170, + "id": 3209, "nodeType": "Block", - "src": "16622:358:2", + "src": "17107:358:5", "statements": [ { "condition": { "argumentTypes": null, - "id": 2153, + "id": 3192, "isConstant": false, "isLValue": false, "isPure": false, @@ -10898,18 +11381,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "16650:166:2", + "src": "17135:166:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2147, + "id": 3186, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2133, - "src": "16691:10:2", + "referencedDeclaration": 3172, + "src": "17176:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -10917,12 +11400,12 @@ }, { "argumentTypes": null, - "id": 2148, + "id": 3187, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2135, - "src": "16719:5:2", + "referencedDeclaration": 3174, + "src": "17204:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10930,12 +11413,12 @@ }, { "argumentTypes": null, - "id": 2149, + "id": 3188, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2137, - "src": "16742:6:2", + "referencedDeclaration": 3176, + "src": "17227:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10943,12 +11426,12 @@ }, { "argumentTypes": null, - "id": 2150, + "id": 3189, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2139, - "src": "16766:6:2", + "referencedDeclaration": 3178, + "src": "17251:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -10956,12 +11439,12 @@ }, { "argumentTypes": null, - "id": 2151, + "id": 3190, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2141, - "src": "16790:12:2", + "referencedDeclaration": 3180, + "src": "17275:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10991,18 +11474,18 @@ "typeString": "uint256" } ], - "id": 2146, + "id": 3185, "name": "_verifyTransactionData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2131, - "src": "16651:22:2", + "referencedDeclaration": 3170, + "src": "17136:22:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_bool_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (bool)" } }, - "id": 2152, + "id": 3191, "isConstant": false, "isLValue": false, "isPure": false, @@ -11010,7 +11493,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16651:165:2", + "src": "17136:165:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11022,26 +11505,26 @@ } }, "falseBody": { - "id": 2166, + "id": 3205, "nodeType": "Block", - "src": "16885:65:2", + "src": "17370:65:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2164, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2159, + "id": 3198, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16899:6:2", + "referencedDeclaration": 3183, + "src": "17384:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11054,12 +11537,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2161, + "id": 3200, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2135, - "src": "16925:5:2", + "referencedDeclaration": 3174, + "src": "17410:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11067,12 +11550,12 @@ }, { "argumentTypes": null, - "id": 2162, + "id": 3201, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2137, - "src": "16932:6:2", + "referencedDeclaration": 3176, + "src": "17417:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11090,18 +11573,18 @@ "typeString": "address" } ], - "id": 2160, + "id": 3199, "name": "_calculateReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2225, - "src": "16908:16:2", + "referencedDeclaration": 3264, + "src": "17393:16:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", "typeString": "function (address,address) view returns (uint256)" } }, - "id": 2163, + "id": 3202, "isConstant": false, "isLValue": false, "isPure": false, @@ -11109,48 +11592,48 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16908:31:2", + "src": "17393:31:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16899:40:2", + "src": "17384:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2165, + "id": 3204, "nodeType": "ExpressionStatement", - "src": "16899:40:2" + "src": "17384:40:5" } ] }, - "id": 2167, + "id": 3206, "nodeType": "IfStatement", - "src": "16633:317:2", + "src": "17118:317:5", "trueBody": { - "id": 2158, + "id": 3197, "nodeType": "Block", - "src": "16835:35:2", + "src": "17320:35:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2156, + "id": 3195, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2154, + "id": 3193, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16849:6:2", + "referencedDeclaration": 3183, + "src": "17334:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11161,14 +11644,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 2155, + "id": 3194, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16858:1:2", + "src": "17343:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11176,15 +11659,15 @@ }, "value": "0" }, - "src": "16849:10:2", + "src": "17334:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2157, + "id": 3196, "nodeType": "ExpressionStatement", - "src": "16849:10:2" + "src": "17334:10:5" } ] } @@ -11192,26 +11675,26 @@ { "expression": { "argumentTypes": null, - "id": 2168, + "id": 3207, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16967:6:2", + "referencedDeclaration": 3183, + "src": "17452:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2145, - "id": 2169, + "functionReturnParameters": 3184, + "id": 3208, "nodeType": "Return", - "src": "16960:13:2" + "src": "17445:13:5" } ] }, "documentation": "@dev Private function to get Tokens to be distributed as reward\nChecks whether transaction is verified or not and computes the\namount of the rewards using the _calculateReward() method", - "id": 2171, + "id": 3210, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11219,16 +11702,16 @@ "name": "_getTokensToReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2142, + "id": 3181, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2133, + "id": 3172, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16432:18:2", + "scope": 3210, + "src": "16917:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11236,10 +11719,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2132, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16432:7:2", + "src": "16917:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -11250,11 +11733,11 @@ }, { "constant": false, - "id": 2135, + "id": 3174, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16460:13:2", + "scope": 3210, + "src": "16945:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11262,10 +11745,10 @@ "typeString": "address" }, "typeName": { - "id": 2134, + "id": 3173, "name": "address", "nodeType": "ElementaryTypeName", - "src": "16460:7:2", + "src": "16945:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11276,11 +11759,11 @@ }, { "constant": false, - "id": 2137, + "id": 3176, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16483:14:2", + "scope": 3210, + "src": "16968:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11288,10 +11771,10 @@ "typeString": "address" }, "typeName": { - "id": 2136, + "id": 3175, "name": "address", "nodeType": "ElementaryTypeName", - "src": "16483:7:2", + "src": "16968:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11302,11 +11785,11 @@ }, { "constant": false, - "id": 2139, + "id": 3178, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16507:12:2", + "scope": 3210, + "src": "16992:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11314,10 +11797,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2138, + "id": 3177, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "16507:5:2", + "src": "16992:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -11328,11 +11811,11 @@ }, { "constant": false, - "id": 2141, + "id": 3180, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16529:20:2", + "scope": 3210, + "src": "17014:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11340,10 +11823,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2140, + "id": 3179, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "16529:7:2", + "src": "17014:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11353,20 +11836,20 @@ "visibility": "internal" } ], - "src": "16422:133:2" + "src": "16907:133:5" }, "payable": false, "returnParameters": { - "id": 2145, + "id": 3184, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2144, + "id": 3183, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16602:14:2", + "scope": 3210, + "src": "17087:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11374,10 +11857,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2143, + "id": 3182, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "16602:7:2", + "src": "17087:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11387,19 +11870,19 @@ "visibility": "internal" } ], - "src": "16601:16:2" + "src": "17086:16:5" }, - "scope": 2226, - "src": "16395:585:2", + "scope": 3265, + "src": "16880:585:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2224, + "id": 3263, "nodeType": "Block", - "src": "17320:828:2", + "src": "17805:828:5", "statements": [ { "condition": { @@ -11408,7 +11891,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2184, + "id": 3223, "isConstant": false, "isLValue": false, "isPure": false, @@ -11417,26 +11900,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2180, + "id": 3219, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "17335:26:2", + "referencedDeclaration": 2372, + "src": "17820:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2182, + "id": 3221, "indexExpression": { "argumentTypes": null, - "id": 2181, + "id": 3220, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17362:6:2", + "referencedDeclaration": 3214, + "src": "17847:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11447,7 +11930,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17335:34:2", + "src": "17820:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11457,44 +11940,44 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 2183, + "id": 3222, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "17373:18:2", + "referencedDeclaration": 2345, + "src": "17858:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17335:56:2", + "src": "17820:56:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2220, + "id": 3259, "nodeType": "Block", - "src": "17541:576:2", + "src": "18026:576:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2199, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2190, + "id": 3229, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17739:6:2", + "referencedDeclaration": 3217, + "src": "18224:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11511,26 +11994,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2193, + "id": 3232, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "17778:20:2", + "referencedDeclaration": 2368, + "src": "18263:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 2195, + "id": 3234, "indexExpression": { "argumentTypes": null, - "id": 2194, + "id": 3233, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17799:6:2", + "referencedDeclaration": 3214, + "src": "18284:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11541,21 +12024,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17778:28:2", + "src": "18263:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2197, + "id": 3236, "indexExpression": { "argumentTypes": null, - "id": 2196, + "id": 3235, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2173, - "src": "17807:5:2", + "referencedDeclaration": 3212, + "src": "18292:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11566,7 +12049,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17778:35:2", + "src": "18263:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11582,32 +12065,32 @@ ], "expression": { "argumentTypes": null, - "id": 2191, + "id": 3230, "name": "maxRewardToBuyerPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "17748:25:2", + "referencedDeclaration": 2347, + "src": "18233:25:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2192, + "id": 3231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "17748:29:2", + "referencedDeclaration": 4577, + "src": "18233:29:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2198, + "id": 3237, "isConstant": false, "isLValue": false, "isPure": false, @@ -11615,21 +12098,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17748:66:2", + "src": "18233:66:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17739:75:2", + "src": "18224:75:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2200, + "id": 3239, "nodeType": "ExpressionStatement", - "src": "17739:75:2" + "src": "18224:75:5" }, { "condition": { @@ -11638,7 +12121,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2208, + "id": 3247, "isConstant": false, "isLValue": false, "isPure": false, @@ -11648,12 +12131,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2205, + "id": 3244, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17976:6:2", + "referencedDeclaration": 3217, + "src": "18461:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11671,26 +12154,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2201, + "id": 3240, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "17937:26:2", + "referencedDeclaration": 2372, + "src": "18422:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2203, + "id": 3242, "indexExpression": { "argumentTypes": null, - "id": 2202, + "id": 3241, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17964:6:2", + "referencedDeclaration": 3214, + "src": "18449:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11701,27 +12184,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17937:34:2", + "src": "18422:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2204, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "17937:38:2", + "referencedDeclaration": 4601, + "src": "18422:38:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2206, + "id": 3245, "isConstant": false, "isLValue": false, "isPure": false, @@ -11729,7 +12212,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17937:46:2", + "src": "18422:46:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11739,48 +12222,48 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 2207, + "id": 3246, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "17986:18:2", + "referencedDeclaration": 2345, + "src": "18471:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17937:67:2", + "src": "18422:67:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2219, + "id": 3258, "nodeType": "IfStatement", - "src": "17933:173:2", + "src": "18418:173:5", "trueBody": { - "id": 2218, + "id": 3257, "nodeType": "Block", - "src": "18006:100:2", + "src": "18491:100:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2216, + "id": 3255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2209, + "id": 3248, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "18024:6:2", + "referencedDeclaration": 3217, + "src": "18509:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11795,26 +12278,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2212, + "id": 3251, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "18056:26:2", + "referencedDeclaration": 2372, + "src": "18541:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2214, + "id": 3253, "indexExpression": { "argumentTypes": null, - "id": 2213, + "id": 3252, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "18083:6:2", + "referencedDeclaration": 3214, + "src": "18568:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11825,7 +12308,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18056:34:2", + "src": "18541:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11841,32 +12324,32 @@ ], "expression": { "argumentTypes": null, - "id": 2210, + "id": 3249, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "18033:18:2", + "referencedDeclaration": 2345, + "src": "18518:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2211, + "id": 3250, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "18033:22:2", + "referencedDeclaration": 4577, + "src": "18518:22:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2215, + "id": 3254, "isConstant": false, "isLValue": false, "isPure": false, @@ -11874,51 +12357,51 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18033:58:2", + "src": "18518:58:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "18024:67:2", + "src": "18509:67:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2217, + "id": 3256, "nodeType": "ExpressionStatement", - "src": "18024:67:2" + "src": "18509:67:5" } ] } } ] }, - "id": 2221, + "id": 3260, "nodeType": "IfStatement", - "src": "17331:786:2", + "src": "17816:786:5", "trueBody": { - "id": 2189, + "id": 3228, "nodeType": "Block", - "src": "17393:133:2", + "src": "17878:133:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2187, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2185, + "id": 3224, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17503:6:2", + "referencedDeclaration": 3217, + "src": "17988:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11929,14 +12412,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 2186, + "id": 3225, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17512:1:2", + "src": "17997:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11944,15 +12427,15 @@ }, "value": "0" }, - "src": "17503:10:2", + "src": "17988:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2188, + "id": 3227, "nodeType": "ExpressionStatement", - "src": "17503:10:2" + "src": "17988:10:5" } ] } @@ -11960,26 +12443,26 @@ { "expression": { "argumentTypes": null, - "id": 2222, + "id": 3261, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "18134:6:2", + "referencedDeclaration": 3217, + "src": "18619:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2179, - "id": 2223, + "functionReturnParameters": 3218, + "id": 3262, "nodeType": "Return", - "src": "18127:13:2" + "src": "18612:13:5" } ] }, "documentation": "@dev Private function to calculate reward.\nPlease see link for rewards calculation algo\n https://github.com/OB1Company/openbazaar-smart-contracts/issues/10", - "id": 2225, + "id": 3264, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -11987,16 +12470,16 @@ "name": "_calculateReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2176, + "id": 3215, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2173, + "id": 3212, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17210:13:2", + "scope": 3264, + "src": "17695:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12004,10 +12487,10 @@ "typeString": "address" }, "typeName": { - "id": 2172, + "id": 3211, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17210:7:2", + "src": "17695:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12018,11 +12501,11 @@ }, { "constant": false, - "id": 2175, + "id": 3214, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17233:14:2", + "scope": 3264, + "src": "17718:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12030,10 +12513,10 @@ "typeString": "address" }, "typeName": { - "id": 2174, + "id": 3213, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17233:7:2", + "src": "17718:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12043,20 +12526,20 @@ "visibility": "internal" } ], - "src": "17200:53:2" + "src": "17685:53:5" }, "payable": false, "returnParameters": { - "id": 2179, + "id": 3218, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2178, + "id": 3217, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17300:14:2", + "scope": 3264, + "src": "17785:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12064,10 +12547,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2177, + "id": 3216, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "17300:7:2", + "src": "17785:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12077,82 +12560,82 @@ "visibility": "internal" } ], - "src": "17299:16:2" + "src": "17784:16:5" }, - "scope": 2226, - "src": "17175:973:2", + "scope": 3265, + "src": "17660:973:5", "stateMutability": "view", "superFunction": null, "visibility": "private" } ], - "scope": 2227, - "src": "510:17642:2" + "scope": 3266, + "src": "510:18127:5" } ], - "src": "48:18105:2" + "src": "48:18590:5" }, "legacyAST": { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/rewards/OBRewards.sol", "exportedSymbols": { "OBRewards": [ - 2226 + 3265 ] }, - "id": 2227, + "id": 3266, "nodeType": "SourceUnit", "nodes": [ { - "id": 1324, + "id": 2330, "literals": [ "solidity", "0.4", ".24" ], "nodeType": "PragmaDirective", - "src": "48:23:2" + "src": "48:23:5" }, { "absolutePath": "openzeppelin-solidity/contracts/math/SafeMath.sol", "file": "openzeppelin-solidity/contracts/math/SafeMath.sol", - "id": 1325, + "id": 2331, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2406, - "src": "73:59:2", + "scope": 3266, + "sourceUnit": 4623, + "src": "73:59:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "openzeppelin-solidity/contracts/ownership/Ownable.sol", "file": "openzeppelin-solidity/contracts/ownership/Ownable.sol", - "id": 1326, + "id": 2332, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2515, - "src": "133:63:2", + "scope": 3266, + "sourceUnit": 4732, + "src": "133:63:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/token/ITokenContract.sol", "file": "../token/ITokenContract.sol", - "id": 1327, + "id": 2333, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 2278, - "src": "197:37:2", + "scope": 3266, + "sourceUnit": 4446, + "src": "197:37:5", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/sameep/freelancing-projects/toptal/open baazar/publicRepo/smart-contracts/contracts/escrow/IEscrow.sol", "file": "../escrow/IEscrow.sol", - "id": 1328, + "id": 2334, "nodeType": "ImportDirective", - "scope": 2227, - "sourceUnit": 1323, - "src": "235:31:2", + "scope": 3266, + "sourceUnit": 1381, + "src": "235:31:5", "symbolAliases": [], "unitAlias": "" }, @@ -12162,56 +12645,56 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 1329, + "id": 2335, "name": "Ownable", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2514, - "src": "532:7:2", + "referencedDeclaration": 4731, + "src": "532:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_Ownable_$2514", + "typeIdentifier": "t_contract$_Ownable_$4731", "typeString": "contract Ownable" } }, - "id": 1330, + "id": 2336, "nodeType": "InheritanceSpecifier", - "src": "532:7:2" + "src": "532:7:5" } ], "contractDependencies": [ - 2514 + 4731 ], "contractKind": "contract", "documentation": "@dev This contract will distribute tokens to the buyers who purchase items from\nthe OB verified sellers\nFor more information please visit below mentioned link\nhttps://github.com/OB1Company/openbazaar-smart-contracts/issues/10", "fullyImplemented": true, - "id": 2226, + "id": 3265, "linearizedBaseContracts": [ - 2226, - 2514 + 3265, + 4731 ], "name": "OBRewards", "nodeType": "ContractDefinition", "nodes": [ { - "id": 1333, + "id": 2339, "libraryName": { "contractScope": null, - "id": 1331, + "id": 2337, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2405, - "src": "553:8:2", + "referencedDeclaration": 4622, + "src": "553:8:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$2405", + "typeIdentifier": "t_contract$_SafeMath_$4622", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", - "src": "547:27:2", + "src": "547:27:5", "typeName": { - "id": 1332, + "id": 2338, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "566:7:2", + "src": "566:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12220,11 +12703,11 @@ }, { "constant": false, - "id": 1337, + "id": 2343, "name": "promotedSellers", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "614:47:2", + "scope": 3265, + "src": "614:47:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12232,28 +12715,28 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 1336, + "id": 2342, "keyType": { - "id": 1334, + "id": 2340, "name": "address", "nodeType": "ElementaryTypeName", - "src": "622:7:2", + "src": "622:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "614:24:2", + "src": "614:24:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" }, "valueType": { - "id": 1335, + "id": 2341, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "633:4:2", + "src": "633:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12265,11 +12748,11 @@ }, { "constant": false, - "id": 1339, + "id": 2345, "name": "maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "668:33:2", + "scope": 3265, + "src": "668:33:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12277,10 +12760,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1338, + "id": 2344, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "668:7:2", + "src": "668:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12291,11 +12774,11 @@ }, { "constant": false, - "id": 1341, + "id": 2347, "name": "maxRewardToBuyerPerSeller", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "708:40:2", + "scope": 3265, + "src": "708:40:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12303,10 +12786,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1340, + "id": 2346, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "708:7:2", + "src": "708:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12317,11 +12800,11 @@ }, { "constant": false, - "id": 1343, + "id": 2349, "name": "totalTokensDistributed", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "755:37:2", + "scope": 3265, + "src": "755:37:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12329,10 +12812,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1342, + "id": 2348, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "755:7:2", + "src": "755:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12343,11 +12826,11 @@ }, { "constant": false, - "id": 1345, + "id": 2351, "name": "timeWindow", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1045:25:2", + "scope": 3265, + "src": "1045:25:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12355,10 +12838,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1344, + "id": 2350, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1045:7:2", + "src": "1045:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12369,11 +12852,11 @@ }, { "constant": false, - "id": 1350, - "name": "sellerVsBuyers", + "id": 2356, + "name": "sellerVsBuyersArray", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1178:44:2", + "scope": 3265, + "src": "1174:49:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12381,38 +12864,38 @@ "typeString": "mapping(address => address[])" }, "typeName": { - "id": 1349, + "id": 2355, "keyType": { - "id": 1346, + "id": 2352, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1186:7:2", + "src": "1182:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1178:29:2", + "src": "1174:29:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[])" }, "valueType": { "baseType": { - "id": 1347, + "id": 2353, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1197:7:2", + "src": "1193:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1348, + "id": 2354, "length": null, "nodeType": "ArrayTypeName", - "src": "1197:9:2", + "src": "1193:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12424,11 +12907,75 @@ }, { "constant": false, - "id": 1356, + "id": 2362, + "name": "sellerVsBuyersBool", + "nodeType": "VariableDeclaration", + "scope": 3265, + "src": "1352:63:5", + "stateVariable": true, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + }, + "typeName": { + "id": 2361, + "keyType": { + "id": 2357, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1360:7:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "Mapping", + "src": "1352:44:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + }, + "valueType": { + "id": 2360, + "keyType": { + "id": 2358, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1379:7:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "Mapping", + "src": "1371:24:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + }, + "valueType": { + "id": 2359, + "name": "bool", + "nodeType": "ElementaryTypeName", + "src": "1390:4:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + } + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2368, "name": "sellerVsBuyerRewards", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1376:68:2", + "scope": 3265, + "src": "1569:68:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12436,46 +12983,46 @@ "typeString": "mapping(address => mapping(address => uint256))" }, "typeName": { - "id": 1355, + "id": 2367, "keyType": { - "id": 1351, + "id": 2363, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1384:7:2", + "src": "1577:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1376:47:2", + "src": "1569:47:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" }, "valueType": { - "id": 1354, + "id": 2366, "keyType": { - "id": 1352, + "id": 2364, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1403:7:2", + "src": "1596:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1395:27:2", + "src": "1588:27:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 1353, + "id": 2365, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1414:7:2", + "src": "1607:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12488,11 +13035,11 @@ }, { "constant": false, - "id": 1360, + "id": 2372, "name": "sellerVsRewardsDistributed", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1589:54:2", + "scope": 3265, + "src": "1782:54:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12500,28 +13047,28 @@ "typeString": "mapping(address => uint256)" }, "typeName": { - "id": 1359, + "id": 2371, "keyType": { - "id": 1357, + "id": 2369, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1597:7:2", + "src": "1790:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "Mapping", - "src": "1589:27:2", + "src": "1782:27:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" }, "valueType": { - "id": 1358, + "id": 2370, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1608:7:2", + "src": "1801:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12533,26 +13080,26 @@ }, { "constant": false, - "id": 1362, + "id": 2374, "name": "escrowContract", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1744:29:2", + "scope": 3265, + "src": "1937:29:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" }, "typeName": { "contractScope": null, - "id": 1361, + "id": 2373, "name": "IEscrow", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1322, - "src": "1744:7:2", + "referencedDeclaration": 1380, + "src": "1937:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, @@ -12561,26 +13108,26 @@ }, { "constant": false, - "id": 1364, + "id": 2376, "name": "obToken", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1846:29:2", + "scope": 3265, + "src": "2039:29:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" }, "typeName": { "contractScope": null, - "id": 1363, + "id": 2375, "name": "ITokenContract", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2277, - "src": "1846:14:2", + "referencedDeclaration": 4445, + "src": "2039:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -12589,11 +13136,11 @@ }, { "constant": false, - "id": 1366, + "id": 2378, "name": "rewardsOn", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "1949:21:2", + "scope": 3265, + "src": "2142:21:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12601,10 +13148,10 @@ "typeString": "bool" }, "typeName": { - "id": 1365, + "id": 2377, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1949:4:2", + "src": "2142:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12615,11 +13162,11 @@ }, { "constant": false, - "id": 1368, + "id": 2380, "name": "endDate", "nodeType": "VariableDeclaration", - "scope": 2226, - "src": "2009:22:2", + "scope": 3265, + "src": "2202:22:5", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -12627,10 +13174,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1367, + "id": 2379, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2009:7:2", + "src": "2202:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12642,21 +13189,21 @@ { "anonymous": false, "documentation": null, - "id": 1378, + "id": 2390, "name": "SuccessfulClaim", "nodeType": "EventDefinition", "parameters": { - "id": 1377, + "id": 2389, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1370, + "id": 2382, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2069:26:2", + "scope": 2390, + "src": "2262:26:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12664,10 +13211,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1369, + "id": 2381, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2069:7:2", + "src": "2262:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12678,12 +13225,12 @@ }, { "constant": false, - "id": 1372, + "id": 2384, "indexed": true, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2105:22:2", + "scope": 2390, + "src": "2298:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12691,10 +13238,10 @@ "typeString": "address" }, "typeName": { - "id": 1371, + "id": 2383, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2105:7:2", + "src": "2298:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12705,12 +13252,12 @@ }, { "constant": false, - "id": 1374, + "id": 2386, "indexed": true, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2137:21:2", + "scope": 2390, + "src": "2330:21:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12718,10 +13265,10 @@ "typeString": "address" }, "typeName": { - "id": 1373, + "id": 2385, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2137:7:2", + "src": "2330:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12732,12 +13279,12 @@ }, { "constant": false, - "id": 1376, + "id": 2388, "indexed": false, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1378, - "src": "2168:14:2", + "scope": 2390, + "src": "2361:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12745,10 +13292,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1375, + "id": 2387, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2168:7:2", + "src": "2361:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12758,28 +13305,28 @@ "visibility": "internal" } ], - "src": "2059:129:2" + "src": "2252:129:5" }, - "src": "2038:151:2" + "src": "2231:151:5" }, { "anonymous": false, "documentation": null, - "id": 1386, + "id": 2398, "name": "UnsuccessfulClaim", "nodeType": "EventDefinition", "parameters": { - "id": 1385, + "id": 2397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1380, + "id": 2392, "indexed": true, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2228:26:2", + "scope": 2398, + "src": "2421:26:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12787,10 +13334,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1379, + "id": 2391, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2228:7:2", + "src": "2421:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -12801,12 +13348,12 @@ }, { "constant": false, - "id": 1382, + "id": 2394, "indexed": true, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2264:22:2", + "scope": 2398, + "src": "2457:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12814,10 +13361,10 @@ "typeString": "address" }, "typeName": { - "id": 1381, + "id": 2393, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2264:7:2", + "src": "2457:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12828,12 +13375,12 @@ }, { "constant": false, - "id": 1384, + "id": 2396, "indexed": true, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1386, - "src": "2296:21:2", + "scope": 2398, + "src": "2489:21:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12841,10 +13388,10 @@ "typeString": "address" }, "typeName": { - "id": 1383, + "id": 2395, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2296:7:2", + "src": "2489:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12854,28 +13401,28 @@ "visibility": "internal" } ], - "src": "2218:105:2" + "src": "2411:105:5" }, - "src": "2195:129:2" + "src": "2388:129:5" }, { "anonymous": false, "documentation": null, - "id": 1391, + "id": 2403, "name": "PromotedSellersAdded", "nodeType": "EventDefinition", "parameters": { - "id": 1390, + "id": 2402, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1389, + "id": 2401, "indexed": false, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1391, - "src": "2357:16:2", + "scope": 2403, + "src": "2550:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12884,19 +13431,19 @@ }, "typeName": { "baseType": { - "id": 1387, + "id": 2399, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2357:7:2", + "src": "2550:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1388, + "id": 2400, "length": null, "nodeType": "ArrayTypeName", - "src": "2357:9:2", + "src": "2550:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12906,28 +13453,28 @@ "visibility": "internal" } ], - "src": "2356:18:2" + "src": "2549:18:5" }, - "src": "2330:45:2" + "src": "2523:45:5" }, { "anonymous": false, "documentation": null, - "id": 1396, + "id": 2408, "name": "PromotedSellersRemoved", "nodeType": "EventDefinition", "parameters": { - "id": 1395, + "id": 2407, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1394, + "id": 2406, "indexed": false, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1396, - "src": "2410:16:2", + "scope": 2408, + "src": "2603:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12936,19 +13483,19 @@ }, "typeName": { "baseType": { - "id": 1392, + "id": 2404, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2410:7:2", + "src": "2603:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1393, + "id": 2405, "length": null, "nodeType": "ArrayTypeName", - "src": "2410:9:2", + "src": "2603:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12958,42 +13505,42 @@ "visibility": "internal" } ], - "src": "2409:18:2" + "src": "2602:18:5" }, - "src": "2381:47:2" + "src": "2574:47:5" }, { "anonymous": false, "documentation": null, - "id": 1398, + "id": 2410, "name": "RewardsOn", "nodeType": "EventDefinition", "parameters": { - "id": 1397, + "id": 2409, "nodeType": "ParameterList", "parameters": [], - "src": "2449:2:2" + "src": "2642:2:5" }, - "src": "2434:18:2" + "src": "2627:18:5" }, { "anonymous": false, "documentation": null, - "id": 1402, + "id": 2414, "name": "EndDateChanged", "nodeType": "EventDefinition", "parameters": { - "id": 1401, + "id": 2413, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1400, + "id": 2412, "indexed": false, "name": "endDate", "nodeType": "VariableDeclaration", - "scope": 1402, - "src": "2479:15:2", + "scope": 2414, + "src": "2672:15:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13001,10 +13548,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1399, + "id": 2411, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2479:7:2", + "src": "2672:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13014,15 +13561,15 @@ "visibility": "internal" } ], - "src": "2478:17:2" + "src": "2671:17:5" }, - "src": "2458:38:2" + "src": "2651:38:5" }, { "body": { - "id": 1416, + "id": 2428, "nodeType": "Block", - "src": "2544:87:2", + "src": "2737:87:5", "statements": [ { "expression": { @@ -13034,19 +13581,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1411, + "id": 2423, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1407, + "id": 2419, "name": "_address", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1404, - "src": "2562:8:2", + "referencedDeclaration": 2416, + "src": "2755:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13060,14 +13607,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 1409, + "id": 2421, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2582:1:2", + "src": "2775:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -13083,20 +13630,20 @@ "typeString": "int_const 0" } ], - "id": 1408, + "id": 2420, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2574:7:2", + "src": "2767:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 1410, + "id": 2422, "isConstant": false, "isLValue": false, "isPure": true, @@ -13104,13 +13651,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2574:10:2", + "src": "2767:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2562:22:2", + "src": "2755:22:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13119,14 +13666,14 @@ { "argumentTypes": null, "hexValue": "5a65726f2061646472657373206e6f7420616c6c6f776564", - "id": 1412, + "id": 2424, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2586:26:2", + "src": "2779:26:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_d15a1b642cacf87a72fab94030672bbfc7860df6ebdb084f3df815612067f9d8", @@ -13146,21 +13693,21 @@ "typeString": "literal_string \"Zero address not allowed\"" } ], - "id": 1406, + "id": 2418, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2554:7:2", + "referencedDeclaration": 5313, + "src": "2747:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1413, + "id": 2425, "isConstant": false, "isLValue": false, "isPure": false, @@ -13168,38 +13715,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2554:59:2", + "src": "2747:59:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1414, + "id": 2426, "nodeType": "ExpressionStatement", - "src": "2554:59:2" + "src": "2747:59:5" }, { - "id": 1415, + "id": 2427, "nodeType": "PlaceholderStatement", - "src": "2623:1:2" + "src": "2816:1:5" } ] }, "documentation": null, - "id": 1417, + "id": 2429, "name": "nonZeroAddress", "nodeType": "ModifierDefinition", "parameters": { - "id": 1405, + "id": 2417, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1404, + "id": 2416, "name": "_address", "nodeType": "VariableDeclaration", - "scope": 1417, - "src": "2526:16:2", + "scope": 2429, + "src": "2719:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13207,10 +13754,10 @@ "typeString": "address" }, "typeName": { - "id": 1403, + "id": 2415, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2526:7:2", + "src": "2719:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13220,16 +13767,16 @@ "visibility": "internal" } ], - "src": "2525:18:2" + "src": "2718:18:5" }, - "src": "2502:129:2", + "src": "2695:129:5", "visibility": "internal" }, { "body": { - "id": 1431, + "id": 2443, "nodeType": "Block", - "src": "2663:149:2", + "src": "2856:149:5", "statements": [ { "expression": { @@ -13241,19 +13788,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1426, + "id": 2438, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1420, + "id": 2432, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "2694:9:2", + "referencedDeclaration": 2378, + "src": "2887:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13270,19 +13817,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1424, + "id": 2436, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1421, + "id": 2433, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "2708:7:2", + "referencedDeclaration": 2380, + "src": "2901:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13294,18 +13841,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1422, + "id": 2434, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "2718:5:2", + "referencedDeclaration": 5299, + "src": "2911:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1423, + "id": 2435, "isConstant": false, "isLValue": false, "isPure": false, @@ -13313,33 +13860,33 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2718:15:2", + "src": "2911:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2708:25:2", + "src": "2901:25:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1425, + "id": 2437, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "2707:27:2", + "src": "2900:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "2694:40:2", + "src": "2887:40:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13348,14 +13895,14 @@ { "argumentTypes": null, "hexValue": "52657761726420646973747269627574696f6e206973206e6f742072756e6e696e67", - "id": 1427, + "id": 2439, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2748:36:2", + "src": "2941:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_00c42f839bb2f27122856d6b35c4e9c8ab107f03b40c8f1523281f6de7fa943d", @@ -13375,21 +13922,21 @@ "typeString": "literal_string \"Reward distribution is not running\"" } ], - "id": 1419, + "id": 2431, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "2673:7:2", + "referencedDeclaration": 5313, + "src": "2866:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1428, + "id": 2440, "isConstant": false, "isLValue": false, "isPure": false, @@ -13397,41 +13944,41 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2673:121:2", + "src": "2866:121:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1429, + "id": 2441, "nodeType": "ExpressionStatement", - "src": "2673:121:2" + "src": "2866:121:5" }, { - "id": 1430, + "id": 2442, "nodeType": "PlaceholderStatement", - "src": "2804:1:2" + "src": "2997:1:5" } ] }, "documentation": null, - "id": 1432, + "id": 2444, "name": "rewardsRunning", "nodeType": "ModifierDefinition", "parameters": { - "id": 1418, + "id": 2430, "nodeType": "ParameterList", "parameters": [], - "src": "2660:2:2" + "src": "2853:2:5" }, - "src": "2637:175:2", + "src": "2830:175:5", "visibility": "internal" }, { "body": { - "id": 1498, + "id": 2510, "nodeType": "Block", - "src": "3548:536:2", + "src": "3741:536:5", "statements": [ { "expression": { @@ -13443,19 +13990,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1452, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1450, + "id": 2462, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1434, - "src": "3580:19:2", + "referencedDeclaration": 2446, + "src": "3773:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13466,14 +14013,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1451, + "id": 2463, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3602:1:2", + "src": "3795:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -13481,7 +14028,7 @@ }, "value": "0" }, - "src": "3580:23:2", + "src": "3773:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13490,14 +14037,14 @@ { "argumentTypes": null, "hexValue": "4d6178696d756d20726577617264206d7573742062652067726561746572207468616e2030", - "id": 1453, + "id": 2465, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3617:39:2", + "src": "3810:39:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_c099dc9fddd25952bad7e605258079253092faa14e344e0cb4cb516db0126987", @@ -13517,21 +14064,21 @@ "typeString": "literal_string \"Maximum reward must be greater than 0\"" } ], - "id": 1449, + "id": 2461, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "3559:7:2", + "referencedDeclaration": 5313, + "src": "3752:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1454, + "id": 2466, "isConstant": false, "isLValue": false, "isPure": false, @@ -13539,15 +14086,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3559:107:2", + "src": "3752:107:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1455, + "id": 2467, "nodeType": "ExpressionStatement", - "src": "3559:107:2" + "src": "3752:107:5" }, { "expression": { @@ -13559,19 +14106,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1459, + "id": 2471, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1457, + "id": 2469, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1436, - "src": "3698:11:2", + "referencedDeclaration": 2448, + "src": "3891:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13582,14 +14129,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1458, + "id": 2470, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3712:1:2", + "src": "3905:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -13597,7 +14144,7 @@ }, "value": "0" }, - "src": "3698:15:2", + "src": "3891:15:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13606,14 +14153,14 @@ { "argumentTypes": null, "hexValue": "54696d652077696e646f77206d7573742062652067726561746572207468616e2030", - "id": 1460, + "id": 2472, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3727:36:2", + "src": "3920:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_5d2f27eabb47631245572e2d5e23b624d4d61c30aebba7f7b875c803aaee095c", @@ -13633,21 +14180,21 @@ "typeString": "literal_string \"Time window must be greater than 0\"" } ], - "id": 1456, + "id": 2468, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "3677:7:2", + "referencedDeclaration": 5313, + "src": "3870:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1461, + "id": 2473, "isConstant": false, "isLValue": false, "isPure": false, @@ -13655,32 +14202,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3677:96:2", + "src": "3870:96:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1462, + "id": 2474, "nodeType": "ExpressionStatement", - "src": "3677:96:2" + "src": "3870:96:5" }, { "expression": { "argumentTypes": null, - "id": 1465, + "id": 2477, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1463, + "id": 2475, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "3784:18:2", + "referencedDeclaration": 2345, + "src": "3977:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13690,43 +14237,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1464, + "id": 2476, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1434, - "src": "3805:19:2", + "referencedDeclaration": 2446, + "src": "3998:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3784:40:2", + "src": "3977:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1466, + "id": 2478, "nodeType": "ExpressionStatement", - "src": "3784:40:2" + "src": "3977:40:5" }, { "expression": { "argumentTypes": null, - "id": 1469, + "id": 2481, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1467, + "id": 2479, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "3834:10:2", + "referencedDeclaration": 2351, + "src": "4027:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13736,45 +14283,45 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1468, + "id": 2480, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1436, - "src": "3847:11:2", + "referencedDeclaration": 2448, + "src": "4040:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3834:24:2", + "src": "4027:24:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1470, + "id": 2482, "nodeType": "ExpressionStatement", - "src": "3834:24:2" + "src": "4027:24:5" }, { "expression": { "argumentTypes": null, - "id": 1475, + "id": 2487, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1471, + "id": 2483, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "3868:14:2", + "referencedDeclaration": 2374, + "src": "4061:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, @@ -13785,12 +14332,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1473, + "id": 2485, "name": "_escrowContractAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1438, - "src": "3893:22:2", + "referencedDeclaration": 2450, + "src": "4086:22:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13804,18 +14351,18 @@ "typeString": "address" } ], - "id": 1472, + "id": 2484, "name": "IEscrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1322, - "src": "3885:7:2", + "referencedDeclaration": 1380, + "src": "4078:7:5", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IEscrow_$1322_$", + "typeIdentifier": "t_type$_t_contract$_IEscrow_$1380_$", "typeString": "type(contract IEscrow)" } }, - "id": 1474, + "id": 2486, "isConstant": false, "isLValue": false, "isPure": false, @@ -13823,40 +14370,40 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3885:31:2", + "src": "4078:31:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "src": "3868:48:2", + "src": "4061:48:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 1476, + "id": 2488, "nodeType": "ExpressionStatement", - "src": "3868:48:2" + "src": "4061:48:5" }, { "expression": { "argumentTypes": null, - "id": 1481, + "id": 2493, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1477, + "id": 2489, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "3926:7:2", + "referencedDeclaration": 2376, + "src": "4119:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, @@ -13867,12 +14414,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1479, + "id": 2491, "name": "obTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "3951:14:2", + "referencedDeclaration": 2452, + "src": "4144:14:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13886,18 +14433,18 @@ "typeString": "address" } ], - "id": 1478, + "id": 2490, "name": "ITokenContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2277, - "src": "3936:14:2", + "referencedDeclaration": 4445, + "src": "4129:14:5", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ITokenContract_$2277_$", + "typeIdentifier": "t_type$_t_contract$_ITokenContract_$4445_$", "typeString": "type(contract ITokenContract)" } }, - "id": 1480, + "id": 2492, "isConstant": false, "isLValue": false, "isPure": false, @@ -13905,38 +14452,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3936:30:2", + "src": "4129:30:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "src": "3926:40:2", + "src": "4119:40:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1482, + "id": 2494, "nodeType": "ExpressionStatement", - "src": "3926:40:2" + "src": "4119:40:5" }, { "expression": { "argumentTypes": null, - "id": 1496, + "id": 2508, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1483, + "id": 2495, "name": "maxRewardToBuyerPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "3976:25:2", + "referencedDeclaration": 2347, + "src": "4169:25:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13953,7 +14500,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1494, + "id": 2506, "isConstant": false, "isLValue": false, "isPure": false, @@ -13961,14 +14508,14 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 1488, + "id": 2500, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4033:2:2", + "src": "4226:2:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_10_by_1", @@ -13988,32 +14535,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 1490, + "id": 2502, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "4047:7:2", + "referencedDeclaration": 2376, + "src": "4240:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1491, + "id": 2503, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "decimals", "nodeType": "MemberAccess", - "referencedDeclaration": 2276, - "src": "4047:16:2", + "referencedDeclaration": 4444, + "src": "4240:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_uint8_$", "typeString": "function () view external returns (uint8)" } }, - "id": 1492, + "id": 2504, "isConstant": false, "isLValue": false, "isPure": false, @@ -14021,7 +14568,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4047:18:2", + "src": "4240:18:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -14035,20 +14582,20 @@ "typeString": "uint8" } ], - "id": 1489, + "id": 2501, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4039:7:2", + "src": "4232:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1493, + "id": 2505, "isConstant": false, "isLValue": false, "isPure": false, @@ -14056,13 +14603,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4039:27:2", + "src": "4232:27:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4033:33:2", + "src": "4226:33:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14082,14 +14629,14 @@ { "argumentTypes": null, "hexValue": "3530", - "id": 1485, + "id": 2497, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4012:2:2", + "src": "4205:2:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_50_by_1", @@ -14105,20 +14652,20 @@ "typeString": "int_const 50" } ], - "id": 1484, + "id": 2496, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "4004:7:2", + "src": "4197:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1486, + "id": 2498, "isConstant": false, "isLValue": false, "isPure": true, @@ -14126,27 +14673,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4004:11:2", + "src": "4197:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1487, + "id": 2499, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 2312, - "src": "4004:15:2", + "referencedDeclaration": 4529, + "src": "4197:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1495, + "id": 2507, "isConstant": false, "isLValue": false, "isPure": false, @@ -14154,26 +14701,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4004:72:2", + "src": "4197:72:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3976:100:2", + "src": "4169:100:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1497, + "id": 2509, "nodeType": "ExpressionStatement", - "src": "3976:100:2" + "src": "4169:100:5" } ] }, "documentation": "@dev Add details to rewards contract at the time of deployment\n@param _maxRewardPerSeller Maximum reward to be distributed from\neach seller\n@param _timeWindow A time window, in seconds, where purchases\nwill be rewarded with tokens\n@param _escrowContractAddress Escrow address to be considered for\nrewards distribution.\n@param obTokenAddress Address of the reward token", - "id": 1499, + "id": 2511, "implemented": true, "isConstructor": true, "isDeclaredConst": false, @@ -14182,82 +14729,82 @@ "arguments": [ { "argumentTypes": null, - "id": 1443, + "id": 2455, "name": "_escrowContractAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1438, - "src": "3481:22:2", + "referencedDeclaration": 2450, + "src": "3674:22:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1444, + "id": 2456, "modifierName": { "argumentTypes": null, - "id": 1442, + "id": 2454, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "3466:14:2", + "referencedDeclaration": 2429, + "src": "3659:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "3466:38:2" + "src": "3659:38:5" }, { "arguments": [ { "argumentTypes": null, - "id": 1446, + "id": 2458, "name": "obTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1440, - "src": "3528:14:2", + "referencedDeclaration": 2452, + "src": "3721:14:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1447, + "id": 2459, "modifierName": { "argumentTypes": null, - "id": 1445, + "id": 2457, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "3513:14:2", + "referencedDeclaration": 2429, + "src": "3706:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "3513:30:2" + "src": "3706:30:5" } ], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1441, + "id": 2453, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1434, + "id": 2446, "name": "_maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3271:27:2", + "scope": 2511, + "src": "3464:27:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14265,10 +14812,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1433, + "id": 2445, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3271:7:2", + "src": "3464:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14279,11 +14826,11 @@ }, { "constant": false, - "id": 1436, + "id": 2448, "name": "_timeWindow", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3308:19:2", + "scope": 2511, + "src": "3501:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14291,10 +14838,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1435, + "id": 2447, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3308:7:2", + "src": "3501:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14305,11 +14852,11 @@ }, { "constant": false, - "id": 1438, + "id": 2450, "name": "_escrowContractAddress", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3337:30:2", + "scope": 2511, + "src": "3530:30:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14317,10 +14864,10 @@ "typeString": "address" }, "typeName": { - "id": 1437, + "id": 2449, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3337:7:2", + "src": "3530:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14331,11 +14878,11 @@ }, { "constant": false, - "id": 1440, + "id": 2452, "name": "obTokenAddress", "nodeType": "VariableDeclaration", - "scope": 1499, - "src": "3414:22:2", + "scope": 2511, + "src": "3607:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14343,10 +14890,10 @@ "typeString": "address" }, "typeName": { - "id": 1439, + "id": 2451, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3414:7:2", + "src": "3607:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14356,32 +14903,32 @@ "visibility": "internal" } ], - "src": "3261:181:2" + "src": "3454:181:5" }, "payable": false, "returnParameters": { - "id": 1448, + "id": 2460, "nodeType": "ParameterList", "parameters": [], - "src": "3548:0:2" + "src": "3741:0:5" }, - "scope": 2226, - "src": "3250:834:2", + "scope": 3265, + "src": "3443:834:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1542, + "id": 2565, "nodeType": "Block", - "src": "4427:367:2", + "src": "4620:504:5", "statements": [ { "body": { - "id": 1536, + "id": 2559, "nodeType": "Block", - "src": "4483:261:2", + "src": "4676:398:5", "statements": [ { "expression": { @@ -14389,7 +14936,188 @@ "arguments": [ { "argumentTypes": null, - "id": 1524, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 2537, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2531, + "name": "sellers", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2514, + "src": "4715:7:5", + "typeDescriptions": { + "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", + "typeString": "address[] calldata" + } + }, + "id": 2533, + "indexExpression": { + "argumentTypes": null, + "id": 2532, + "name": "i", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2520, + "src": "4723:1:5", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "4715:10:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "30", + "id": 2535, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "4737:1:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + }, + "value": "0" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "id": 2534, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "4729:7:5", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 2536, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4729:10:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "4715:24:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "5a65726f20616464726573732063616e6e6f7420626520612070726f6d6f7465642073656c6c6572", + "id": 2538, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "4757:42:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_ccd6447a9fa8fbdd02ec18199b79f41ceff21c9af6e397077aa3909629bee939", + "typeString": "literal_string \"Zero address cannot be a promoted seller\"" + }, + "value": "Zero address cannot be a promoted seller" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_ccd6447a9fa8fbdd02ec18199b79f41ceff21c9af6e397077aa3909629bee939", + "typeString": "literal_string \"Zero address cannot be a promoted seller\"" + } + ], + "id": 2530, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5312, + 5313 + ], + "referencedDeclaration": 5313, + "src": "4690:7:5", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2539, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4690:123:5", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2540, + "nodeType": "ExpressionStatement", + "src": "4690:123:5" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2547, "isConstant": false, "isLValue": false, "isPure": false, @@ -14397,47 +15125,47 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "4523:28:2", + "src": "4853:28:5", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1519, + "id": 2542, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "4524:15:2", + "referencedDeclaration": 2343, + "src": "4854:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1523, + "id": 2546, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1520, + "id": 2543, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4540:7:2", + "referencedDeclaration": 2514, + "src": "4870:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1522, + "id": 2545, "indexExpression": { "argumentTypes": null, - "id": 1521, + "id": 2544, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4548:1:2", + "referencedDeclaration": 2520, + "src": "4878:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14448,7 +15176,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4540:10:2", + "src": "4870:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14459,7 +15187,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4524:27:2", + "src": "4854:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14473,14 +15201,14 @@ { "argumentTypes": null, "hexValue": "4f6e65206f66207468652073656c6c65727320697320616c72656164792070726f6d6f746564", - "id": 1525, + "id": 2548, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4569:40:2", + "src": "4899:40:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_861779356d821ea92acd5b35b679332541f56a3478b73fda7aa49fb208cc4104", @@ -14500,21 +15228,21 @@ "typeString": "literal_string \"One of the sellers is already promoted\"" } ], - "id": 1518, + "id": 2541, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "4498:7:2", + "referencedDeclaration": 5313, + "src": "4828:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1526, + "id": 2549, "isConstant": false, "isLValue": false, "isPure": false, @@ -14522,20 +15250,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4498:125:2", + "src": "4828:125:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1527, + "id": 2550, "nodeType": "ExpressionStatement", - "src": "4498:125:2" + "src": "4828:125:5" }, { "expression": { "argumentTypes": null, - "id": 1534, + "id": 2557, "isConstant": false, "isLValue": false, "isPure": false, @@ -14544,42 +15272,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1528, + "id": 2551, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "4699:15:2", + "referencedDeclaration": 2343, + "src": "5029:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1532, + "id": 2555, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1529, + "id": 2552, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4715:7:2", + "referencedDeclaration": 2514, + "src": "5045:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1531, + "id": 2554, "indexExpression": { "argumentTypes": null, - "id": 1530, + "id": 2553, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4723:1:2", + "referencedDeclaration": 2520, + "src": "5053:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14590,7 +15318,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4715:10:2", + "src": "5045:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14601,7 +15329,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "4699:27:2", + "src": "5029:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14612,14 +15340,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1533, + "id": 2556, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "4729:4:2", + "src": "5059:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -14627,15 +15355,15 @@ }, "value": "true" }, - "src": "4699:34:2", + "src": "5029:34:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1535, + "id": 2558, "nodeType": "ExpressionStatement", - "src": "4699:34:2" + "src": "5029:34:5" } ] }, @@ -14645,19 +15373,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1514, + "id": 2526, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1511, + "id": 2523, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4458:1:2", + "referencedDeclaration": 2520, + "src": "4651:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14669,18 +15397,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1512, + "id": 2524, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4462:7:2", + "referencedDeclaration": 2514, + "src": "4655:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1513, + "id": 2525, "isConstant": false, "isLValue": false, "isPure": false, @@ -14688,31 +15416,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4462:14:2", + "src": "4655:14:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4458:18:2", + "src": "4651:18:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1537, + "id": 2560, "initializationExpression": { "assignments": [ - 1508 + 2520 ], "declarations": [ { "constant": false, - "id": 1508, + "id": 2520, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1543, - "src": "4443:9:2", + "scope": 2566, + "src": "4636:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14720,10 +15448,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1507, + "id": 2519, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4443:7:2", + "src": "4636:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14733,18 +15461,18 @@ "visibility": "internal" } ], - "id": 1510, + "id": 2522, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1509, + "id": 2521, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4455:1:2", + "src": "4648:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14753,12 +15481,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4443:13:2" + "src": "4636:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1516, + "id": 2528, "isConstant": false, "isLValue": false, "isPure": false, @@ -14766,15 +15494,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "4478:3:2", + "src": "4671:3:5", "subExpression": { "argumentTypes": null, - "id": 1515, + "id": 2527, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1508, - "src": "4478:1:2", + "referencedDeclaration": 2520, + "src": "4671:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14785,12 +15513,12 @@ "typeString": "uint256" } }, - "id": 1517, + "id": 2529, "nodeType": "ExpressionStatement", - "src": "4478:3:2" + "src": "4671:3:5" }, "nodeType": "ForStatement", - "src": "4438:306:2" + "src": "4631:443:5" }, { "eventCall": { @@ -14798,12 +15526,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1539, + "id": 2562, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1502, - "src": "4779:7:2", + "referencedDeclaration": 2514, + "src": "5109:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -14817,18 +15545,18 @@ "typeString": "address[] calldata" } ], - "id": 1538, + "id": 2561, "name": "PromotedSellersAdded", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1391, - "src": "4758:20:2", + "referencedDeclaration": 2403, + "src": "5088:20:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 1540, + "id": 2563, "isConstant": false, "isLValue": false, "isPure": false, @@ -14836,57 +15564,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4758:29:2", + "src": "5088:29:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1541, + "id": 2564, "nodeType": "EmitStatement", - "src": "4753:34:2" + "src": "5083:34:5" } ] }, "documentation": "@dev Allows owner to add new promoted sellers. Previous ones will\nremain untouched\n@param sellers List of sellers to be marked as promoted\nNo Seller out of this list should already be promoted, otherwise\ntransaction will fail", - "id": 1543, + "id": 2566, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1505, + "id": 2517, "modifierName": { "argumentTypes": null, - "id": 1504, + "id": 2516, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "4417:9:2", + "referencedDeclaration": 4665, + "src": "4610:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4417:9:2" + "src": "4610:9:5" } ], "name": "addPromotedSellers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1503, + "id": 2515, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1502, + "id": 2514, "name": "sellers", "nodeType": "VariableDeclaration", - "scope": 1543, - "src": "4389:17:2", + "scope": 2566, + "src": "4582:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14895,19 +15623,19 @@ }, "typeName": { "baseType": { - "id": 1500, + "id": 2512, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4389:7:2", + "src": "4582:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1501, + "id": 2513, "length": null, "nodeType": "ArrayTypeName", - "src": "4389:9:2", + "src": "4582:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -14917,37 +15645,37 @@ "visibility": "internal" } ], - "src": "4388:19:2" + "src": "4581:19:5" }, "payable": false, "returnParameters": { - "id": 1506, + "id": 2518, "nodeType": "ParameterList", "parameters": [], - "src": "4427:0:2" + "src": "4620:0:5" }, - "scope": 2226, - "src": "4361:433:2", + "scope": 3265, + "src": "4554:570:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1576, + "id": 2599, "nodeType": "Block", - "src": "4980:169:2", + "src": "5310:169:5", "statements": [ { "body": { - "id": 1570, + "id": 2593, "nodeType": "Block", - "src": "5036:61:2", + "src": "5366:61:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1568, + "id": 2591, "isConstant": false, "isLValue": false, "isPure": false, @@ -14956,42 +15684,42 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1562, + "id": 2585, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "5051:15:2", + "referencedDeclaration": 2343, + "src": "5381:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 1566, + "id": 2589, "indexExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1563, + "id": 2586, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5067:7:2", + "referencedDeclaration": 2569, + "src": "5397:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1565, + "id": 2588, "indexExpression": { "argumentTypes": null, - "id": 1564, + "id": 2587, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5075:1:2", + "referencedDeclaration": 2575, + "src": "5405:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15002,7 +15730,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5067:10:2", + "src": "5397:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15013,7 +15741,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "5051:27:2", + "src": "5381:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15024,14 +15752,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 1567, + "id": 2590, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "5081:5:2", + "src": "5411:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -15039,15 +15767,15 @@ }, "value": "false" }, - "src": "5051:35:2", + "src": "5381:35:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1569, + "id": 2592, "nodeType": "ExpressionStatement", - "src": "5051:35:2" + "src": "5381:35:5" } ] }, @@ -15057,19 +15785,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1558, + "id": 2581, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1555, + "id": 2578, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5011:1:2", + "referencedDeclaration": 2575, + "src": "5341:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15081,18 +15809,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1556, + "id": 2579, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5015:7:2", + "referencedDeclaration": 2569, + "src": "5345:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" } }, - "id": 1557, + "id": 2580, "isConstant": false, "isLValue": false, "isPure": false, @@ -15100,31 +15828,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5015:14:2", + "src": "5345:14:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "5011:18:2", + "src": "5341:18:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1571, + "id": 2594, "initializationExpression": { "assignments": [ - 1552 + 2575 ], "declarations": [ { "constant": false, - "id": 1552, + "id": 2575, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1577, - "src": "4996:9:2", + "scope": 2600, + "src": "5326:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15132,10 +15860,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1551, + "id": 2574, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4996:7:2", + "src": "5326:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15145,18 +15873,18 @@ "visibility": "internal" } ], - "id": 1554, + "id": 2577, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1553, + "id": 2576, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5008:1:2", + "src": "5338:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15165,12 +15893,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4996:13:2" + "src": "5326:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1560, + "id": 2583, "isConstant": false, "isLValue": false, "isPure": false, @@ -15178,15 +15906,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "5031:3:2", + "src": "5361:3:5", "subExpression": { "argumentTypes": null, - "id": 1559, + "id": 2582, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1552, - "src": "5031:1:2", + "referencedDeclaration": 2575, + "src": "5361:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15197,12 +15925,12 @@ "typeString": "uint256" } }, - "id": 1561, + "id": 2584, "nodeType": "ExpressionStatement", - "src": "5031:3:2" + "src": "5361:3:5" }, "nodeType": "ForStatement", - "src": "4991:106:2" + "src": "5321:106:5" }, { "eventCall": { @@ -15210,12 +15938,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1573, + "id": 2596, "name": "sellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1546, - "src": "5134:7:2", + "referencedDeclaration": 2569, + "src": "5464:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_calldata_ptr", "typeString": "address[] calldata" @@ -15229,18 +15957,18 @@ "typeString": "address[] calldata" } ], - "id": 1572, + "id": 2595, "name": "PromotedSellersRemoved", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1396, - "src": "5111:22:2", + "referencedDeclaration": 2408, + "src": "5441:22:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 1574, + "id": 2597, "isConstant": false, "isLValue": false, "isPure": false, @@ -15248,57 +15976,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5111:31:2", + "src": "5441:31:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1575, + "id": 2598, "nodeType": "EmitStatement", - "src": "5106:36:2" + "src": "5436:36:5" } ] }, "documentation": "@dev Remove exisiting promoted sellers\n@param sellers List of sellers to be removed", - "id": 1577, + "id": 2600, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1549, + "id": 2572, "modifierName": { "argumentTypes": null, - "id": 1548, + "id": 2571, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "4970:9:2", + "referencedDeclaration": 4665, + "src": "5300:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4970:9:2" + "src": "5300:9:5" } ], "name": "removePromotedSellers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1547, + "id": 2570, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1546, + "id": 2569, "name": "sellers", "nodeType": "VariableDeclaration", - "scope": 1577, - "src": "4942:17:2", + "scope": 2600, + "src": "5272:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15307,19 +16035,19 @@ }, "typeName": { "baseType": { - "id": 1544, + "id": 2567, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4942:7:2", + "src": "5272:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1545, + "id": 2568, "length": null, "nodeType": "ArrayTypeName", - "src": "4942:9:2", + "src": "5272:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -15329,43 +16057,43 @@ "visibility": "internal" } ], - "src": "4941:19:2" + "src": "5271:19:5" }, "payable": false, "returnParameters": { - "id": 1550, + "id": 2573, "nodeType": "ParameterList", "parameters": [], - "src": "4980:0:2" + "src": "5310:0:5" }, - "scope": 2226, - "src": "4911:238:2", + "scope": 3265, + "src": "5241:238:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1593, + "id": 2616, "nodeType": "Block", - "src": "5478:71:2", + "src": "5808:76:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1589, + "id": 2612, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1585, + "id": 2608, "name": "buyers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "5488:6:2", + "referencedDeclaration": 2606, + "src": "5818:6:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -15377,26 +16105,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1586, - "name": "sellerVsBuyers", + "id": 2609, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "5497:14:2", + "referencedDeclaration": 2356, + "src": "5827:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1588, + "id": 2611, "indexExpression": { "argumentTypes": null, - "id": 1587, + "id": 2610, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1579, - "src": "5512:6:2", + "referencedDeclaration": 2602, + "src": "5847:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15407,45 +16135,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5497:22:2", + "src": "5827:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "src": "5488:31:2", + "src": "5818:36:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 1590, + "id": 2613, "nodeType": "ExpressionStatement", - "src": "5488:31:2" + "src": "5818:36:5" }, { "expression": { "argumentTypes": null, - "id": 1591, + "id": 2614, "name": "buyers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1583, - "src": "5536:6:2", + "referencedDeclaration": 2606, + "src": "5871:6:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "functionReturnParameters": 1584, - "id": 1592, + "functionReturnParameters": 2607, + "id": 2615, "nodeType": "Return", - "src": "5529:13:2" + "src": "5864:13:5" } ] }, "documentation": "@dev Returns list of buyers that have been rewarded for purchasing from\na given seller\n@param seller Address of promoted seller\n@return buyers List of Buyers", - "id": 1594, + "id": 2617, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -15453,16 +16181,16 @@ "name": "getRewardedBuyers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1580, + "id": 2603, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1579, + "id": 2602, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1594, - "src": "5388:14:2", + "scope": 2617, + "src": "5718:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15470,10 +16198,10 @@ "typeString": "address" }, "typeName": { - "id": 1578, + "id": 2601, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5388:7:2", + "src": "5718:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15483,20 +16211,20 @@ "visibility": "internal" } ], - "src": "5378:30:2" + "src": "5708:30:5" }, "payable": false, "returnParameters": { - "id": 1584, + "id": 2607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1583, + "id": 2606, "name": "buyers", "nodeType": "VariableDeclaration", - "scope": 1594, - "src": "5456:16:2", + "scope": 2617, + "src": "5786:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15505,19 +16233,19 @@ }, "typeName": { "baseType": { - "id": 1581, + "id": 2604, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5456:7:2", + "src": "5786:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1582, + "id": 2605, "length": null, "nodeType": "ArrayTypeName", - "src": "5456:9:2", + "src": "5786:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -15527,19 +16255,19 @@ "visibility": "internal" } ], - "src": "5455:18:2" + "src": "5785:18:5" }, - "scope": 2226, - "src": "5352:197:2", + "scope": 3265, + "src": "5682:202:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1609, + "id": 2632, "nodeType": "Block", - "src": "5950:59:2", + "src": "6285:59:5", "statements": [ { "expression": { @@ -15548,26 +16276,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1603, + "id": 2626, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "5967:20:2", + "referencedDeclaration": 2368, + "src": "6302:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1605, + "id": 2628, "indexExpression": { "argumentTypes": null, - "id": 1604, + "id": 2627, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1596, - "src": "5988:6:2", + "referencedDeclaration": 2619, + "src": "6323:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15578,21 +16306,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5967:28:2", + "src": "6302:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1607, + "id": 2630, "indexExpression": { "argumentTypes": null, - "id": 1606, + "id": 2629, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1598, - "src": "5996:5:2", + "referencedDeclaration": 2621, + "src": "6331:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15603,21 +16331,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "5967:35:2", + "src": "6302:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1602, - "id": 1608, + "functionReturnParameters": 2625, + "id": 2631, "nodeType": "Return", - "src": "5960:42:2" + "src": "6295:42:5" } ] }, "documentation": "@dev Return reward info for a buyer against a promoted seller\n@param seller Address of promoted seller\n@param buyer The buyer who reward info has to be fetched\n@return rewardAmount", - "id": 1610, + "id": 2633, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -15625,16 +16353,16 @@ "name": "getBuyerRewardInfo", "nodeType": "FunctionDefinition", "parameters": { - "id": 1599, + "id": 2622, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1596, + "id": 2619, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5812:14:2", + "scope": 2633, + "src": "6147:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15642,10 +16370,10 @@ "typeString": "address" }, "typeName": { - "id": 1595, + "id": 2618, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5812:7:2", + "src": "6147:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15656,11 +16384,11 @@ }, { "constant": false, - "id": 1598, + "id": 2621, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5836:13:2", + "scope": 2633, + "src": "6171:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15668,10 +16396,10 @@ "typeString": "address" }, "typeName": { - "id": 1597, + "id": 2620, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5836:7:2", + "src": "6171:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15681,20 +16409,20 @@ "visibility": "internal" } ], - "src": "5802:53:2" + "src": "6137:53:5" }, "payable": false, "returnParameters": { - "id": 1602, + "id": 2625, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1601, + "id": 2624, "name": "rewardAmount", "nodeType": "VariableDeclaration", - "scope": 1610, - "src": "5915:20:2", + "scope": 2633, + "src": "6250:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15702,10 +16430,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1600, + "id": 2623, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5915:7:2", + "src": "6250:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15715,36 +16443,36 @@ "visibility": "internal" } ], - "src": "5901:44:2" + "src": "6236:44:5" }, - "scope": 2226, - "src": "5775:234:2", + "scope": 3265, + "src": "6110:234:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1625, + "id": 2648, "nodeType": "Block", - "src": "6345:105:2", + "src": "6680:105:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1621, + "id": 2644, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1617, + "id": 2640, "name": "rewardDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1615, - "src": "6355:17:2", + "referencedDeclaration": 2638, + "src": "6690:17:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15756,26 +16484,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1618, + "id": 2641, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "6375:26:2", + "referencedDeclaration": 2372, + "src": "6710:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1620, + "id": 2643, "indexExpression": { "argumentTypes": null, - "id": 1619, + "id": 2642, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1612, - "src": "6402:6:2", + "referencedDeclaration": 2635, + "src": "6737:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15786,45 +16514,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "6375:34:2", + "src": "6710:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "6355:54:2", + "src": "6690:54:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1622, + "id": 2645, "nodeType": "ExpressionStatement", - "src": "6355:54:2" + "src": "6690:54:5" }, { "expression": { "argumentTypes": null, - "id": 1623, + "id": 2646, "name": "rewardDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1615, - "src": "6426:17:2", + "referencedDeclaration": 2638, + "src": "6761:17:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1616, - "id": 1624, + "functionReturnParameters": 2639, + "id": 2647, "nodeType": "Return", - "src": "6419:24:2" + "src": "6754:24:5" } ] }, "documentation": "@dev Total reward distributed for a promoted seller so far\n@param seller Promoted seller's address\n@return Amount of tokens distributed as reward for a seller", - "id": 1626, + "id": 2649, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -15832,16 +16560,16 @@ "name": "getDistributedReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 1613, + "id": 2636, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1612, + "id": 2635, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1626, - "src": "6246:14:2", + "scope": 2649, + "src": "6581:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15849,10 +16577,10 @@ "typeString": "address" }, "typeName": { - "id": 1611, + "id": 2634, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6246:7:2", + "src": "6581:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15862,20 +16590,20 @@ "visibility": "internal" } ], - "src": "6236:30:2" + "src": "6571:30:5" }, "payable": false, "returnParameters": { - "id": 1616, + "id": 2639, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1615, + "id": 2638, "name": "rewardDistributed", "nodeType": "VariableDeclaration", - "scope": 1626, - "src": "6314:25:2", + "scope": 2649, + "src": "6649:25:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15883,10 +16611,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1614, + "id": 2637, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6314:7:2", + "src": "6649:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15896,32 +16624,32 @@ "visibility": "internal" } ], - "src": "6313:27:2" + "src": "6648:27:5" }, - "scope": 2226, - "src": "6207:243:2", + "scope": 3265, + "src": "6542:243:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1650, + "id": 2673, "nodeType": "Block", - "src": "6769:102:2", + "src": "7104:102:5", "statements": [ { "assignments": [ - 1637 + 2660 ], "declarations": [ { "constant": false, - "id": 1637, + "id": 2660, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1651, - "src": "6779:14:2", + "scope": 2674, + "src": "7114:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15929,10 +16657,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1636, + "id": 2659, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6779:7:2", + "src": "7114:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15942,20 +16670,20 @@ "visibility": "internal" } ], - "id": 1642, + "id": 2665, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1640, + "id": 2663, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2552, - "src": "6814:4:2", + "referencedDeclaration": 5340, + "src": "7149:4:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } } @@ -15963,38 +16691,38 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } ], "expression": { "argumentTypes": null, - "id": 1638, + "id": 2661, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "6796:7:2", + "referencedDeclaration": 2376, + "src": "7131:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1639, + "id": 2662, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 2235, - "src": "6796:17:2", + "referencedDeclaration": 4403, + "src": "7131:17:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 1641, + "id": 2664, "isConstant": false, "isLValue": false, "isPure": false, @@ -16002,14 +16730,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6796:23:2", + "src": "7131:23:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "6779:40:2" + "src": "7114:40:5" }, { "expression": { @@ -16017,12 +16745,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1646, + "id": 2669, "name": "receiver", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1628, - "src": "6847:8:2", + "referencedDeclaration": 2651, + "src": "7182:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16030,12 +16758,12 @@ }, { "argumentTypes": null, - "id": 1647, + "id": 2670, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1637, - "src": "6857:6:2", + "referencedDeclaration": 2660, + "src": "7192:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16055,32 +16783,32 @@ ], "expression": { "argumentTypes": null, - "id": 1643, + "id": 2666, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "6830:7:2", + "referencedDeclaration": 2376, + "src": "7165:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1645, + "id": 2668, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "6830:16:2", + "referencedDeclaration": 4412, + "src": "7165:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 1648, + "id": 2671, "isConstant": false, "isLValue": false, "isPure": false, @@ -16088,90 +16816,90 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6830:34:2", + "src": "7165:34:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1649, + "id": 2672, "nodeType": "ExpressionStatement", - "src": "6830:34:2" + "src": "7165:34:5" } ] }, "documentation": "@dev Allows the owner of the contract to transfer all remaining tokens to\nan address of their choosing.\n@param receiver The receiver's address", - "id": 1651, + "id": 2674, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1631, + "id": 2654, "modifierName": { "argumentTypes": null, - "id": 1630, + "id": 2653, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "6722:9:2", + "referencedDeclaration": 4665, + "src": "7057:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "6722:9:2" + "src": "7057:9:5" }, { "arguments": [ { "argumentTypes": null, - "id": 1633, + "id": 2656, "name": "receiver", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1628, - "src": "6755:8:2", + "referencedDeclaration": 2651, + "src": "7090:8:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } } ], - "id": 1634, + "id": 2657, "modifierName": { "argumentTypes": null, - "id": 1632, + "id": 2655, "name": "nonZeroAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1417, - "src": "6740:14:2", + "referencedDeclaration": 2429, + "src": "7075:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$_t_address_$", "typeString": "modifier (address)" } }, "nodeType": "ModifierInvocation", - "src": "6740:24:2" + "src": "7075:24:5" } ], "name": "transferRemainingTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1629, + "id": 2652, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1628, + "id": 2651, "name": "receiver", "nodeType": "VariableDeclaration", - "scope": 1651, - "src": "6674:16:2", + "scope": 2674, + "src": "7009:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16179,10 +16907,10 @@ "typeString": "address" }, "typeName": { - "id": 1627, + "id": 2650, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6674:7:2", + "src": "7009:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16192,43 +16920,43 @@ "visibility": "internal" } ], - "src": "6664:32:2" + "src": "6999:32:5" }, "payable": false, "returnParameters": { - "id": 1635, + "id": 2658, "nodeType": "ParameterList", "parameters": [], - "src": "6769:0:2" + "src": "7104:0:5" }, - "scope": 2226, - "src": "6632:239:2", + "scope": 3265, + "src": "6967:239:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1662, + "id": 2685, "nodeType": "Block", - "src": "7163:57:2", + "src": "7498:57:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1660, + "id": 2683, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1658, + "id": 2681, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "7173:18:2", + "referencedDeclaration": 2345, + "src": "7508:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16238,68 +16966,68 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1659, + "id": 2682, "name": "_maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1653, - "src": "7194:19:2", + "referencedDeclaration": 2676, + "src": "7529:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7173:40:2", + "src": "7508:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1661, + "id": 2684, "nodeType": "ExpressionStatement", - "src": "7173:40:2" + "src": "7508:40:5" } ] }, - "documentation": "@dev Method to allow the onwer to adjust the maximum reward per seller\n@param _maxRewardPerSeller Max reward to be distributed for each seller", - "id": 1663, + "documentation": "@dev Method to allow the owner to adjust the maximum reward per seller\n@param _maxRewardPerSeller Max reward to be distributed for each seller", + "id": 2686, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1656, + "id": 2679, "modifierName": { "argumentTypes": null, - "id": 1655, + "id": 2678, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "7149:9:2", + "referencedDeclaration": 4665, + "src": "7484:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "7149:9:2" + "src": "7484:9:5" } ], "name": "changeMaxRewardPerSeller", "nodeType": "FunctionDefinition", "parameters": { - "id": 1654, + "id": 2677, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1653, + "id": 2676, "name": "_maxRewardPerSeller", "nodeType": "VariableDeclaration", - "scope": 1663, - "src": "7090:27:2", + "scope": 2686, + "src": "7425:27:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16307,10 +17035,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1652, + "id": 2675, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7090:7:2", + "src": "7425:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16320,43 +17048,43 @@ "visibility": "internal" } ], - "src": "7080:43:2" + "src": "7415:43:5" }, "payable": false, "returnParameters": { - "id": 1657, + "id": 2680, "nodeType": "ParameterList", "parameters": [], - "src": "7163:0:2" + "src": "7498:0:5" }, - "scope": 2226, - "src": "7047:173:2", + "scope": 3265, + "src": "7382:173:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1674, + "id": 2697, "nodeType": "Block", - "src": "7428:41:2", + "src": "7763:41:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1672, + "id": 2695, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1670, + "id": 2693, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "7438:10:2", + "referencedDeclaration": 2351, + "src": "7773:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16366,68 +17094,68 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1671, + "id": 2694, "name": "_timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1665, - "src": "7451:11:2", + "referencedDeclaration": 2688, + "src": "7786:11:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7438:24:2", + "src": "7773:24:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1673, + "id": 2696, "nodeType": "ExpressionStatement", - "src": "7438:24:2" + "src": "7773:24:5" } ] }, "documentation": "@dev Method to allow the owner to change the timeWindow variable\n@param _timeWindow A time window in seconds", - "id": 1675, + "id": 2698, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1668, + "id": 2691, "modifierName": { "argumentTypes": null, - "id": 1667, + "id": 2690, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "7418:9:2", + "referencedDeclaration": 4665, + "src": "7753:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "7418:9:2" + "src": "7753:9:5" } ], "name": "changeTimeWindow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1666, + "id": 2689, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1665, + "id": 2688, "name": "_timeWindow", "nodeType": "VariableDeclaration", - "scope": 1675, - "src": "7388:19:2", + "scope": 2698, + "src": "7723:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16435,10 +17163,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1664, + "id": 2687, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7388:7:2", + "src": "7723:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16448,43 +17176,43 @@ "visibility": "internal" } ], - "src": "7387:21:2" + "src": "7722:21:5" }, "payable": false, "returnParameters": { - "id": 1669, + "id": 2692, "nodeType": "ParameterList", "parameters": [], - "src": "7428:0:2" + "src": "7763:0:5" }, - "scope": 2226, - "src": "7362:107:2", + "scope": 3265, + "src": "7697:107:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1691, + "id": 2714, "nodeType": "Block", - "src": "7744:74:2", + "src": "8079:79:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1687, + "id": 2710, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1682, + "id": 2705, "name": "size", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1680, - "src": "7754:4:2", + "referencedDeclaration": 2703, + "src": "8089:4:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16498,26 +17226,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1683, - "name": "sellerVsBuyers", + "id": 2706, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "7761:14:2", + "referencedDeclaration": 2356, + "src": "8096:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1685, + "id": 2708, "indexExpression": { "argumentTypes": null, - "id": 1684, + "id": 2707, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1677, - "src": "7776:6:2", + "referencedDeclaration": 2700, + "src": "8116:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16528,13 +17256,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "7761:22:2", + "src": "8096:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1686, + "id": 2709, "isConstant": false, "isLValue": true, "isPure": false, @@ -16542,45 +17270,45 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7761:29:2", + "src": "8096:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "7754:36:2", + "src": "8089:41:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1688, + "id": 2711, "nodeType": "ExpressionStatement", - "src": "7754:36:2" + "src": "8089:41:5" }, { "expression": { "argumentTypes": null, - "id": 1689, + "id": 2712, "name": "size", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1680, - "src": "7807:4:2", + "referencedDeclaration": 2703, + "src": "8147:4:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1681, - "id": 1690, + "functionReturnParameters": 2704, + "id": 2713, "nodeType": "Return", - "src": "7800:11:2" + "src": "8140:11:5" } ] }, "documentation": "@dev Returns the number of rewarded buyers associated with a given seller\n@param seller Address of the promoted seller", - "id": 1692, + "id": 2715, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -16588,16 +17316,16 @@ "name": "noOfRewardedBuyers", "nodeType": "FunctionDefinition", "parameters": { - "id": 1678, + "id": 2701, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1677, + "id": 2700, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1692, - "src": "7658:14:2", + "scope": 2715, + "src": "7993:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16605,10 +17333,10 @@ "typeString": "address" }, "typeName": { - "id": 1676, + "id": 2699, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7658:7:2", + "src": "7993:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16618,20 +17346,20 @@ "visibility": "internal" } ], - "src": "7648:30:2" + "src": "7983:30:5" }, "payable": false, "returnParameters": { - "id": 1681, + "id": 2704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1680, + "id": 2703, "name": "size", "nodeType": "VariableDeclaration", - "scope": 1692, - "src": "7726:12:2", + "scope": 2715, + "src": "8061:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16639,10 +17367,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1679, + "id": 2702, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7726:7:2", + "src": "8061:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16652,19 +17380,19 @@ "visibility": "internal" } ], - "src": "7725:14:2" + "src": "8060:14:5" }, - "scope": 2226, - "src": "7621:197:2", + "scope": 3265, + "src": "7956:202:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1721, + "id": 2744, "nodeType": "Block", - "src": "8191:194:2", + "src": "8531:204:5", "statements": [ { "expression": { @@ -16676,7 +17404,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1707, + "id": 2730, "isConstant": false, "isLValue": false, "isPure": false, @@ -16687,26 +17415,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1702, - "name": "sellerVsBuyers", + "id": 2725, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "8222:14:2", + "referencedDeclaration": 2356, + "src": "8562:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1704, + "id": 2727, "indexExpression": { "argumentTypes": null, - "id": 1703, + "id": 2726, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1694, - "src": "8237:6:2", + "referencedDeclaration": 2717, + "src": "8582:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16717,13 +17445,13 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8222:22:2", + "src": "8562:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1705, + "id": 2728, "isConstant": false, "isLValue": true, "isPure": false, @@ -16731,7 +17459,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8222:29:2", + "src": "8562:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16741,18 +17469,18 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1706, + "id": 2729, "name": "index", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1696, - "src": "8254:5:2", + "referencedDeclaration": 2719, + "src": "8599:5:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8222:37:2", + "src": "8562:42:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -16761,14 +17489,14 @@ { "argumentTypes": null, "hexValue": "417272617920696e646578206f7574206f6620626f756e64", - "id": 1708, + "id": 2731, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8273:26:2", + "src": "8618:26:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_b1d904613212264f9084e8698869d0bfef475b2f25afa799450bc6f596eea8f4", @@ -16788,21 +17516,21 @@ "typeString": "literal_string \"Array index out of bound\"" } ], - "id": 1701, + "id": 2724, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8201:7:2", + "referencedDeclaration": 5313, + "src": "8541:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1709, + "id": 2732, "isConstant": false, "isLValue": false, "isPure": false, @@ -16810,32 +17538,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8201:108:2", + "src": "8541:113:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1710, + "id": 2733, "nodeType": "ExpressionStatement", - "src": "8201:108:2" + "src": "8541:113:5" }, { "expression": { "argumentTypes": null, - "id": 1717, + "id": 2740, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1711, + "id": 2734, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1699, - "src": "8319:5:2", + "referencedDeclaration": 2722, + "src": "8664:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16849,26 +17577,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1712, - "name": "sellerVsBuyers", + "id": 2735, + "name": "sellerVsBuyersArray", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "8327:14:2", + "referencedDeclaration": 2356, + "src": "8672:19:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", "typeString": "mapping(address => address[] storage ref)" } }, - "id": 1714, + "id": 2737, "indexExpression": { "argumentTypes": null, - "id": 1713, + "id": 2736, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1694, - "src": "8342:6:2", + "referencedDeclaration": 2717, + "src": "8692:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16879,21 +17607,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8327:22:2", + "src": "8672:27:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage", "typeString": "address[] storage ref" } }, - "id": 1716, + "id": 2739, "indexExpression": { "argumentTypes": null, - "id": 1715, + "id": 2738, "name": "index", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1696, - "src": "8350:5:2", + "referencedDeclaration": 2719, + "src": "8700:5:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16904,45 +17632,45 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "8327:29:2", + "src": "8672:34:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "8319:37:2", + "src": "8664:42:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1718, + "id": 2741, "nodeType": "ExpressionStatement", - "src": "8319:37:2" + "src": "8664:42:5" }, { "expression": { "argumentTypes": null, - "id": 1719, + "id": 2742, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1699, - "src": "8373:5:2", + "referencedDeclaration": 2722, + "src": "8723:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "functionReturnParameters": 1700, - "id": 1720, + "functionReturnParameters": 2723, + "id": 2743, "nodeType": "Return", - "src": "8366:12:2" + "src": "8716:12:5" } ] }, "documentation": "@dev Method to get rewarded buyer address at specific index for a seller\n@param seller Seller for whom the rewarded buyer is requested\n@param index Index at which buyer has to be retrieved", - "id": 1722, + "id": 2745, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -16950,16 +17678,16 @@ "name": "getRewardedBuyer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1697, + "id": 2720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1694, + "id": 2717, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8081:14:2", + "scope": 2745, + "src": "8421:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16967,10 +17695,10 @@ "typeString": "address" }, "typeName": { - "id": 1693, + "id": 2716, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8081:7:2", + "src": "8421:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16981,11 +17709,11 @@ }, { "constant": false, - "id": 1696, + "id": 2719, "name": "index", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8105:13:2", + "scope": 2745, + "src": "8445:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16993,10 +17721,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1695, + "id": 2718, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8105:7:2", + "src": "8445:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17006,20 +17734,20 @@ "visibility": "internal" } ], - "src": "8071:53:2" + "src": "8411:53:5" }, "payable": false, "returnParameters": { - "id": 1700, + "id": 2723, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1699, + "id": 2722, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1722, - "src": "8172:13:2", + "scope": 2745, + "src": "8512:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17027,10 +17755,10 @@ "typeString": "address" }, "typeName": { - "id": 1698, + "id": 2721, "name": "address", "nodeType": "ElementaryTypeName", - "src": "8172:7:2", + "src": "8512:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17040,19 +17768,19 @@ "visibility": "internal" } ], - "src": "8171:15:2" + "src": "8511:15:5" }, - "scope": 2226, - "src": "8046:339:2", + "scope": 3265, + "src": "8386:349:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1740, + "id": 2763, "nodeType": "Block", - "src": "8576:128:2", + "src": "8926:128:5", "statements": [ { "expression": { @@ -17060,7 +17788,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1729, + "id": 2752, "isConstant": false, "isLValue": false, "isPure": false, @@ -17068,15 +17796,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "8594:10:2", + "src": "8944:10:5", "subExpression": { "argumentTypes": null, - "id": 1728, + "id": 2751, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "8595:9:2", + "referencedDeclaration": 2378, + "src": "8945:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17090,14 +17818,14 @@ { "argumentTypes": null, "hexValue": "5265776172647320646973747269627574696f6e20697320616c7265616479206f6e", - "id": 1730, + "id": 2753, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8606:36:2", + "src": "8956:36:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6076ec01a8df3d80acb436fe9e1c9f0fd3ba7f947212ecf4d4da281c3524dbf0", @@ -17117,21 +17845,21 @@ "typeString": "literal_string \"Rewards distribution is already on\"" } ], - "id": 1727, + "id": 2750, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8586:7:2", + "referencedDeclaration": 5313, + "src": "8936:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1731, + "id": 2754, "isConstant": false, "isLValue": false, "isPure": false, @@ -17139,32 +17867,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8586:57:2", + "src": "8936:57:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1732, + "id": 2755, "nodeType": "ExpressionStatement", - "src": "8586:57:2" + "src": "8936:57:5" }, { "expression": { "argumentTypes": null, - "id": 1735, + "id": 2758, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1733, + "id": 2756, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "8654:9:2", + "referencedDeclaration": 2378, + "src": "9004:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17175,14 +17903,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1734, + "id": 2757, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "8666:4:2", + "src": "9016:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -17190,15 +17918,15 @@ }, "value": "true" }, - "src": "8654:16:2", + "src": "9004:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1736, + "id": 2759, "nodeType": "ExpressionStatement", - "src": "8654:16:2" + "src": "9004:16:5" }, { "eventCall": { @@ -17206,18 +17934,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 1737, + "id": 2760, "name": "RewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1398, - "src": "8686:9:2", + "referencedDeclaration": 2410, + "src": "9036:9:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 1738, + "id": 2761, "isConstant": false, "isLValue": false, "isPure": false, @@ -17225,70 +17953,70 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8686:11:2", + "src": "9036:11:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1739, + "id": 2762, "nodeType": "EmitStatement", - "src": "8681:16:2" + "src": "9031:16:5" } ] }, "documentation": "@dev Allows the owner of the contract to turn on the rewards distribution\nOnly if it was not previously turned on", - "id": 1741, + "id": 2764, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1725, + "id": 2748, "modifierName": { "argumentTypes": null, - "id": 1724, + "id": 2747, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "8566:9:2", + "referencedDeclaration": 4665, + "src": "8916:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "8566:9:2" + "src": "8916:9:5" } ], "name": "turnOnRewards", "nodeType": "FunctionDefinition", "parameters": { - "id": 1723, + "id": 2746, "nodeType": "ParameterList", "parameters": [], - "src": "8554:2:2" + "src": "8904:2:5" }, "payable": false, "returnParameters": { - "id": 1726, + "id": 2749, "nodeType": "ParameterList", "parameters": [], - "src": "8576:0:2" + "src": "8926:0:5" }, - "scope": 2226, - "src": "8532:172:2", + "scope": 3265, + "src": "8882:172:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1764, + "id": 2787, "nodeType": "Block", - "src": "8867:202:2", + "src": "9217:202:5", "statements": [ { "expression": { @@ -17300,19 +18028,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1752, + "id": 2775, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1749, + "id": 2772, "name": "_endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1743, - "src": "8898:8:2", + "referencedDeclaration": 2766, + "src": "9248:8:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17324,18 +18052,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1750, + "id": 2773, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "8909:5:2", + "referencedDeclaration": 5299, + "src": "9259:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1751, + "id": 2774, "isConstant": false, "isLValue": false, "isPure": false, @@ -17343,13 +18071,13 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "8909:15:2", + "src": "9259:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8898:26:2", + "src": "9248:26:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17358,14 +18086,14 @@ { "argumentTypes": null, "hexValue": "456e6420646174652073686f756c642062652067726561746572207468616e2063757272656e742064617465", - "id": 1753, + "id": 2776, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "8938:46:2", + "src": "9288:46:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_60fe77c4466ec0f03aae146e7cfce08ed96412e26ce57b46795b5af31d6789df", @@ -17385,21 +18113,21 @@ "typeString": "literal_string \"End date should be greater than current date\"" } ], - "id": 1748, + "id": 2771, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "8877:7:2", + "referencedDeclaration": 5313, + "src": "9227:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1754, + "id": 2777, "isConstant": false, "isLValue": false, "isPure": false, @@ -17407,32 +18135,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8877:117:2", + "src": "9227:117:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1755, + "id": 2778, "nodeType": "ExpressionStatement", - "src": "8877:117:2" + "src": "9227:117:5" }, { "expression": { "argumentTypes": null, - "id": 1758, + "id": 2781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1756, + "id": 2779, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9005:7:2", + "referencedDeclaration": 2380, + "src": "9355:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17442,26 +18170,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1757, + "id": 2780, "name": "_endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1743, - "src": "9015:8:2", + "referencedDeclaration": 2766, + "src": "9365:8:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9005:18:2", + "src": "9355:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1759, + "id": 2782, "nodeType": "ExpressionStatement", - "src": "9005:18:2" + "src": "9355:18:5" }, { "eventCall": { @@ -17469,12 +18197,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1761, + "id": 2784, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9054:7:2", + "referencedDeclaration": 2380, + "src": "9404:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17488,18 +18216,18 @@ "typeString": "uint256" } ], - "id": 1760, + "id": 2783, "name": "EndDateChanged", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1402, - "src": "9039:14:2", + "referencedDeclaration": 2414, + "src": "9389:14:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" } }, - "id": 1762, + "id": 2785, "isConstant": false, "isLValue": false, "isPure": false, @@ -17507,57 +18235,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9039:23:2", + "src": "9389:23:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1763, + "id": 2786, "nodeType": "EmitStatement", - "src": "9034:28:2" + "src": "9384:28:5" } ] }, "documentation": "@dev ALlows owner to set endDate\n@param _endDate date the promotion ends", - "id": 1765, + "id": 2788, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1746, + "id": 2769, "modifierName": { "argumentTypes": null, - "id": 1745, + "id": 2768, "name": "onlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2448, - "src": "8857:9:2", + "referencedDeclaration": 4665, + "src": "9207:9:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "8857:9:2" + "src": "9207:9:5" } ], "name": "setEndDate", "nodeType": "FunctionDefinition", "parameters": { - "id": 1744, + "id": 2767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1743, + "id": 2766, "name": "_endDate", "nodeType": "VariableDeclaration", - "scope": 1765, - "src": "8830:16:2", + "scope": 2788, + "src": "9180:16:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17565,10 +18293,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1742, + "id": 2765, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8830:7:2", + "src": "9180:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17578,43 +18306,43 @@ "visibility": "internal" } ], - "src": "8829:18:2" + "src": "9179:18:5" }, "payable": false, "returnParameters": { - "id": 1747, + "id": 2770, "nodeType": "ParameterList", "parameters": [], - "src": "8867:0:2" + "src": "9217:0:5" }, - "scope": 2226, - "src": "8810:259:2", + "scope": 3265, + "src": "9160:259:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1782, + "id": 2805, "nodeType": "Block", - "src": "9140:91:2", + "src": "9490:91:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1778, + "id": 2801, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1770, + "id": 2793, "name": "running", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1768, - "src": "9150:7:2", + "referencedDeclaration": 2791, + "src": "9500:7:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17628,19 +18356,19 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 1777, + "id": 2800, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1771, + "id": 2794, "name": "rewardsOn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1366, - "src": "9160:9:2", + "referencedDeclaration": 2378, + "src": "9510:9:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17657,19 +18385,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1775, + "id": 2798, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1772, + "id": 2795, "name": "endDate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1368, - "src": "9174:7:2", + "referencedDeclaration": 2380, + "src": "9524:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17681,18 +18409,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1773, + "id": 2796, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "9184:5:2", + "referencedDeclaration": 5299, + "src": "9534:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1774, + "id": 2797, "isConstant": false, "isLValue": false, "isPure": false, @@ -17700,71 +18428,71 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9184:15:2", + "src": "9534:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9174:25:2", + "src": "9524:25:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } } ], - "id": 1776, + "id": 2799, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "9173:27:2", + "src": "9523:27:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "9160:40:2", + "src": "9510:40:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "9150:50:2", + "src": "9500:50:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1779, + "id": 2802, "nodeType": "ExpressionStatement", - "src": "9150:50:2" + "src": "9500:50:5" }, { "expression": { "argumentTypes": null, - "id": 1780, + "id": 2803, "name": "running", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1768, - "src": "9217:7:2", + "referencedDeclaration": 2791, + "src": "9567:7:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1769, - "id": 1781, + "functionReturnParameters": 2792, + "id": 2804, "nodeType": "Return", - "src": "9210:14:2" + "src": "9560:14:5" } ] }, "documentation": null, - "id": 1783, + "id": 2806, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -17772,23 +18500,23 @@ "name": "isRewardsRunning", "nodeType": "FunctionDefinition", "parameters": { - "id": 1766, + "id": 2789, "nodeType": "ParameterList", "parameters": [], - "src": "9100:2:2" + "src": "9450:2:5" }, "payable": false, "returnParameters": { - "id": 1769, + "id": 2792, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1768, + "id": 2791, "name": "running", "nodeType": "VariableDeclaration", - "scope": 1783, - "src": "9126:12:2", + "scope": 2806, + "src": "9476:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17796,10 +18524,10 @@ "typeString": "bool" }, "typeName": { - "id": 1767, + "id": 2790, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "9126:4:2", + "src": "9476:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -17809,35 +18537,35 @@ "visibility": "internal" } ], - "src": "9125:14:2" + "src": "9475:14:5" }, - "scope": 2226, - "src": "9075:156:2", + "scope": 3265, + "src": "9425:156:5", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1814, + "id": 2837, "nodeType": "Block", - "src": "9521:353:2", + "src": "9871:353:5", "statements": [ { "assignments": [ - 1791, - 1793, - 1795, - 1797 + 2814, + 2816, + 2818, + 2820 ], "declarations": [ { "constant": false, - "id": 1791, + "id": 2814, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9545:13:2", + "scope": 2838, + "src": "9895:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17845,10 +18573,10 @@ "typeString": "address" }, "typeName": { - "id": 1790, + "id": 2813, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9545:7:2", + "src": "9895:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17859,11 +18587,11 @@ }, { "constant": false, - "id": 1793, + "id": 2816, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9572:14:2", + "scope": 2838, + "src": "9922:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17871,10 +18599,10 @@ "typeString": "address" }, "typeName": { - "id": 1792, + "id": 2815, "name": "address", "nodeType": "ElementaryTypeName", - "src": "9572:7:2", + "src": "9922:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17885,11 +18613,11 @@ }, { "constant": false, - "id": 1795, + "id": 2818, "name": "status", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9600:12:2", + "scope": 2838, + "src": "9950:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17897,10 +18625,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1794, + "id": 2817, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "9600:5:2", + "src": "9950:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -17911,11 +18639,11 @@ }, { "constant": false, - "id": 1797, + "id": 2820, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9626:20:2", + "scope": 2838, + "src": "9976:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17923,10 +18651,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1796, + "id": 2819, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "9626:7:2", + "src": "9976:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17936,18 +18664,18 @@ "visibility": "internal" } ], - "id": 1801, + "id": 2824, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1799, + "id": 2822, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1785, - "src": "9675:10:2", + "referencedDeclaration": 2808, + "src": "10025:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -17961,18 +18689,18 @@ "typeString": "bytes32" } ], - "id": 1798, + "id": 2821, "name": "_getTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2042, - "src": "9659:15:2", + "referencedDeclaration": 3081, + "src": "10009:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "function (bytes32) view returns (address,address,uint8,uint256)" } }, - "id": 1800, + "id": 2823, "isConstant": false, "isLValue": false, "isPure": false, @@ -17980,31 +18708,31 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9659:27:2", + "src": "10009:27:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "9531:155:2" + "src": "9881:155:5" }, { "expression": { "argumentTypes": null, - "id": 1810, + "id": 2833, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1802, + "id": 2825, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1788, - "src": "9697:6:2", + "referencedDeclaration": 2811, + "src": "10047:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18017,12 +18745,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1804, + "id": 2827, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1785, - "src": "9738:10:2", + "referencedDeclaration": 2808, + "src": "10088:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18030,12 +18758,12 @@ }, { "argumentTypes": null, - "id": 1805, + "id": 2828, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1791, - "src": "9762:5:2", + "referencedDeclaration": 2814, + "src": "10112:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18043,12 +18771,12 @@ }, { "argumentTypes": null, - "id": 1806, + "id": 2829, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1793, - "src": "9781:6:2", + "referencedDeclaration": 2816, + "src": "10131:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18056,12 +18784,12 @@ }, { "argumentTypes": null, - "id": 1807, + "id": 2830, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1795, - "src": "9801:6:2", + "referencedDeclaration": 2818, + "src": "10151:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -18069,12 +18797,12 @@ }, { "argumentTypes": null, - "id": 1808, + "id": 2831, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1797, - "src": "9821:12:2", + "referencedDeclaration": 2820, + "src": "10171:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18104,18 +18832,18 @@ "typeString": "uint256" } ], - "id": 1803, + "id": 2826, "name": "_getTokensToReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2171, - "src": "9706:18:2", + "referencedDeclaration": 3210, + "src": "10056:18:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (uint256)" } }, - "id": 1809, + "id": 2832, "isConstant": false, "isLValue": false, "isPure": false, @@ -18123,45 +18851,45 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9706:137:2", + "src": "10056:137:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "9697:146:2", + "src": "10047:146:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1811, + "id": 2834, "nodeType": "ExpressionStatement", - "src": "9697:146:2" + "src": "10047:146:5" }, { "expression": { "argumentTypes": null, - "id": 1812, + "id": 2835, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1788, - "src": "9861:6:2", + "referencedDeclaration": 2811, + "src": "10211:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 1789, - "id": 1813, + "functionReturnParameters": 2812, + "id": 2836, "nodeType": "Return", - "src": "9854:13:2" + "src": "10204:13:5" } ] }, "documentation": "@dev Buyer can call this method to calculate the reward for their\ntransaction\n@param scriptHash Script hash of the transaction", - "id": 1815, + "id": 2838, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -18169,16 +18897,16 @@ "name": "calculateReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 1786, + "id": 2809, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1785, + "id": 2808, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9431:18:2", + "scope": 2838, + "src": "9781:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18186,10 +18914,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1784, + "id": 2807, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "9431:7:2", + "src": "9781:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18199,20 +18927,20 @@ "visibility": "internal" } ], - "src": "9421:34:2" + "src": "9771:34:5" }, "payable": false, "returnParameters": { - "id": 1789, + "id": 2812, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1788, + "id": 2811, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1815, - "src": "9501:14:2", + "scope": 2838, + "src": "9851:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18220,10 +18948,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1787, + "id": 2810, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "9501:7:2", + "src": "9851:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18233,19 +18961,19 @@ "visibility": "internal" } ], - "src": "9500:16:2" + "src": "9850:16:5" }, - "scope": 2226, - "src": "9397:477:2", + "scope": 3265, + "src": "9747:477:5", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1868, + "id": 2891, "nodeType": "Block", - "src": "10436:590:2", + "src": "10786:590:5", "statements": [ { "expression": { @@ -18253,12 +18981,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1840, + "id": 2863, "name": "sigV", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1818, - "src": "10738:4:2", + "referencedDeclaration": 2841, + "src": "11088:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_memory_ptr", "typeString": "uint8[] memory" @@ -18266,12 +18994,12 @@ }, { "argumentTypes": null, - "id": 1841, + "id": 2864, "name": "sigR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1821, - "src": "10756:4:2", + "referencedDeclaration": 2844, + "src": "11106:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -18279,12 +19007,12 @@ }, { "argumentTypes": null, - "id": 1842, + "id": 2865, "name": "sigS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1824, - "src": "10774:4:2", + "referencedDeclaration": 2847, + "src": "11124:4:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -18292,12 +19020,12 @@ }, { "argumentTypes": null, - "id": 1843, + "id": 2866, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1826, - "src": "10792:10:2", + "referencedDeclaration": 2849, + "src": "11142:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18305,12 +19033,12 @@ }, { "argumentTypes": null, - "id": 1844, + "id": 2867, "name": "destinations", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1829, - "src": "10816:12:2", + "referencedDeclaration": 2852, + "src": "11166:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -18318,12 +19046,12 @@ }, { "argumentTypes": null, - "id": 1845, + "id": 2868, "name": "amounts", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1832, - "src": "10842:7:2", + "referencedDeclaration": 2855, + "src": "11192:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" @@ -18359,32 +19087,32 @@ ], "expression": { "argumentTypes": null, - "id": 1837, + "id": 2860, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "10702:14:2", + "referencedDeclaration": 2374, + "src": "11052:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 1839, + "id": 2862, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "execute", "nodeType": "MemberAccess", - "referencedDeclaration": 1303, - "src": "10702:22:2", + "referencedDeclaration": 1361, + "src": "11052:22:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_uint8_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_array$_t_bytes32_$dyn_memory_ptr_$_t_bytes32_$_t_array$_t_address_$dyn_memory_ptr_$_t_array$_t_uint256_$dyn_memory_ptr_$returns$__$", "typeString": "function (uint8[] memory,bytes32[] memory,bytes32[] memory,bytes32,address[] memory,uint256[] memory) external" } }, - "id": 1846, + "id": 2869, "isConstant": false, "isLValue": false, "isPure": false, @@ -18392,28 +19120,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10702:157:2", + "src": "11052:157:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1847, + "id": 2870, "nodeType": "ExpressionStatement", - "src": "10702:157:2" + "src": "11052:157:5" }, { "assignments": [ - 1851 + 2874 ], "declarations": [ { "constant": false, - "id": 1851, + "id": 2874, "name": "scriptHashes", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10896:29:2", + "scope": 2892, + "src": "11246:29:5", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -18422,19 +19150,19 @@ }, "typeName": { "baseType": { - "id": 1849, + "id": 2872, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10896:7:2", + "src": "11246:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1850, + "id": 2873, "length": null, "nodeType": "ArrayTypeName", - "src": "10896:9:2", + "src": "11246:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -18444,21 +19172,21 @@ "visibility": "internal" } ], - "id": 1857, + "id": 2880, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "31", - "id": 1855, + "id": 2878, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10942:1:2", + "src": "11292:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -18474,39 +19202,39 @@ "typeString": "int_const 1" } ], - "id": 1854, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "NewExpression", - "src": "10928:13:2", + "src": "11278:13:5", "typeDescriptions": { "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bytes32_$dyn_memory_$", "typeString": "function (uint256) pure returns (bytes32[] memory)" }, "typeName": { "baseType": { - "id": 1852, + "id": 2875, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10932:7:2", + "src": "11282:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1853, + "id": 2876, "length": null, "nodeType": "ArrayTypeName", - "src": "10932:9:2", + "src": "11282:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" } } }, - "id": 1856, + "id": 2879, "isConstant": false, "isLValue": false, "isPure": true, @@ -18514,19 +19242,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10928:16:2", + "src": "11278:16:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory", "typeString": "bytes32[] memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "10896:48:2" + "src": "11246:48:5" }, { "expression": { "argumentTypes": null, - "id": 1862, + "id": 2885, "isConstant": false, "isLValue": false, "isPure": false, @@ -18535,29 +19263,29 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1858, + "id": 2881, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "10954:12:2", + "referencedDeclaration": 2874, + "src": "11304:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1860, + "id": 2883, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1859, + "id": 2882, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "10967:1:2", + "src": "11317:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18570,7 +19298,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "10954:15:2", + "src": "11304:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18580,26 +19308,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1861, + "id": 2884, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1826, - "src": "10972:10:2", + "referencedDeclaration": 2849, + "src": "11322:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "src": "10954:28:2", + "src": "11304:28:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1863, + "id": 2886, "nodeType": "ExpressionStatement", - "src": "10954:28:2" + "src": "11304:28:5" }, { "expression": { @@ -18607,12 +19335,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1865, + "id": 2888, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1851, - "src": "11006:12:2", + "referencedDeclaration": 2874, + "src": "11356:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" @@ -18626,18 +19354,18 @@ "typeString": "bytes32[] memory" } ], - "id": 1864, + "id": 2887, "name": "claimRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2011, - "src": "10993:12:2", + "referencedDeclaration": 3050, + "src": "11343:12:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_bytes32_$dyn_memory_ptr_$returns$__$", "typeString": "function (bytes32[] memory)" } }, - "id": 1866, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, @@ -18645,57 +19373,57 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10993:26:2", + "src": "11343:26:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1867, + "id": 2890, "nodeType": "ExpressionStatement", - "src": "10993:26:2" + "src": "11343:26:5" } ] }, "documentation": "@dev Using this method user can choose to execute their transaction and\nclaim their rewards in one go. This will save one transaction.\nUsers can only use this method if their trade is using escrowContract\nfor escrow.\nSee the execute() method Escrow_v1_0.sol for more information.", - "id": 1869, + "id": 2892, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1835, + "id": 2858, "modifierName": { "argumentTypes": null, - "id": 1834, + "id": 2857, "name": "rewardsRunning", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1432, - "src": "10416:14:2", + "referencedDeclaration": 2444, + "src": "10766:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "10416:14:2" + "src": "10766:14:5" } ], "name": "executeAndClaim", "nodeType": "FunctionDefinition", "parameters": { - "id": 1833, + "id": 2856, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1818, + "id": 2841, "name": "sigV", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10239:12:2", + "scope": 2892, + "src": "10589:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18704,19 +19432,19 @@ }, "typeName": { "baseType": { - "id": 1816, + "id": 2839, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "10239:5:2", + "src": "10589:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" } }, - "id": 1817, + "id": 2840, "length": null, "nodeType": "ArrayTypeName", - "src": "10239:7:2", + "src": "10589:7:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint8_$dyn_storage_ptr", "typeString": "uint8[]" @@ -18727,11 +19455,11 @@ }, { "constant": false, - "id": 1821, + "id": 2844, "name": "sigR", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10261:14:2", + "scope": 2892, + "src": "10611:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18740,19 +19468,19 @@ }, "typeName": { "baseType": { - "id": 1819, + "id": 2842, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10261:7:2", + "src": "10611:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1820, + "id": 2843, "length": null, "nodeType": "ArrayTypeName", - "src": "10261:9:2", + "src": "10611:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -18763,11 +19491,11 @@ }, { "constant": false, - "id": 1824, + "id": 2847, "name": "sigS", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10285:14:2", + "scope": 2892, + "src": "10635:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18776,19 +19504,19 @@ }, "typeName": { "baseType": { - "id": 1822, + "id": 2845, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10285:7:2", + "src": "10635:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1823, + "id": 2846, "length": null, "nodeType": "ArrayTypeName", - "src": "10285:9:2", + "src": "10635:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -18799,11 +19527,11 @@ }, { "constant": false, - "id": 1826, + "id": 2849, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10309:18:2", + "scope": 2892, + "src": "10659:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18811,10 +19539,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1825, + "id": 2848, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "10309:7:2", + "src": "10659:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -18825,11 +19553,11 @@ }, { "constant": false, - "id": 1829, + "id": 2852, "name": "destinations", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10337:22:2", + "scope": 2892, + "src": "10687:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18838,19 +19566,19 @@ }, "typeName": { "baseType": { - "id": 1827, + "id": 2850, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10337:7:2", + "src": "10687:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1828, + "id": 2851, "length": null, "nodeType": "ArrayTypeName", - "src": "10337:9:2", + "src": "10687:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -18861,11 +19589,11 @@ }, { "constant": false, - "id": 1832, + "id": 2855, "name": "amounts", "nodeType": "VariableDeclaration", - "scope": 1869, - "src": "10369:17:2", + "scope": 2892, + "src": "10719:17:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18874,19 +19602,19 @@ }, "typeName": { "baseType": { - "id": 1830, + "id": 2853, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "10369:7:2", + "src": "10719:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1831, + "id": 2854, "length": null, "nodeType": "ArrayTypeName", - "src": "10369:9:2", + "src": "10719:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -18896,26 +19624,26 @@ "visibility": "internal" } ], - "src": "10229:163:2" + "src": "10579:163:5" }, "payable": false, "returnParameters": { - "id": 1836, + "id": 2859, "nodeType": "ParameterList", "parameters": [], - "src": "10436:0:2" + "src": "10786:0:5" }, - "scope": 2226, - "src": "10205:821:2", + "scope": 3265, + "src": "10555:821:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2010, + "id": 3049, "nodeType": "Block", - "src": "11524:1934:2", + "src": "11874:2069:5", "statements": [ { "expression": { @@ -18927,7 +19655,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1881, + "id": 2904, "isConstant": false, "isLValue": false, "isPure": false, @@ -18936,18 +19664,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1878, + "id": 2901, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11543:12:2", + "referencedDeclaration": 2895, + "src": "11893:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1879, + "id": 2902, "isConstant": false, "isLValue": false, "isPure": false, @@ -18955,7 +19683,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11543:19:2", + "src": "11893:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18966,14 +19694,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1880, + "id": 2903, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11565:1:2", + "src": "11915:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -18981,7 +19709,7 @@ }, "value": "0" }, - "src": "11543:23:2", + "src": "11893:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -18990,14 +19718,14 @@ { "argumentTypes": null, "hexValue": "4e6f20736372697074206861736820706173736564", - "id": 1882, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "11568:23:2", + "src": "11918:23:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_46f8f41d098c030bb008cbdf4a24767aacc6d5cef61408f79aaf44cad7d495f2", @@ -19017,21 +19745,21 @@ "typeString": "literal_string \"No script hash passed\"" } ], - "id": 1877, + "id": 2900, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 2532, - 2533 + 5312, + 5313 ], - "referencedDeclaration": 2533, - "src": "11535:7:2", + "referencedDeclaration": 5313, + "src": "11885:7:5", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1883, + "id": 2906, "isConstant": false, "isLValue": false, "isPure": false, @@ -19039,37 +19767,37 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11535:57:2", + "src": "11885:57:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1884, + "id": 2907, "nodeType": "ExpressionStatement", - "src": "11535:57:2" + "src": "11885:57:5" }, { "body": { - "id": 2008, + "id": 3047, "nodeType": "Block", - "src": "11653:1798:2", + "src": "12003:1933:5", "statements": [ { "assignments": [ - 1897, - 1899, - 1901, - 1903 + 2920, + 2922, + 2924, + 2926 ], "declarations": [ { "constant": false, - "id": 1897, + "id": 2920, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11744:13:2", + "scope": 3050, + "src": "12094:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19077,10 +19805,10 @@ "typeString": "address" }, "typeName": { - "id": 1896, + "id": 2919, "name": "address", "nodeType": "ElementaryTypeName", - "src": "11744:7:2", + "src": "12094:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19091,11 +19819,11 @@ }, { "constant": false, - "id": 1899, + "id": 2922, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11775:14:2", + "scope": 3050, + "src": "12125:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19103,10 +19831,10 @@ "typeString": "address" }, "typeName": { - "id": 1898, + "id": 2921, "name": "address", "nodeType": "ElementaryTypeName", - "src": "11775:7:2", + "src": "12125:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19117,11 +19845,11 @@ }, { "constant": false, - "id": 1901, + "id": 2924, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11807:12:2", + "scope": 3050, + "src": "12157:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19129,10 +19857,10 @@ "typeString": "uint8" }, "typeName": { - "id": 1900, + "id": 2923, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "11807:5:2", + "src": "12157:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -19143,11 +19871,11 @@ }, { "constant": false, - "id": 1903, + "id": 2926, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11837:20:2", + "scope": 3050, + "src": "12187:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19155,10 +19883,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1902, + "id": 2925, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "11837:7:2", + "src": "12187:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19168,7 +19896,7 @@ "visibility": "internal" } ], - "id": 1909, + "id": 2932, "initialValue": { "argumentTypes": null, "arguments": [ @@ -19176,26 +19904,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1905, + "id": 2928, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11890:12:2", + "referencedDeclaration": 2895, + "src": "12240:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1907, + "id": 2930, "indexExpression": { "argumentTypes": null, - "id": 1906, + "id": 2929, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11903:1:2", + "referencedDeclaration": 2909, + "src": "12253:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19206,7 +19934,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "11890:15:2", + "src": "12240:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19220,18 +19948,18 @@ "typeString": "bytes32" } ], - "id": 1904, + "id": 2927, "name": "_getTransaction", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2042, - "src": "11874:15:2", + "referencedDeclaration": 3081, + "src": "12224:15:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "function (bytes32) view returns (address,address,uint8,uint256)" } }, - "id": 1908, + "id": 2931, "isConstant": false, "isLValue": false, "isPure": false, @@ -19239,27 +19967,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11874:32:2", + "src": "12224:32:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "11726:180:2" + "src": "12076:180:5" }, { "assignments": [ - 1911 + 2934 ], "declarations": [ { "constant": false, - "id": 1911, + "id": 2934, "name": "rewardAmount", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "12194:20:2", + "scope": 3050, + "src": "12544:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19267,10 +19995,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1910, + "id": 2933, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "12194:7:2", + "src": "12544:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19280,7 +20008,7 @@ "visibility": "internal" } ], - "id": 1921, + "id": 2944, "initialValue": { "argumentTypes": null, "arguments": [ @@ -19288,26 +20016,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1913, + "id": 2936, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "12253:12:2", + "referencedDeclaration": 2895, + "src": "12603:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1915, + "id": 2938, "indexExpression": { "argumentTypes": null, - "id": 1914, + "id": 2937, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "12266:1:2", + "referencedDeclaration": 2909, + "src": "12616:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19318,7 +20046,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12253:15:2", + "src": "12603:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19326,12 +20054,12 @@ }, { "argumentTypes": null, - "id": 1916, + "id": 2939, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12286:5:2", + "referencedDeclaration": 2920, + "src": "12636:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19339,12 +20067,12 @@ }, { "argumentTypes": null, - "id": 1917, + "id": 2940, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12309:6:2", + "referencedDeclaration": 2922, + "src": "12659:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19352,12 +20080,12 @@ }, { "argumentTypes": null, - "id": 1918, + "id": 2941, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1901, - "src": "12333:6:2", + "referencedDeclaration": 2924, + "src": "12683:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -19365,12 +20093,12 @@ }, { "argumentTypes": null, - "id": 1919, + "id": 2942, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1903, - "src": "12357:12:2", + "referencedDeclaration": 2926, + "src": "12707:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19400,18 +20128,18 @@ "typeString": "uint256" } ], - "id": 1912, + "id": 2935, "name": "_getTokensToReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2171, - "src": "12217:18:2", + "referencedDeclaration": 3210, + "src": "12567:18:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (uint256)" } }, - "id": 1920, + "id": 2943, "isConstant": false, "isLValue": false, "isPure": false, @@ -19419,27 +20147,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12217:166:2", + "src": "12567:166:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12194:189:2" + "src": "12544:189:5" }, { "assignments": [ - 1923 + 2946 ], "declarations": [ { "constant": false, - "id": 1923, + "id": 2946, "name": "contractBalance", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "12398:23:2", + "scope": 3050, + "src": "12748:23:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19447,10 +20175,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1922, + "id": 2945, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "12398:7:2", + "src": "12748:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19460,20 +20188,20 @@ "visibility": "internal" } ], - "id": 1928, + "id": 2951, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1926, + "id": 2949, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2552, - "src": "12442:4:2", + "referencedDeclaration": 5340, + "src": "12792:4:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } } @@ -19481,38 +20209,38 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_OBRewards_$2226", + "typeIdentifier": "t_contract$_OBRewards_$3265", "typeString": "contract OBRewards" } ], "expression": { "argumentTypes": null, - "id": 1924, + "id": 2947, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "12424:7:2", + "referencedDeclaration": 2376, + "src": "12774:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 1925, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 2235, - "src": "12424:17:2", + "referencedDeclaration": 4403, + "src": "12774:17:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 1927, + "id": 2950, "isConstant": false, "isLValue": false, "isPure": false, @@ -19520,14 +20248,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12424:23:2", + "src": "12774:23:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "12398:49:2" + "src": "12748:49:5" }, { "condition": { @@ -19536,19 +20264,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1931, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1929, + "id": 2952, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12466:12:2", + "referencedDeclaration": 2934, + "src": "12816:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19558,48 +20286,48 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 1930, + "id": 2953, "name": "contractBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1923, - "src": "12481:15:2", + "referencedDeclaration": 2946, + "src": "12831:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12466:30:2", + "src": "12816:30:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1937, + "id": 2960, "nodeType": "IfStatement", - "src": "12462:99:2", + "src": "12812:99:5", "trueBody": { - "id": 1936, + "id": 2959, "nodeType": "Block", - "src": "12498:63:2", + "src": "12848:63:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 1934, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1932, + "id": 2955, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12516:12:2", + "referencedDeclaration": 2934, + "src": "12866:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19609,26 +20337,26 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1933, + "id": 2956, "name": "contractBalance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1923, - "src": "12531:15:2", + "referencedDeclaration": 2946, + "src": "12881:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12516:30:2", + "src": "12866:30:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1935, + "id": 2958, "nodeType": "ExpressionStatement", - "src": "12516:30:2" + "src": "12866:30:5" } ] } @@ -19640,19 +20368,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1940, + "id": 2963, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1938, + "id": 2961, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12579:12:2", + "referencedDeclaration": 2934, + "src": "12929:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19663,14 +20391,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1939, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "12595:1:2", + "src": "12945:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -19678,20 +20406,20 @@ }, "value": "0" }, - "src": "12579:17:2", + "src": "12929:17:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1951, + "id": 2974, "nodeType": "IfStatement", - "src": "12575:136:2", + "src": "12925:136:5", "trueBody": { - "id": 1950, + "id": 2973, "nodeType": "Block", - "src": "12598:113:2", + "src": "12948:113:5", "statements": [ { "eventCall": { @@ -19701,26 +20429,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1942, + "id": 2965, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "12639:12:2", + "referencedDeclaration": 2895, + "src": "12989:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1944, + "id": 2967, "indexExpression": { "argumentTypes": null, - "id": 1943, + "id": 2966, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "12652:1:2", + "referencedDeclaration": 2909, + "src": "13002:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19731,7 +20459,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12639:15:2", + "src": "12989:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -19739,12 +20467,12 @@ }, { "argumentTypes": null, - "id": 1945, + "id": 2968, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12656:6:2", + "referencedDeclaration": 2922, + "src": "13006:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19752,12 +20480,12 @@ }, { "argumentTypes": null, - "id": 1946, + "id": 2969, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12664:5:2", + "referencedDeclaration": 2920, + "src": "13014:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19779,18 +20507,18 @@ "typeString": "address" } ], - "id": 1941, + "id": 2964, "name": "UnsuccessfulClaim", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1386, - "src": "12621:17:2", + "referencedDeclaration": 2398, + "src": "12971:17:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_address_$returns$__$", "typeString": "function (bytes32,address,address)" } }, - "id": 1947, + "id": 2970, "isConstant": false, "isLValue": false, "isPure": false, @@ -19798,73 +20526,62 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12621:49:2", + "src": "12971:49:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1948, + "id": 2971, "nodeType": "EmitStatement", - "src": "12616:54:2" + "src": "12966:54:5" }, { - "id": 1949, + "id": 2972, "nodeType": "Continue", - "src": "12688:8:2" + "src": "13038:8:5" } ] } }, { - "expression": { + "condition": { "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 1956, - "name": "buyer", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12783:5:2", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { + "id": 2980, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "nodeType": "UnaryOperation", + "operator": "!", + "prefix": true, + "src": "13109:34:5", + "subExpression": { + "argumentTypes": null, + "baseExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1952, - "name": "sellerVsBuyers", + "id": 2975, + "name": "sellerVsBuyersBool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1350, - "src": "12755:14:2", + "referencedDeclaration": 2362, + "src": "13110:18:5", "typeDescriptions": { - "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", - "typeString": "mapping(address => address[] storage ref)" + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" } }, - "id": 1954, + "id": 2977, "indexExpression": { "argumentTypes": null, - "id": 1953, + "id": 2976, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12770:6:2", + "referencedDeclaration": 2922, + "src": "13129:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19875,48 +20592,260 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12755:22:2", + "src": "13110:26:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + } + }, + "id": 2979, + "indexExpression": { + "argumentTypes": null, + "id": 2978, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13137:5:5", "typeDescriptions": { - "typeIdentifier": "t_array$_t_address_$dyn_storage", - "typeString": "address[] storage ref" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 1955, "isConstant": false, - "isLValue": false, + "isLValue": true, "isPure": false, "lValueRequested": false, - "memberName": "push", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "12755:27:2", + "nodeType": "IndexAccess", + "src": "13110:33:5", "typeDescriptions": { - "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) returns (uint256)" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 1957, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12755:34:2", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 1958, - "nodeType": "ExpressionStatement", - "src": "12755:34:2" + "falseBody": null, + "id": 2997, + "nodeType": "IfStatement", + "src": "13105:170:5", + "trueBody": { + "id": 2996, + "nodeType": "Block", + "src": "13145:130:5", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 2987, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2981, + "name": "sellerVsBuyersBool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2362, + "src": "13163:18:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$", + "typeString": "mapping(address => mapping(address => bool))" + } + }, + "id": 2984, + "indexExpression": { + "argumentTypes": null, + "id": 2982, + "name": "seller", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2922, + "src": "13182:6:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "13163:26:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", + "typeString": "mapping(address => bool)" + } + }, + "id": 2985, + "indexExpression": { + "argumentTypes": null, + "id": 2983, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13190:5:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, + "nodeType": "IndexAccess", + "src": "13163:33:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "hexValue": "74727565", + "id": 2986, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "bool", + "lValueRequested": false, + "nodeType": "Literal", + "src": "13199:4:5", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + "value": "true" + }, + "src": "13163:40:5", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "id": 2988, + "nodeType": "ExpressionStatement", + "src": "13163:40:5" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2993, + "name": "buyer", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2920, + "src": "13254:5:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "expression": { + "argumentTypes": null, + "baseExpression": { + "argumentTypes": null, + "id": 2989, + "name": "sellerVsBuyersArray", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2356, + "src": "13221:19:5", + "typeDescriptions": { + "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_address_$dyn_storage_$", + "typeString": "mapping(address => address[] storage ref)" + } + }, + "id": 2991, + "indexExpression": { + "argumentTypes": null, + "id": 2990, + "name": "seller", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2922, + "src": "13241:6:5", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "nodeType": "IndexAccess", + "src": "13221:27:5", + "typeDescriptions": { + "typeIdentifier": "t_array$_t_address_$dyn_storage", + "typeString": "address[] storage ref" + } + }, + "id": 2992, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "push", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "13221:32:5", + "typeDescriptions": { + "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$", + "typeString": "function (address) returns (uint256)" + } + }, + "id": 2994, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13221:39:5", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2995, + "nodeType": "ExpressionStatement", + "src": "13221:39:5" + } + ] + } }, { "expression": { "argumentTypes": null, - "id": 1972, + "id": 3011, "isConstant": false, "isLValue": false, "isPure": false, @@ -19927,26 +20856,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1959, + "id": 2998, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "12804:20:2", + "referencedDeclaration": 2368, + "src": "13289:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1962, + "id": 3001, "indexExpression": { "argumentTypes": null, - "id": 1960, + "id": 2999, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12825:6:2", + "referencedDeclaration": 2922, + "src": "13310:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19957,21 +20886,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12804:28:2", + "src": "13289:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1963, + "id": 3002, "indexExpression": { "argumentTypes": null, - "id": 1961, + "id": 3000, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12833:5:2", + "referencedDeclaration": 2920, + "src": "13318:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19982,7 +20911,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "12804:35:2", + "src": "13289:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19995,12 +20924,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1970, + "id": 3009, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "12942:12:2", + "referencedDeclaration": 2934, + "src": "13427:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20020,26 +20949,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1964, + "id": 3003, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "12842:20:2", + "referencedDeclaration": 2368, + "src": "13327:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 1966, + "id": 3005, "indexExpression": { "argumentTypes": null, - "id": 1965, + "id": 3004, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12880:6:2", + "referencedDeclaration": 2922, + "src": "13365:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20050,21 +20979,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12842:58:2", + "src": "13327:58:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1968, + "id": 3007, "indexExpression": { "argumentTypes": null, - "id": 1967, + "id": 3006, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "12918:5:2", + "referencedDeclaration": 2920, + "src": "13403:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20075,27 +21004,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "12842:95:2", + "src": "13327:95:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1969, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "12842:99:2", + "referencedDeclaration": 4601, + "src": "13327:99:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1971, + "id": 3010, "isConstant": false, "isLValue": false, "isPure": false, @@ -20103,26 +21032,26 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12842:113:2", + "src": "13327:113:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12804:151:2", + "src": "13289:151:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1973, + "id": 3012, "nodeType": "ExpressionStatement", - "src": "12804:151:2" + "src": "13289:151:5" }, { "expression": { "argumentTypes": null, - "id": 1983, + "id": 3022, "isConstant": false, "isLValue": false, "isPure": false, @@ -20131,26 +21060,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1974, + "id": 3013, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "12970:26:2", + "referencedDeclaration": 2372, + "src": "13455:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1976, + "id": 3015, "indexExpression": { "argumentTypes": null, - "id": 1975, + "id": 3014, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "12997:6:2", + "referencedDeclaration": 2922, + "src": "13482:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20161,7 +21090,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "12970:34:2", + "src": "13455:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20174,12 +21103,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1981, + "id": 3020, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13076:12:2", + "referencedDeclaration": 2934, + "src": "13561:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20197,26 +21126,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1977, + "id": 3016, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "13007:26:2", + "referencedDeclaration": 2372, + "src": "13492:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 1979, + "id": 3018, "indexExpression": { "argumentTypes": null, - "id": 1978, + "id": 3017, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "13051:6:2", + "referencedDeclaration": 2922, + "src": "13536:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20227,27 +21156,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13007:64:2", + "src": "13492:64:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1980, + "id": 3019, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "13007:68:2", + "referencedDeclaration": 4601, + "src": "13492:68:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1982, + "id": 3021, "isConstant": false, "isLValue": false, "isPure": false, @@ -20255,38 +21184,38 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13007:82:2", + "src": "13492:82:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12970:119:2", + "src": "13455:119:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1984, + "id": 3023, "nodeType": "ExpressionStatement", - "src": "12970:119:2" + "src": "13455:119:5" }, { "expression": { "argumentTypes": null, - "id": 1990, + "id": 3029, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1985, + "id": 3024, "name": "totalTokensDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1343, - "src": "13104:22:2", + "referencedDeclaration": 2349, + "src": "13589:22:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20299,12 +21228,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1988, + "id": 3027, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13156:12:2", + "referencedDeclaration": 2934, + "src": "13641:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20320,32 +21249,32 @@ ], "expression": { "argumentTypes": null, - "id": 1986, + "id": 3025, "name": "totalTokensDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1343, - "src": "13129:22:2", + "referencedDeclaration": 2349, + "src": "13614:22:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1987, + "id": 3026, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "13129:26:2", + "referencedDeclaration": 4601, + "src": "13614:26:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 1989, + "id": 3028, "isConstant": false, "isLValue": false, "isPure": false, @@ -20353,21 +21282,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13129:40:2", + "src": "13614:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "13104:65:2", + "src": "13589:65:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1991, + "id": 3030, "nodeType": "ExpressionStatement", - "src": "13104:65:2" + "src": "13589:65:5" }, { "eventCall": { @@ -20377,26 +21306,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1993, + "id": 3032, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "13250:12:2", + "referencedDeclaration": 2895, + "src": "13735:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1995, + "id": 3034, "indexExpression": { "argumentTypes": null, - "id": 1994, + "id": 3033, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "13263:1:2", + "referencedDeclaration": 2909, + "src": "13748:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20407,7 +21336,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "13250:15:2", + "src": "13735:15:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20415,12 +21344,12 @@ }, { "argumentTypes": null, - "id": 1996, + "id": 3035, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1899, - "src": "13283:6:2", + "referencedDeclaration": 2922, + "src": "13768:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20428,12 +21357,12 @@ }, { "argumentTypes": null, - "id": 1997, + "id": 3036, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "13307:5:2", + "referencedDeclaration": 2920, + "src": "13792:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20441,12 +21370,12 @@ }, { "argumentTypes": null, - "id": 1998, + "id": 3037, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13330:12:2", + "referencedDeclaration": 2934, + "src": "13815:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20472,18 +21401,18 @@ "typeString": "uint256" } ], - "id": 1992, + "id": 3031, "name": "SuccessfulClaim", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1378, - "src": "13217:15:2", + "referencedDeclaration": 2390, + "src": "13702:15:5", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (bytes32,address,address,uint256)" } }, - "id": 1999, + "id": 3038, "isConstant": false, "isLValue": false, "isPure": false, @@ -20491,15 +21420,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13217:139:2", + "src": "13702:139:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2000, + "id": 3039, "nodeType": "EmitStatement", - "src": "13212:144:2" + "src": "13697:144:5" }, { "expression": { @@ -20507,12 +21436,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2004, + "id": 3043, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1897, - "src": "13420:5:2", + "referencedDeclaration": 2920, + "src": "13905:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20520,12 +21449,12 @@ }, { "argumentTypes": null, - "id": 2005, + "id": 3044, "name": "rewardAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1911, - "src": "13427:12:2", + "referencedDeclaration": 2934, + "src": "13912:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20545,32 +21474,32 @@ ], "expression": { "argumentTypes": null, - "id": 2001, + "id": 3040, "name": "obToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1364, - "src": "13403:7:2", + "referencedDeclaration": 2376, + "src": "13888:7:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_ITokenContract_$2277", + "typeIdentifier": "t_contract$_ITokenContract_$4445", "typeString": "contract ITokenContract" } }, - "id": 2003, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transfer", "nodeType": "MemberAccess", - "referencedDeclaration": 2244, - "src": "13403:16:2", + "referencedDeclaration": 4412, + "src": "13888:16:5", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2006, + "id": 3045, "isConstant": false, "isLValue": false, "isPure": false, @@ -20578,15 +21507,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13403:37:2", + "src": "13888:37:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2007, + "id": 3046, "nodeType": "ExpressionStatement", - "src": "13403:37:2" + "src": "13888:37:5" } ] }, @@ -20596,19 +21525,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1892, + "id": 2915, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1889, + "id": 2912, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11623:1:2", + "referencedDeclaration": 2909, + "src": "11973:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20620,18 +21549,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1890, + "id": 2913, "name": "scriptHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1872, - "src": "11627:12:2", + "referencedDeclaration": 2895, + "src": "11977:12:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_memory_ptr", "typeString": "bytes32[] memory" } }, - "id": 1891, + "id": 2914, "isConstant": false, "isLValue": false, "isPure": false, @@ -20639,31 +21568,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "11627:19:2", + "src": "11977:19:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "11623:23:2", + "src": "11973:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2009, + "id": 3048, "initializationExpression": { "assignments": [ - 1886 + 2909 ], "declarations": [ { "constant": false, - "id": 1886, + "id": 2909, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11608:9:2", + "scope": 3050, + "src": "11958:9:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20671,10 +21600,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1885, + "id": 2908, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "11608:7:2", + "src": "11958:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20684,18 +21613,18 @@ "visibility": "internal" } ], - "id": 1888, + "id": 2911, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1887, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "11620:1:2", + "src": "11970:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -20704,12 +21633,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "11608:13:2" + "src": "11958:13:5" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1894, + "id": 2917, "isConstant": false, "isLValue": false, "isPure": false, @@ -20717,15 +21646,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "11648:3:2", + "src": "11998:3:5", "subExpression": { "argumentTypes": null, - "id": 1893, + "id": 2916, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1886, - "src": "11648:1:2", + "referencedDeclaration": 2909, + "src": "11998:1:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20736,54 +21665,54 @@ "typeString": "uint256" } }, - "id": 1895, + "id": 2918, "nodeType": "ExpressionStatement", - "src": "11648:3:2" + "src": "11998:3:5" }, "nodeType": "ForStatement", - "src": "11603:1848:2" + "src": "11953:1983:5" } ] }, "documentation": "@dev Function to claim tokens\n@param scriptHashes Array of scriptHashes of OB trades for which\nthe buyer wants to claim reward tokens.\nNote that a Buyer can perform trades with multiple promoted sellers and\nthen can claim their reward tokens all at once for all those trades using\nthis function.\nBe mindful of the block gas limit (do not pass too many scripthashes).", - "id": 2011, + "id": 3050, "implemented": true, "isConstructor": false, "isDeclaredConst": false, "modifiers": [ { "arguments": null, - "id": 1875, + "id": 2898, "modifierName": { "argumentTypes": null, - "id": 1874, + "id": 2897, "name": "rewardsRunning", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1432, - "src": "11509:14:2", + "referencedDeclaration": 2444, + "src": "11859:14:5", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "11509:14:2" + "src": "11859:14:5" } ], "name": "claimRewards", "nodeType": "FunctionDefinition", "parameters": { - "id": 1873, + "id": 2896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1872, + "id": 2895, "name": "scriptHashes", "nodeType": "VariableDeclaration", - "scope": 2011, - "src": "11478:22:2", + "scope": 3050, + "src": "11828:22:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20792,19 +21721,19 @@ }, "typeName": { "baseType": { - "id": 1870, + "id": 2893, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "11478:7:2", + "src": "11828:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1871, + "id": 2894, "length": null, "nodeType": "ArrayTypeName", - "src": "11478:9:2", + "src": "11828:9:5", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -20814,31 +21743,31 @@ "visibility": "internal" } ], - "src": "11477:24:2" + "src": "11827:24:5" }, "payable": false, "returnParameters": { - "id": 1876, + "id": 2899, "nodeType": "ParameterList", "parameters": [], - "src": "11524:0:2" + "src": "11874:0:5" }, - "scope": 2226, - "src": "11456:2002:2", + "scope": 3265, + "src": "11806:2137:5", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2041, + "id": 3080, "nodeType": "Block", - "src": "13776:296:2", + "src": "14261:296:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2033, + "id": 3072, "isConstant": false, "isLValue": false, "isPure": false, @@ -20849,12 +21778,12 @@ null, { "argumentTypes": null, - "id": 2024, + "id": 3063, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2022, - "src": "13868:12:2", + "referencedDeclaration": 3061, + "src": "14353:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20862,12 +21791,12 @@ }, { "argumentTypes": null, - "id": 2025, + "id": 3064, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2020, - "src": "13894:6:2", + "referencedDeclaration": 3059, + "src": "14379:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -20878,12 +21807,12 @@ null, { "argumentTypes": null, - "id": 2026, + "id": 3065, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2016, - "src": "13930:5:2", + "referencedDeclaration": 3055, + "src": "14415:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20891,12 +21820,12 @@ }, { "argumentTypes": null, - "id": 2027, + "id": 3066, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2018, - "src": "13949:6:2", + "referencedDeclaration": 3057, + "src": "14434:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -20904,14 +21833,14 @@ }, null ], - "id": 2028, + "id": 3067, "isConstant": false, "isInlineArray": false, "isLValue": true, "isPure": false, "lValueRequested": true, "nodeType": "TupleExpression", - "src": "13840:127:2", + "src": "14325:127:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$_t_uint256_$_t_uint8_$__$__$__$_t_address_$_t_address_$__$", "typeString": "tuple(,uint256,uint8,,,,address,address,)" @@ -20924,12 +21853,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2031, + "id": 3070, "name": "_scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2013, - "src": "13998:11:2", + "referencedDeclaration": 3052, + "src": "14483:11:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -20945,32 +21874,32 @@ ], "expression": { "argumentTypes": null, - "id": 2029, + "id": 3068, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "13970:14:2", + "referencedDeclaration": 2374, + "src": "14455:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2030, + "id": 3069, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "transactions", "nodeType": "MemberAccess", - "referencedDeclaration": 1233, - "src": "13970:27:2", + "referencedDeclaration": 1291, + "src": "14455:27:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint8_$_t_uint8_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint8,uint8,uint8,uint32,address,address,address)" } }, - "id": 2032, + "id": 3071, "isConstant": false, "isLValue": false, "isPure": false, @@ -20978,21 +21907,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13970:40:2", + "src": "14455:40:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint8_$_t_uint8_$_t_uint8_$_t_uint32_$_t_address_$_t_address_$_t_address_$", "typeString": "tuple(uint256,uint256,uint8,uint8,uint8,uint32,address,address,address)" } }, - "src": "13840:170:2", + "src": "14325:170:5", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2034, + "id": 3073, "nodeType": "ExpressionStatement", - "src": "13840:170:2" + "src": "14325:170:5" }, { "expression": { @@ -21000,12 +21929,12 @@ "components": [ { "argumentTypes": null, - "id": 2035, + "id": 3074, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2016, - "src": "14029:5:2", + "referencedDeclaration": 3055, + "src": "14514:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21013,12 +21942,12 @@ }, { "argumentTypes": null, - "id": 2036, + "id": 3075, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2018, - "src": "14036:6:2", + "referencedDeclaration": 3057, + "src": "14521:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21026,12 +21955,12 @@ }, { "argumentTypes": null, - "id": 2037, + "id": 3076, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2020, - "src": "14044:6:2", + "referencedDeclaration": 3059, + "src": "14529:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -21039,40 +21968,40 @@ }, { "argumentTypes": null, - "id": 2038, + "id": 3077, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2022, - "src": "14052:12:2", + "referencedDeclaration": 3061, + "src": "14537:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 2039, + "id": 3078, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "14028:37:2", + "src": "14513:37:5", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint8_$_t_uint256_$", "typeString": "tuple(address,address,uint8,uint256)" } }, - "functionReturnParameters": 2023, - "id": 2040, + "functionReturnParameters": 3062, + "id": 3079, "nodeType": "Return", - "src": "14021:44:2" + "src": "14506:44:5" } ] }, "documentation": null, - "id": 2042, + "id": 3081, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -21080,16 +22009,16 @@ "name": "_getTransaction", "nodeType": "FunctionDefinition", "parameters": { - "id": 2014, + "id": 3053, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2013, + "id": 3052, "name": "_scriptHash", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13572:19:2", + "scope": 3081, + "src": "14057:19:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21097,10 +22026,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2012, + "id": 3051, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "13572:7:2", + "src": "14057:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21110,20 +22039,20 @@ "visibility": "internal" } ], - "src": "13562:35:2" + "src": "14047:35:5" }, "payable": false, "returnParameters": { - "id": 2023, + "id": 3062, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2016, + "id": 3055, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13656:13:2", + "scope": 3081, + "src": "14141:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21131,10 +22060,10 @@ "typeString": "address" }, "typeName": { - "id": 2015, + "id": 3054, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13656:7:2", + "src": "14141:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21145,11 +22074,11 @@ }, { "constant": false, - "id": 2018, + "id": 3057, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13683:14:2", + "scope": 3081, + "src": "14168:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21157,10 +22086,10 @@ "typeString": "address" }, "typeName": { - "id": 2017, + "id": 3056, "name": "address", "nodeType": "ElementaryTypeName", - "src": "13683:7:2", + "src": "14168:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21171,11 +22100,11 @@ }, { "constant": false, - "id": 2020, + "id": 3059, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13711:12:2", + "scope": 3081, + "src": "14196:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21183,10 +22112,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2019, + "id": 3058, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "13711:5:2", + "src": "14196:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -21197,11 +22126,11 @@ }, { "constant": false, - "id": 2022, + "id": 3061, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2042, - "src": "13737:20:2", + "scope": 3081, + "src": "14222:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -21209,10 +22138,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2021, + "id": 3060, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "13737:7:2", + "src": "14222:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21222,36 +22151,36 @@ "visibility": "internal" } ], - "src": "13642:125:2" + "src": "14127:125:5" }, - "scope": 2226, - "src": "13538:534:2", + "scope": 3265, + "src": "14023:534:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2130, + "id": 3169, "nodeType": "Block", - "src": "14924:1247:2", + "src": "15409:1247:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2059, + "id": 3098, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2057, + "id": 3096, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "14935:8:2", + "referencedDeclaration": 3094, + "src": "15420:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21262,14 +22191,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 2058, + "id": 3097, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "14946:4:2", + "src": "15431:4:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21277,15 +22206,15 @@ }, "value": "true" }, - "src": "14935:15:2", + "src": "15420:15:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2060, + "id": 3099, "nodeType": "ExpressionStatement", - "src": "14935:15:2" + "src": "15420:15:5" }, { "condition": { @@ -21294,19 +22223,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2065, + "id": 3104, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2061, + "id": 3100, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2046, - "src": "14965:5:2", + "referencedDeclaration": 3085, + "src": "15450:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21320,14 +22249,14 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2063, + "id": 3102, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "14982:1:2", + "src": "15467:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -21343,20 +22272,20 @@ "typeString": "int_const 0" } ], - "id": 2062, + "id": 3101, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "14974:7:2", + "src": "15459:7:5", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2064, + "id": 3103, "isConstant": false, "isLValue": false, "isPure": true, @@ -21364,13 +22293,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14974:10:2", + "src": "15459:10:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "14965:19:2", + "src": "15450:19:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21379,7 +22308,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2074, + "id": 3113, "isConstant": false, "isLValue": false, "isPure": false, @@ -21387,31 +22316,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15149:24:2", + "src": "15634:24:5", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2071, + "id": 3110, "name": "promotedSellers", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1337, - "src": "15150:15:2", + "referencedDeclaration": 2343, + "src": "15635:15:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 2073, + "id": 3112, "indexExpression": { "argumentTypes": null, - "id": 2072, + "id": 3111, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15166:6:2", + "referencedDeclaration": 3087, + "src": "15651:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21422,7 +22351,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "15150:23:2", + "src": "15635:23:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21440,19 +22369,19 @@ "typeIdentifier": "t_uint8", "typeString": "uint8" }, - "id": 2082, + "id": 3121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2080, + "id": 3119, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2050, - "src": "15299:6:2", + "referencedDeclaration": 3089, + "src": "15784:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -21463,14 +22392,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2081, + "id": 3120, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "15309:1:2", + "src": "15794:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -21478,7 +22407,7 @@ }, "value": "1" }, - "src": "15299:11:2", + "src": "15784:11:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21487,7 +22416,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2093, + "id": 3132, "isConstant": false, "isLValue": false, "isPure": false, @@ -21495,18 +22424,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15489:45:2", + "src": "15974:45:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2090, + "id": 3129, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2044, - "src": "15515:10:2", + "referencedDeclaration": 3083, + "src": "16000:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21514,12 +22443,12 @@ }, { "argumentTypes": null, - "id": 2091, + "id": 3130, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15527:6:2", + "referencedDeclaration": 3087, + "src": "16012:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21539,32 +22468,32 @@ ], "expression": { "argumentTypes": null, - "id": 2088, + "id": 3127, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "15490:14:2", + "referencedDeclaration": 2374, + "src": "15975:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2089, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "checkVote", "nodeType": "MemberAccess", - "referencedDeclaration": 1321, - "src": "15490:24:2", + "referencedDeclaration": 1379, + "src": "15975:24:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_bool_$", "typeString": "function (bytes32,address) view external returns (bool)" } }, - "id": 2092, + "id": 3131, "isConstant": false, "isLValue": false, "isPure": false, @@ -21572,7 +22501,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15490:44:2", + "src": "15975:44:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21586,7 +22515,7 @@ "falseBody": { "condition": { "argumentTypes": null, - "id": 2104, + "id": 3143, "isConstant": false, "isLValue": false, "isPure": false, @@ -21594,18 +22523,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "15730:52:2", + "src": "16215:52:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2101, + "id": 3140, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2044, - "src": "15763:10:2", + "referencedDeclaration": 3083, + "src": "16248:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -21613,12 +22542,12 @@ }, { "argumentTypes": null, - "id": 2102, + "id": 3141, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2048, - "src": "15775:6:2", + "referencedDeclaration": 3087, + "src": "16260:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -21638,32 +22567,32 @@ ], "expression": { "argumentTypes": null, - "id": 2099, + "id": 3138, "name": "escrowContract", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1362, - "src": "15731:14:2", + "referencedDeclaration": 2374, + "src": "16216:14:5", "typeDescriptions": { - "typeIdentifier": "t_contract$_IEscrow_$1322", + "typeIdentifier": "t_contract$_IEscrow_$1380", "typeString": "contract IEscrow" } }, - "id": 2100, + "id": 3139, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "checkBeneficiary", "nodeType": "MemberAccess", - "referencedDeclaration": 1312, - "src": "15731:31:2", + "referencedDeclaration": 1370, + "src": "16216:31:5", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_bool_$", "typeString": "function (bytes32,address) view external returns (bool)" } }, - "id": 2103, + "id": 3142, "isConstant": false, "isLValue": false, "isPure": false, @@ -21671,7 +22600,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "15731:51:2", + "src": "16216:51:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21689,7 +22618,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2116, + "id": 3155, "isConstant": false, "isLValue": false, "isPure": false, @@ -21699,12 +22628,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2112, + "id": 3151, "name": "timeWindow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1345, - "src": "16024:10:2", + "referencedDeclaration": 2351, + "src": "16509:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21720,32 +22649,32 @@ ], "expression": { "argumentTypes": null, - "id": 2110, + "id": 3149, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2052, - "src": "16007:12:2", + "referencedDeclaration": 3091, + "src": "16492:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2111, + "id": 3150, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "16007:16:2", + "referencedDeclaration": 4601, + "src": "16492:16:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2113, + "id": 3152, "isConstant": false, "isLValue": false, "isPure": false, @@ -21753,7 +22682,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16007:28:2", + "src": "16492:28:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -21765,18 +22694,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2114, + "id": 3153, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2519, - "src": "16038:5:2", + "referencedDeclaration": 5299, + "src": "16523:5:5", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 2115, + "id": 3154, "isConstant": false, "isLValue": false, "isPure": false, @@ -21784,43 +22713,43 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "16038:15:2", + "src": "16523:15:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16007:46:2", + "src": "16492:46:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2122, + "id": 3161, "nodeType": "IfStatement", - "src": "16003:136:2", + "src": "16488:136:5", "trueBody": { - "id": 2121, + "id": 3160, "nodeType": "Block", - "src": "16055:84:2", + "src": "16540:84:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2119, + "id": 3158, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2117, + "id": 3156, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "16112:8:2", + "referencedDeclaration": 3094, + "src": "16597:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21831,14 +22760,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2118, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "16123:5:2", + "src": "16608:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21846,43 +22775,43 @@ }, "value": "false" }, - "src": "16112:16:2", + "src": "16597:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2120, + "id": 3159, "nodeType": "ExpressionStatement", - "src": "16112:16:2" + "src": "16597:16:5" } ] } }, - "id": 2123, + "id": 3162, "nodeType": "IfStatement", - "src": "15656:483:2", + "src": "16141:483:5", "trueBody": { - "id": 2109, + "id": 3148, "nodeType": "Block", - "src": "15793:196:2", + "src": "16278:196:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2107, + "id": 3146, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2105, + "id": 3144, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15962:8:2", + "referencedDeclaration": 3094, + "src": "16447:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21893,14 +22822,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2106, + "id": 3145, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15973:5:2", + "src": "16458:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21908,43 +22837,43 @@ }, "value": "false" }, - "src": "15962:16:2", + "src": "16447:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2108, + "id": 3147, "nodeType": "ExpressionStatement", - "src": "15962:16:2" + "src": "16447:16:5" } ] } }, - "id": 2124, + "id": 3163, "nodeType": "IfStatement", - "src": "15415:724:2", + "src": "15900:724:5", "trueBody": { - "id": 2098, + "id": 3137, "nodeType": "Block", - "src": "15553:89:2", + "src": "16038:89:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2096, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2094, + "id": 3133, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15615:8:2", + "referencedDeclaration": 3094, + "src": "16100:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -21955,14 +22884,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2095, + "id": 3134, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15626:5:2", + "src": "16111:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -21970,43 +22899,43 @@ }, "value": "false" }, - "src": "15615:16:2", + "src": "16100:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2097, + "id": 3136, "nodeType": "ExpressionStatement", - "src": "15615:16:2" + "src": "16100:16:5" } ] } }, - "id": 2125, + "id": 3164, "nodeType": "IfStatement", - "src": "15295:844:2", + "src": "15780:844:5", "trueBody": { - "id": 2087, + "id": 3126, "nodeType": "Block", - "src": "15312:89:2", + "src": "15797:89:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2085, + "id": 3124, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2083, + "id": 3122, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15374:8:2", + "referencedDeclaration": 3094, + "src": "15859:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22017,14 +22946,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2084, + "id": 3123, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15385:5:2", + "src": "15870:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -22032,43 +22961,43 @@ }, "value": "false" }, - "src": "15374:16:2", + "src": "15859:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2086, + "id": 3125, "nodeType": "ExpressionStatement", - "src": "15374:16:2" + "src": "15859:16:5" } ] } }, - "id": 2126, + "id": 3165, "nodeType": "IfStatement", - "src": "15145:994:2", + "src": "15630:994:5", "trueBody": { - "id": 2079, + "id": 3118, "nodeType": "Block", - "src": "15175:106:2", + "src": "15660:106:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2077, + "id": 3116, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2075, + "id": 3114, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15254:8:2", + "referencedDeclaration": 3094, + "src": "15739:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22079,14 +23008,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2076, + "id": 3115, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15265:5:2", + "src": "15750:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -22094,43 +23023,43 @@ }, "value": "false" }, - "src": "15254:16:2", + "src": "15739:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2078, + "id": 3117, "nodeType": "ExpressionStatement", - "src": "15254:16:2" + "src": "15739:16:5" } ] } }, - "id": 2127, + "id": 3166, "nodeType": "IfStatement", - "src": "14961:1178:2", + "src": "15446:1178:5", "trueBody": { - "id": 2070, + "id": 3109, "nodeType": "Block", - "src": "14986:144:2", + "src": "15471:144:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2068, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2066, + "id": 3105, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "15103:8:2", + "referencedDeclaration": 3094, + "src": "15588:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22141,14 +23070,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2067, + "id": 3106, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "15114:5:2", + "src": "15599:5:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -22156,15 +23085,15 @@ }, "value": "false" }, - "src": "15103:16:2", + "src": "15588:16:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2069, + "id": 3108, "nodeType": "ExpressionStatement", - "src": "15103:16:2" + "src": "15588:16:5" } ] } @@ -22172,26 +23101,26 @@ { "expression": { "argumentTypes": null, - "id": 2128, + "id": 3167, "name": "verified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2055, - "src": "16156:8:2", + "referencedDeclaration": 3094, + "src": "16641:8:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 2056, - "id": 2129, + "functionReturnParameters": 3095, + "id": 3168, "nodeType": "Return", - "src": "16149:15:2" + "src": "16634:15:5" } ] }, "documentation": "@dev Checks -:\n1. If transaction exists\n2. If seller is promoted\n3. Transaction has been closed/released\n4. Transaction happened with the time window.\n5. Seller must be one of the beneficiaries of the transaction execution\n@param scriptHash Script hash of the transaction\n@param buyer Buyer in the transaction\n@param seller Seller in the transaction\n@param status Status of the transaction\n@param lastModified Last modified time of the transaction\n@return bool Returns whether transaction is valid and eligible\nfor rewards", - "id": 2131, + "id": 3170, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -22199,16 +23128,16 @@ "name": "_verifyTransactionData", "nodeType": "FunctionDefinition", "parameters": { - "id": 2053, + "id": 3092, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2044, + "id": 3083, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14735:18:2", + "scope": 3170, + "src": "15220:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22216,10 +23145,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2043, + "id": 3082, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "14735:7:2", + "src": "15220:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22230,11 +23159,11 @@ }, { "constant": false, - "id": 2046, + "id": 3085, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14763:13:2", + "scope": 3170, + "src": "15248:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22242,10 +23171,10 @@ "typeString": "address" }, "typeName": { - "id": 2045, + "id": 3084, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14763:7:2", + "src": "15248:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22256,11 +23185,11 @@ }, { "constant": false, - "id": 2048, + "id": 3087, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14786:14:2", + "scope": 3170, + "src": "15271:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22268,10 +23197,10 @@ "typeString": "address" }, "typeName": { - "id": 2047, + "id": 3086, "name": "address", "nodeType": "ElementaryTypeName", - "src": "14786:7:2", + "src": "15271:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22282,11 +23211,11 @@ }, { "constant": false, - "id": 2050, + "id": 3089, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14810:12:2", + "scope": 3170, + "src": "15295:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22294,10 +23223,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2049, + "id": 3088, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "14810:5:2", + "src": "15295:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -22308,11 +23237,11 @@ }, { "constant": false, - "id": 2052, + "id": 3091, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14832:20:2", + "scope": 3170, + "src": "15317:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22320,10 +23249,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2051, + "id": 3090, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "14832:7:2", + "src": "15317:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22333,20 +23262,20 @@ "visibility": "internal" } ], - "src": "14725:133:2" + "src": "15210:133:5" }, "payable": false, "returnParameters": { - "id": 2056, + "id": 3095, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2055, + "id": 3094, "name": "verified", "nodeType": "VariableDeclaration", - "scope": 2131, - "src": "14905:13:2", + "scope": 3170, + "src": "15390:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22354,10 +23283,10 @@ "typeString": "bool" }, "typeName": { - "id": 2054, + "id": 3093, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "14905:4:2", + "src": "15390:4:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22367,24 +23296,24 @@ "visibility": "internal" } ], - "src": "14904:15:2" + "src": "15389:15:5" }, - "scope": 2226, - "src": "14694:1477:2", + "scope": 3265, + "src": "15179:1477:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2170, + "id": 3209, "nodeType": "Block", - "src": "16622:358:2", + "src": "17107:358:5", "statements": [ { "condition": { "argumentTypes": null, - "id": 2153, + "id": 3192, "isConstant": false, "isLValue": false, "isPure": false, @@ -22392,18 +23321,18 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "16650:166:2", + "src": "17135:166:5", "subExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2147, + "id": 3186, "name": "scriptHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2133, - "src": "16691:10:2", + "referencedDeclaration": 3172, + "src": "17176:10:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22411,12 +23340,12 @@ }, { "argumentTypes": null, - "id": 2148, + "id": 3187, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2135, - "src": "16719:5:2", + "referencedDeclaration": 3174, + "src": "17204:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22424,12 +23353,12 @@ }, { "argumentTypes": null, - "id": 2149, + "id": 3188, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2137, - "src": "16742:6:2", + "referencedDeclaration": 3176, + "src": "17227:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22437,12 +23366,12 @@ }, { "argumentTypes": null, - "id": 2150, + "id": 3189, "name": "status", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2139, - "src": "16766:6:2", + "referencedDeclaration": 3178, + "src": "17251:6:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -22450,12 +23379,12 @@ }, { "argumentTypes": null, - "id": 2151, + "id": 3190, "name": "lastModified", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2141, - "src": "16790:12:2", + "referencedDeclaration": 3180, + "src": "17275:12:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22485,18 +23414,18 @@ "typeString": "uint256" } ], - "id": 2146, + "id": 3185, "name": "_verifyTransactionData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2131, - "src": "16651:22:2", + "referencedDeclaration": 3170, + "src": "17136:22:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$_t_address_$_t_address_$_t_uint8_$_t_uint256_$returns$_t_bool_$", "typeString": "function (bytes32,address,address,uint8,uint256) view returns (bool)" } }, - "id": 2152, + "id": 3191, "isConstant": false, "isLValue": false, "isPure": false, @@ -22504,7 +23433,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16651:165:2", + "src": "17136:165:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -22516,26 +23445,26 @@ } }, "falseBody": { - "id": 2166, + "id": 3205, "nodeType": "Block", - "src": "16885:65:2", + "src": "17370:65:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2164, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2159, + "id": 3198, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16899:6:2", + "referencedDeclaration": 3183, + "src": "17384:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22548,12 +23477,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2161, + "id": 3200, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2135, - "src": "16925:5:2", + "referencedDeclaration": 3174, + "src": "17410:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22561,12 +23490,12 @@ }, { "argumentTypes": null, - "id": 2162, + "id": 3201, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2137, - "src": "16932:6:2", + "referencedDeclaration": 3176, + "src": "17417:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22584,18 +23513,18 @@ "typeString": "address" } ], - "id": 2160, + "id": 3199, "name": "_calculateReward", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2225, - "src": "16908:16:2", + "referencedDeclaration": 3264, + "src": "17393:16:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", "typeString": "function (address,address) view returns (uint256)" } }, - "id": 2163, + "id": 3202, "isConstant": false, "isLValue": false, "isPure": false, @@ -22603,48 +23532,48 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "16908:31:2", + "src": "17393:31:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "16899:40:2", + "src": "17384:40:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2165, + "id": 3204, "nodeType": "ExpressionStatement", - "src": "16899:40:2" + "src": "17384:40:5" } ] }, - "id": 2167, + "id": 3206, "nodeType": "IfStatement", - "src": "16633:317:2", + "src": "17118:317:5", "trueBody": { - "id": 2158, + "id": 3197, "nodeType": "Block", - "src": "16835:35:2", + "src": "17320:35:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2156, + "id": 3195, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2154, + "id": 3193, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16849:6:2", + "referencedDeclaration": 3183, + "src": "17334:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22655,14 +23584,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 2155, + "id": 3194, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "16858:1:2", + "src": "17343:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -22670,15 +23599,15 @@ }, "value": "0" }, - "src": "16849:10:2", + "src": "17334:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2157, + "id": 3196, "nodeType": "ExpressionStatement", - "src": "16849:10:2" + "src": "17334:10:5" } ] } @@ -22686,26 +23615,26 @@ { "expression": { "argumentTypes": null, - "id": 2168, + "id": 3207, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2144, - "src": "16967:6:2", + "referencedDeclaration": 3183, + "src": "17452:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2145, - "id": 2169, + "functionReturnParameters": 3184, + "id": 3208, "nodeType": "Return", - "src": "16960:13:2" + "src": "17445:13:5" } ] }, "documentation": "@dev Private function to get Tokens to be distributed as reward\nChecks whether transaction is verified or not and computes the\namount of the rewards using the _calculateReward() method", - "id": 2171, + "id": 3210, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -22713,16 +23642,16 @@ "name": "_getTokensToReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2142, + "id": 3181, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2133, + "id": 3172, "name": "scriptHash", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16432:18:2", + "scope": 3210, + "src": "16917:18:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22730,10 +23659,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 2132, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "16432:7:2", + "src": "16917:7:5", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -22744,11 +23673,11 @@ }, { "constant": false, - "id": 2135, + "id": 3174, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16460:13:2", + "scope": 3210, + "src": "16945:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22756,10 +23685,10 @@ "typeString": "address" }, "typeName": { - "id": 2134, + "id": 3173, "name": "address", "nodeType": "ElementaryTypeName", - "src": "16460:7:2", + "src": "16945:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22770,11 +23699,11 @@ }, { "constant": false, - "id": 2137, + "id": 3176, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16483:14:2", + "scope": 3210, + "src": "16968:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22782,10 +23711,10 @@ "typeString": "address" }, "typeName": { - "id": 2136, + "id": 3175, "name": "address", "nodeType": "ElementaryTypeName", - "src": "16483:7:2", + "src": "16968:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22796,11 +23725,11 @@ }, { "constant": false, - "id": 2139, + "id": 3178, "name": "status", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16507:12:2", + "scope": 3210, + "src": "16992:12:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22808,10 +23737,10 @@ "typeString": "uint8" }, "typeName": { - "id": 2138, + "id": 3177, "name": "uint8", "nodeType": "ElementaryTypeName", - "src": "16507:5:2", + "src": "16992:5:5", "typeDescriptions": { "typeIdentifier": "t_uint8", "typeString": "uint8" @@ -22822,11 +23751,11 @@ }, { "constant": false, - "id": 2141, + "id": 3180, "name": "lastModified", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16529:20:2", + "scope": 3210, + "src": "17014:20:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22834,10 +23763,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2140, + "id": 3179, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "16529:7:2", + "src": "17014:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22847,20 +23776,20 @@ "visibility": "internal" } ], - "src": "16422:133:2" + "src": "16907:133:5" }, "payable": false, "returnParameters": { - "id": 2145, + "id": 3184, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2144, + "id": 3183, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2171, - "src": "16602:14:2", + "scope": 3210, + "src": "17087:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -22868,10 +23797,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2143, + "id": 3182, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "16602:7:2", + "src": "17087:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22881,19 +23810,19 @@ "visibility": "internal" } ], - "src": "16601:16:2" + "src": "17086:16:5" }, - "scope": 2226, - "src": "16395:585:2", + "scope": 3265, + "src": "16880:585:5", "stateMutability": "view", "superFunction": null, "visibility": "private" }, { "body": { - "id": 2224, + "id": 3263, "nodeType": "Block", - "src": "17320:828:2", + "src": "17805:828:5", "statements": [ { "condition": { @@ -22902,7 +23831,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2184, + "id": 3223, "isConstant": false, "isLValue": false, "isPure": false, @@ -22911,26 +23840,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2180, + "id": 3219, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "17335:26:2", + "referencedDeclaration": 2372, + "src": "17820:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2182, + "id": 3221, "indexExpression": { "argumentTypes": null, - "id": 2181, + "id": 3220, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17362:6:2", + "referencedDeclaration": 3214, + "src": "17847:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -22941,7 +23870,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17335:34:2", + "src": "17820:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -22951,44 +23880,44 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 2183, + "id": 3222, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "17373:18:2", + "referencedDeclaration": 2345, + "src": "17858:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17335:56:2", + "src": "17820:56:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2220, + "id": 3259, "nodeType": "Block", - "src": "17541:576:2", + "src": "18026:576:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2199, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2190, + "id": 3229, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17739:6:2", + "referencedDeclaration": 3217, + "src": "18224:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23005,26 +23934,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2193, + "id": 3232, "name": "sellerVsBuyerRewards", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1356, - "src": "17778:20:2", + "referencedDeclaration": 2368, + "src": "18263:20:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$", "typeString": "mapping(address => mapping(address => uint256))" } }, - "id": 2195, + "id": 3234, "indexExpression": { "argumentTypes": null, - "id": 2194, + "id": 3233, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17799:6:2", + "referencedDeclaration": 3214, + "src": "18284:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23035,21 +23964,21 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17778:28:2", + "src": "18263:28:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2197, + "id": 3236, "indexExpression": { "argumentTypes": null, - "id": 2196, + "id": 3235, "name": "buyer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2173, - "src": "17807:5:2", + "referencedDeclaration": 3212, + "src": "18292:5:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23060,7 +23989,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17778:35:2", + "src": "18263:35:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23076,32 +24005,32 @@ ], "expression": { "argumentTypes": null, - "id": 2191, + "id": 3230, "name": "maxRewardToBuyerPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1341, - "src": "17748:25:2", + "referencedDeclaration": 2347, + "src": "18233:25:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2192, + "id": 3231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "17748:29:2", + "referencedDeclaration": 4577, + "src": "18233:29:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2198, + "id": 3237, "isConstant": false, "isLValue": false, "isPure": false, @@ -23109,21 +24038,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17748:66:2", + "src": "18233:66:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17739:75:2", + "src": "18224:75:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2200, + "id": 3239, "nodeType": "ExpressionStatement", - "src": "17739:75:2" + "src": "18224:75:5" }, { "condition": { @@ -23132,7 +24061,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2208, + "id": 3247, "isConstant": false, "isLValue": false, "isPure": false, @@ -23142,12 +24071,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2205, + "id": 3244, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17976:6:2", + "referencedDeclaration": 3217, + "src": "18461:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23165,26 +24094,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2201, + "id": 3240, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "17937:26:2", + "referencedDeclaration": 2372, + "src": "18422:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2203, + "id": 3242, "indexExpression": { "argumentTypes": null, - "id": 2202, + "id": 3241, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "17964:6:2", + "referencedDeclaration": 3214, + "src": "18449:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23195,27 +24124,27 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "17937:34:2", + "src": "18422:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2204, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 2384, - "src": "17937:38:2", + "referencedDeclaration": 4601, + "src": "18422:38:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2206, + "id": 3245, "isConstant": false, "isLValue": false, "isPure": false, @@ -23223,7 +24152,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "17937:46:2", + "src": "18422:46:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23233,48 +24162,48 @@ "operator": ">", "rightExpression": { "argumentTypes": null, - "id": 2207, + "id": 3246, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "17986:18:2", + "referencedDeclaration": 2345, + "src": "18471:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "17937:67:2", + "src": "18422:67:5", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2219, + "id": 3258, "nodeType": "IfStatement", - "src": "17933:173:2", + "src": "18418:173:5", "trueBody": { - "id": 2218, + "id": 3257, "nodeType": "Block", - "src": "18006:100:2", + "src": "18491:100:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2216, + "id": 3255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2209, + "id": 3248, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "18024:6:2", + "referencedDeclaration": 3217, + "src": "18509:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23289,26 +24218,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2212, + "id": 3251, "name": "sellerVsRewardsDistributed", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1360, - "src": "18056:26:2", + "referencedDeclaration": 2372, + "src": "18541:26:5", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" } }, - "id": 2214, + "id": 3253, "indexExpression": { "argumentTypes": null, - "id": 2213, + "id": 3252, "name": "seller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "18083:6:2", + "referencedDeclaration": 3214, + "src": "18568:6:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23319,7 +24248,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "18056:34:2", + "src": "18541:34:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23335,32 +24264,32 @@ ], "expression": { "argumentTypes": null, - "id": 2210, + "id": 3249, "name": "maxRewardPerSeller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1339, - "src": "18033:18:2", + "referencedDeclaration": 2345, + "src": "18518:18:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2211, + "id": 3250, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 2360, - "src": "18033:22:2", + "referencedDeclaration": 4577, + "src": "18518:22:5", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2215, + "id": 3254, "isConstant": false, "isLValue": false, "isPure": false, @@ -23368,51 +24297,51 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "18033:58:2", + "src": "18518:58:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "18024:67:2", + "src": "18509:67:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2217, + "id": 3256, "nodeType": "ExpressionStatement", - "src": "18024:67:2" + "src": "18509:67:5" } ] } } ] }, - "id": 2221, + "id": 3260, "nodeType": "IfStatement", - "src": "17331:786:2", + "src": "17816:786:5", "trueBody": { - "id": 2189, + "id": 3228, "nodeType": "Block", - "src": "17393:133:2", + "src": "17878:133:5", "statements": [ { "expression": { "argumentTypes": null, - "id": 2187, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2185, + "id": 3224, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "17503:6:2", + "referencedDeclaration": 3217, + "src": "17988:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23423,14 +24352,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "30", - "id": 2186, + "id": 3225, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "17512:1:2", + "src": "17997:1:5", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -23438,15 +24367,15 @@ }, "value": "0" }, - "src": "17503:10:2", + "src": "17988:10:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2188, + "id": 3227, "nodeType": "ExpressionStatement", - "src": "17503:10:2" + "src": "17988:10:5" } ] } @@ -23454,26 +24383,26 @@ { "expression": { "argumentTypes": null, - "id": 2222, + "id": 3261, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2178, - "src": "18134:6:2", + "referencedDeclaration": 3217, + "src": "18619:6:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2179, - "id": 2223, + "functionReturnParameters": 3218, + "id": 3262, "nodeType": "Return", - "src": "18127:13:2" + "src": "18612:13:5" } ] }, "documentation": "@dev Private function to calculate reward.\nPlease see link for rewards calculation algo\n https://github.com/OB1Company/openbazaar-smart-contracts/issues/10", - "id": 2225, + "id": 3264, "implemented": true, "isConstructor": false, "isDeclaredConst": true, @@ -23481,16 +24410,16 @@ "name": "_calculateReward", "nodeType": "FunctionDefinition", "parameters": { - "id": 2176, + "id": 3215, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2173, + "id": 3212, "name": "buyer", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17210:13:2", + "scope": 3264, + "src": "17695:13:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23498,10 +24427,10 @@ "typeString": "address" }, "typeName": { - "id": 2172, + "id": 3211, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17210:7:2", + "src": "17695:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23512,11 +24441,11 @@ }, { "constant": false, - "id": 2175, + "id": 3214, "name": "seller", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17233:14:2", + "scope": 3264, + "src": "17718:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23524,10 +24453,10 @@ "typeString": "address" }, "typeName": { - "id": 2174, + "id": 3213, "name": "address", "nodeType": "ElementaryTypeName", - "src": "17233:7:2", + "src": "17718:7:5", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -23537,20 +24466,20 @@ "visibility": "internal" } ], - "src": "17200:53:2" + "src": "17685:53:5" }, "payable": false, "returnParameters": { - "id": 2179, + "id": 3218, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2178, + "id": 3217, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2225, - "src": "17300:14:2", + "scope": 3264, + "src": "17785:14:5", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -23558,10 +24487,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2177, + "id": 3216, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "17300:7:2", + "src": "17785:7:5", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -23571,26 +24500,148 @@ "visibility": "internal" } ], - "src": "17299:16:2" + "src": "17784:16:5" }, - "scope": 2226, - "src": "17175:973:2", + "scope": 3265, + "src": "17660:973:5", "stateMutability": "view", "superFunction": null, "visibility": "private" } ], - "scope": 2227, - "src": "510:17642:2" + "scope": 3266, + "src": "510:18127:5" } ], - "src": "48:18105:2" + "src": "48:18590:5" }, "compiler": { "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-03-09T15:48:44.479Z" + "networks": { + "1554199545405": { + "events": {}, + "links": {}, + "address": "0x1ec1dA0F7dFC6E9aaADFF6247533D98FfF69062C", + "transactionHash": "0xb4a4fea3b56b5925be62561308657cf1bc1f98288c7e6754c37973b0c43dd928" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:51.642Z", + "devdoc": { + "methods": { + "addPromotedSellers(address[])": { + "details": "Allows owner to add new promoted sellers. Previous ones will remain untouched", + "params": { + "sellers": "List of sellers to be marked as promoted No Seller out of this list should already be promoted, otherwise transaction will fail" + } + }, + "calculateReward(bytes32)": { + "details": "Buyer can call this method to calculate the reward for their transaction", + "params": { + "scriptHash": "Script hash of the transaction" + } + }, + "changeMaxRewardPerSeller(uint256)": { + "details": "Method to allow the owner to adjust the maximum reward per seller", + "params": { + "_maxRewardPerSeller": "Max reward to be distributed for each seller" + } + }, + "changeTimeWindow(uint256)": { + "details": "Method to allow the owner to change the timeWindow variable", + "params": { + "_timeWindow": "A time window in seconds" + } + }, + "claimRewards(bytes32[])": { + "details": "Function to claim tokens", + "params": { + "scriptHashes": "Array of scriptHashes of OB trades for which the buyer wants to claim reward tokens. Note that a Buyer can perform trades with multiple promoted sellers and then can claim their reward tokens all at once for all those trades using this function. Be mindful of the block gas limit (do not pass too many scripthashes)." + } + }, + "executeAndClaim(uint8[],bytes32[],bytes32[],bytes32,address[],uint256[])": { + "details": "Using this method user can choose to execute their transaction and claim their rewards in one go. This will save one transaction. Users can only use this method if their trade is using escrowContract for escrow. See the execute() method Escrow_v1_0.sol for more information." + }, + "getBuyerRewardInfo(address,address)": { + "details": "Return reward info for a buyer against a promoted seller", + "params": { + "buyer": "The buyer who reward info has to be fetched", + "seller": "Address of promoted seller" + }, + "return": "rewardAmount" + }, + "getDistributedReward(address)": { + "details": "Total reward distributed for a promoted seller so far", + "params": { + "seller": "Promoted seller's address" + }, + "return": "Amount of tokens distributed as reward for a seller" + }, + "getRewardedBuyer(address,uint256)": { + "details": "Method to get rewarded buyer address at specific index for a seller", + "params": { + "index": "Index at which buyer has to be retrieved", + "seller": "Seller for whom the rewarded buyer is requested" + } + }, + "getRewardedBuyers(address)": { + "details": "Returns list of buyers that have been rewarded for purchasing from a given seller", + "params": { + "seller": "Address of promoted seller" + }, + "return": "buyers List of Buyers" + }, + "isOwner()": { + "return": "true if `msg.sender` is the owner of the contract." + }, + "noOfRewardedBuyers(address)": { + "details": "Returns the number of rewarded buyers associated with a given seller", + "params": { + "seller": "Address of the promoted seller" + } + }, + "owner()": { + "return": "the address of the owner." + }, + "removePromotedSellers(address[])": { + "details": "Remove exisiting promoted sellers", + "params": { + "sellers": "List of sellers to be removed" + } + }, + "renounceOwnership()": { + "details": "Allows the current owner to relinquish control of the contract." + }, + "setEndDate(uint256)": { + "details": "ALlows owner to set endDate", + "params": { + "_endDate": "date the promotion ends" + } + }, + "transferOwnership(address)": { + "details": "Allows the current owner to transfer control of the contract to a newOwner.", + "params": { + "newOwner": "The address to transfer ownership to." + } + }, + "transferRemainingTokens(address)": { + "details": "Allows the owner of the contract to transfer all remaining tokens to an address of their choosing.", + "params": { + "receiver": "The receiver's address" + } + }, + "turnOnRewards()": { + "details": "Allows the owner of the contract to turn on the rewards distribution Only if it was not previously turned on" + } + } + }, + "userdoc": { + "methods": { + "renounceOwnership()": { + "notice": "Renouncing to ownership will leave the contract without an owner. It will not be possible to call the functions with the `onlyOwner` modifier anymore." + } + } + } } \ No newline at end of file diff --git a/build/contracts/OBToken.json b/build/contracts/OBToken.json index 06aa2a5..4547099 100755 --- a/build/contracts/OBToken.json +++ b/build/contracts/OBToken.json @@ -13,7 +13,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x06fdde03" }, { "constant": false, @@ -36,7 +37,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x095ea7b3" }, { "constant": true, @@ -50,7 +52,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x18160ddd" }, { "constant": false, @@ -77,7 +80,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x23b872dd" }, { "constant": true, @@ -91,7 +95,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x313ce567" }, { "constant": false, @@ -114,7 +119,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x39509351" }, { "constant": false, @@ -128,7 +134,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x42966c68" }, { "constant": true, @@ -147,7 +154,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x70a08231" }, { "constant": false, @@ -165,7 +173,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x79cc6790" }, { "constant": true, @@ -179,7 +188,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x95d89b41" }, { "constant": false, @@ -202,7 +212,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa457c2d7" }, { "constant": false, @@ -225,7 +236,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa9059cbb" }, { "constant": true, @@ -248,7 +260,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdd62ed3e" }, { "inputs": [ @@ -271,7 +284,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -293,7 +307,8 @@ } ], "name": "Transfer", - "type": "event" + "type": "event", + "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" }, { "anonymous": false, @@ -315,7 +330,8 @@ } ], "name": "Approval", - "type": "event" + "type": "event", + "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925" } ], "bytecode": "0x60806040523480156200001157600080fd5b5060405162001828380380620018288339810180604052810190808051820192919060200180518201929190602001805190602001909291908051906020019092919050505083600390805190602001906200006f92919062000261565b5082600490805190602001906200008892919062000261565b5081600560006101000a81548160ff021916908360ff160217905550620000d633600560009054906101000a900460ff1660ff16600a0a8302620000e0640100000000026401000000009004565b5050505062000310565b60008273ffffffffffffffffffffffffffffffffffffffff16141515156200010757600080fd5b6200012c816002546200023f6401000000000262001188179091906401000000009004565b60028190555062000193816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546200023f6401000000000262001188179091906401000000009004565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b60008082840190508381101515156200025757600080fd5b8091505092915050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620002a457805160ff1916838001178555620002d5565b82800160010185558215620002d5579182015b82811115620002d4578251825591602001919060010190620002b7565b5b509050620002e49190620002e8565b5090565b6200030d91905b8082111562000309576000816000905550600101620002ef565b5090565b90565b61150880620003206000396000f3006080604052600436106100c5576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100ca578063095ea7b31461015a57806318160ddd146101bf57806323b872dd146101ea578063313ce5671461026f57806339509351146102a057806342966c681461030557806370a082311461033257806379cc67901461038957806395d89b41146103d6578063a457c2d714610466578063a9059cbb146104cb578063dd62ed3e14610530575b600080fd5b3480156100d657600080fd5b506100df6105a7565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561011f578082015181840152602081019050610104565b50505050905090810190601f16801561014c5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561016657600080fd5b506101a5600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610645565b604051808215151515815260200191505060405180910390f35b3480156101cb57600080fd5b506101d4610772565b6040518082815260200191505060405180910390f35b3480156101f657600080fd5b50610255600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061077c565b604051808215151515815260200191505060405180910390f35b34801561027b57600080fd5b5061028461092e565b604051808260ff1660ff16815260200191505060405180910390f35b3480156102ac57600080fd5b506102eb600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610941565b604051808215151515815260200191505060405180910390f35b34801561031157600080fd5b5061033060048036038101908080359060200190929190505050610b78565b005b34801561033e57600080fd5b50610373600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610b85565b6040518082815260200191505060405180910390f35b34801561039557600080fd5b506103d4600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610bcd565b005b3480156103e257600080fd5b506103eb610bdb565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b578082015181840152602081019050610410565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561047257600080fd5b506104b1600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610c79565b604051808215151515815260200191505060405180910390f35b3480156104d757600080fd5b50610516600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610eb0565b604051808215151515815260200191505060405180910390f35b34801561053c57600080fd5b50610591600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610ec7565b6040518082815260200191505060405180910390f35b60038054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561063d5780601f106106125761010080835404028352916020019161063d565b820191906000526020600020905b81548152906001019060200180831161062057829003601f168201915b505050505081565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415151561068257600080fd5b81600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000600254905090565b6000600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054821115151561080957600080fd5b61089882600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f4e90919063ffffffff16565b600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610923848484610f6f565b600190509392505050565b600560009054906101000a900460ff1681565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415151561097e57600080fd5b610a0d82600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461118890919063ffffffff16565b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b610b8233826111a9565b50565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b610bd78282611334565b5050565b60048054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610c715780601f10610c4657610100808354040283529160200191610c71565b820191906000526020600020905b815481529060010190602001808311610c5457829003601f168201915b505050505081565b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151515610cb657600080fd5b610d4582600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f4e90919063ffffffff16565b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040518082815260200191505060405180910390a36001905092915050565b6000610ebd338484610f6f565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600080838311151515610f6057600080fd5b82840390508091505092915050565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548111151515610fbc57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614151515610ff857600080fd5b611049816000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f4e90919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506110dc816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461118890919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b600080828401905083811015151561119f57600080fd5b8091505092915050565b60008273ffffffffffffffffffffffffffffffffffffffff16141515156111cf57600080fd5b6000808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054811115151561121c57600080fd5b61123181600254610f4e90919063ffffffff16565b600281905550611288816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f4e90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481111515156113bf57600080fd5b61144e81600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f4e90919063ffffffff16565b600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506114d882826111a9565b50505600a165627a7a72305820713d2f36b2af501ca5083a0900947902656102f2b062e67ebb66262bd2827e9a0029", @@ -1616,7 +1632,26 @@ "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-02-26T06:26:13.036Z" + "networks": { + "1554199358609": { + "events": {}, + "links": {}, + "address": "0xa0576Cb4927272E69f308d0134d10515268Eb139", + "transactionHash": "0xa305c4e6aec81230b898bfe7338fa7ffc6e3cc9aac8defa54c39eda8a70419d7" + }, + "1554199463123": { + "events": {}, + "links": {}, + "address": "0xa0576Cb4927272E69f308d0134d10515268Eb139", + "transactionHash": "0xa305c4e6aec81230b898bfe7338fa7ffc6e3cc9aac8defa54c39eda8a70419d7" + }, + "1554199545405": { + "events": {}, + "links": {}, + "address": "0xa0576Cb4927272E69f308d0134d10515268Eb139", + "transactionHash": "0xa305c4e6aec81230b898bfe7338fa7ffc6e3cc9aac8defa54c39eda8a70419d7" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:51.939Z" } \ No newline at end of file diff --git a/build/contracts/PowerUps.json b/build/contracts/PowerUps.json index 0dc5ff0..5f3602b 100755 --- a/build/contracts/PowerUps.json +++ b/build/contracts/PowerUps.json @@ -13,7 +13,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfc0c546a" }, { "inputs": [ @@ -24,7 +25,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -46,7 +48,8 @@ } ], "name": "NewPowerUpAdded", - "type": "event" + "type": "event", + "signature": "0xc00805983761592a6464687e442bdbf29ac1d3bc2277e56c93c1a3060bbccd5a" }, { "anonymous": false, @@ -68,7 +71,8 @@ } ], "name": "Topup", - "type": "event" + "type": "event", + "signature": "0x6d4f4d29f1e5fcc4cc296c4f82a4091603352c8dd28d9ec455eeb703b3b54393" }, { "constant": false, @@ -95,7 +99,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x315e6a1b" }, { "constant": false, @@ -122,7 +127,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x98a70e31" }, { "constant": false, @@ -140,7 +146,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xece6ac2e" }, { "constant": true, @@ -171,7 +178,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8a84d8f3" }, { "constant": true, @@ -190,7 +198,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6f1a8b57" }, { "constant": true, @@ -213,7 +222,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x4920e510" }, { "constant": true, @@ -232,7 +242,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x91cc4d34" } ], "bytecode": "0x608060405234801561001057600080fd5b506040516020806111a68339810180604052810190808051906020019092919050505080600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156100d9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f5a65726f2061646472657373207061737365640000000000000000000000000081525060200191505060405180910390fd5b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505061107c8061012a6000396000f30060806040526004361061008e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063315e6a1b146100935780634920e510146100fa5780636f1a8b57146101495780638a84d8f31461018e57806391cc4d341461025157806398a70e31146102d7578063ece6ac2e14610397578063fc0c546a146103ce575b600080fd5b34801561009f57600080fd5b506100e4600480360381019080803590602001908201803590602001919091929391929390803590602001909291908035600019169060200190929190505050610425565b6040518082815260200191505060405180910390f35b34801561010657600080fd5b506101336004803603810190808035600019169060200190929190803590602001909291905050506104eb565b6040518082815260200191505060405180910390f35b34801561015557600080fd5b5061017860048036038101908080356000191690602001909291905050506105c0565b6040518082815260200191505060405180910390f35b34801561019a57600080fd5b506101b9600480360381019080803590602001909291905050506105eb565b60405180806020018581526020018481526020018360001916600019168152602001828103825286818151815260200191508051906020019080838360005b838110156102135780820151818401526020810190506101f8565b50505050905090810190601f1680156102405780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561025d57600080fd5b5061028060048036038101908080356000191690602001909291905050506106e8565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156102c35780820151818401526020810190506102a8565b505050509050019250505060405180910390f35b3480156102e357600080fd5b5061034060048036038101908080359060200190820180359060200191909192939192939080359060200190820180359060200191909192939192939080359060200190820180359060200191909192939192939050505061075e565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610383578082015181840152602081019050610368565b505050509050019250505060405180910390f35b3480156103a357600080fd5b506103cc6004803603810190808035906020019092919080359060200190929190505050610964565b005b3480156103da57600080fd5b506103e3610c45565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600080858590501115156104a1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e74656e74204164647265737320697320656d707479000000000000000081525060200191505060405180910390fd5b6104de85858080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050508484610c6a565b9050809050949350505050565b60008160026000856000191660001916815260200190815260200160002080549050111515610582576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f417272617920696e646578206f7574206f6620626f756e64730000000000000081525060200191505060405180910390fd5b600260008460001916600019168152602001908152602001600020828154811015156105aa57fe5b9060005260206000200154905080905092915050565b6000600260008360001916600019168152602001908152602001600020805490509050809050919050565b60606000806000808560018054905011156106d45760018681548110151561060f57fe5b90600052602060002090600402019050806000018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106b75780601f1061068c576101008083540402835291602001916106b7565b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505094508060010154935080600201549250806003015491505b848484849450945094509450509193509193565b606060026000836000191660001916815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561074f57602002820191906000526020600020905b81548152602001906001019080831161073b575b50505050509050809050919050565b6060600080888890501115156107dc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f436f6e74656e74204164647265737320697320656d707479000000000000000081525060200191505060405180910390fd5b838390508686905014151561087f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f6b6579776f72647320616e6420616d6f756e7473206c656e677468206d69736d81526020017f617463680000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b858590506040519080825280602002602001820160405280156108b15781602001602082028038833980820191505090505b509150600090505b858590508110156109565761092d88888080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050878784818110151561090857fe5b90506020020135868685818110151561091d57fe5b9050602002013560001916610c6a565b828281518110151561093b57fe5b906020019060200201818152505080806001019150506108b9565b819150509695505050505050565b8161097d60018080549050610f6990919063ffffffff16565b81111515156109f4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f506f776572557020646f6573206e6f742065786973747300000000000000000081525060200191505060405180910390fd5b600082111515610a92576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260318152602001807f416d6f756e74206f6620746f6b656e7320746f206275726e2073686f756c642081526020017f62652067726561746572207468616e203000000000000000000000000000000081525060400191505060405180910390fd5b610ac582600185815481101515610aa557fe5b906000526020600020906004020160010154610f8a90919063ffffffff16565b600184815481101515610ad457fe5b90600052602060002090600402016001018190555042600184815481101515610af957fe5b9060005260206000209060040201600201819055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166379cc679033846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b158015610bd257600080fd5b505af1158015610be6573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff167f6d4f4d29f1e5fcc4cc296c4f82a4091603352c8dd28d9ec455eeb703b3b543938484604051808381526020018281526020019250505060405180910390a2505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008083111515610d09576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260318152602001807f416d6f756e74206f6620746f6b656e7320746f206275726e2073686f756c642081526020017f62652067726561746572207468616e203000000000000000000000000000000081525060400191505060405180910390fd5b60016080604051908101604052808681526020018581526020014281526020018460001916815250908060018154018082558091505090600182039060005260206000209060040201600090919290919091506000820151816000019080519060200190610d78929190610fab565b50602082015181600101556040820151816002015560608201518160030190600019169055505050600260008360001916600019168152602001908152602001600020610dd360018080549050610f6990919063ffffffff16565b90806001815401808255809150509060018203906000526020600020016000909192909190915055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166379cc679033856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b158015610ec057600080fd5b505af1158015610ed4573d6000803e3d6000fd5b505050503373ffffffffffffffffffffffffffffffffffffffff167fc00805983761592a6464687e442bdbf29ac1d3bc2277e56c93c1a3060bbccd5a610f2860018080549050610f6990919063ffffffff16565b85604051808381526020018281526020019250505060405180910390a2610f5d60018080549050610f6990919063ffffffff16565b90508090509392505050565b600080838311151515610f7b57600080fd5b82840390508091505092915050565b6000808284019050838110151515610fa157600080fd5b8091505092915050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610fec57805160ff191683800117855561101a565b8280016001018555821561101a579182015b82811115611019578251825591602001919060010190610ffe565b5b509050611027919061102b565b5090565b61104d91905b80821115611049576000816000905550600101611031565b5090565b905600a165627a7a723058209fb753a84c0eb80909520251b580f47989ec2c1d4fd06cd03be498a41fd82c060029", @@ -11691,7 +11702,14 @@ "name": "solc", "version": "0.4.24+commit.e67f0147.Emscripten.clang" }, - "networks": {}, - "schemaVersion": "2.0.1", - "updatedAt": "2019-02-26T06:26:12.989Z" + "networks": { + "1554199545405": { + "events": {}, + "links": {}, + "address": "0xE1748a65441D7D611b4c73c098FEED7f2607113B", + "transactionHash": "0x78115c35ff2e7112cfe27620e03f7266b6bb20b8cdc320cf7b31e93ce6291c3a" + } + }, + "schemaVersion": "3.0.2", + "updatedAt": "2019-04-02T10:05:51.948Z" } \ No newline at end of file diff --git a/migrations/powerUps/6_Powered_Ups_migration.js b/migrations/powerUps/6_Powered_Ups_migration.js new file mode 100644 index 0000000..9f1fb4a --- /dev/null +++ b/migrations/powerUps/6_Powered_Ups_migration.js @@ -0,0 +1,7 @@ +var OBToken = artifacts.require("OBToken"); +var PowerUps = artifacts.require("PowerUps"); + + +module.exports = function(deployer) { + deployer.deploy(PowerUps, OBToken.address); +}; \ No newline at end of file diff --git a/migrations/rewards/5_Rewards_Migration.js b/migrations/rewards/5_Rewards_Migration.js new file mode 100644 index 0000000..95dd934 --- /dev/null +++ b/migrations/rewards/5_Rewards_Migration.js @@ -0,0 +1,8 @@ +var OBRewards = artifacts.require("OBRewards"); +var Escrow_v1_0 = artifacts.require("Escrow_v1_0"); +var OBToken = artifacts.require("OBToken"); + +module.exports = function(deployer) { + //This is dummy data + deployer.deploy(OBRewards, "50000000000000000000", 432000, Escrow_v1_0.address, OBToken.address); +}; \ No newline at end of file diff --git a/migrations/token/4_OB_Token_migration.js b/migrations/token/4_OB_Token_migration.js new file mode 100644 index 0000000..b4fb02f --- /dev/null +++ b/migrations/token/4_OB_Token_migration.js @@ -0,0 +1,5 @@ +var OBToken = artifacts.require("OBToken"); + +module.exports = function(deployer) { + deployer.deploy(OBToken, "Open Bazaar", "OBT", 18, 1000000000); +}; \ No newline at end of file