diff --git a/build/contracts/App.json b/build/contracts/App.json index eca11300..a75285ce 100644 --- a/build/contracts/App.json +++ b/build/contracts/App.json @@ -1490,5 +1490,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.864Z" + "updatedAt": "2018-04-24T13:30:35.514Z" } \ No newline at end of file diff --git a/build/contracts/AppHub.json b/build/contracts/AppHub.json index feb73249..e5981050 100644 --- a/build/contracts/AppHub.json +++ b/build/contracts/AppHub.json @@ -3500,30 +3500,6 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": { - "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - } - }, - "links": {}, - "address": "0x7f9884f75571e5ace278e71ea9b2f035d71601f3", - "transactionHash": "0xae025e17048ceff49be9b9f35c0642443c4f6d1d6dd4b42ca638795227e2a789" - }, "4": { "events": { "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { @@ -3545,8 +3521,8 @@ } }, "links": {}, - "address": "0x700425c7684e069c27ec3b3784a22025f95c6057", - "transactionHash": "0x06fa7774178e9297bf510c524714fcd999ab7790c44965dfaf744e9b0ebccb64" + "address": "0x71cb68b0d9bf2b4a03c2caa6ea54773ba413163f", + "transactionHash": "0xae81343bafb8a275a59f84a6d20221364b9d37100f450a49792c1c0fc5bbd7f3" }, "42": { "events": { @@ -3569,10 +3545,10 @@ } }, "links": {}, - "address": "0x2a3827b9f8d5aaf187eb2aeaa60b3bf2e1306475", - "transactionHash": "0x222fbb484370bea62e90bdc12a1c12ed107e0135588f87851be74c9445d52d48" + "address": "0xab9f3c7737caa21421046f0d453ef792c9d9667c", + "transactionHash": "0x1b49c194175d9debed9c88760e6994f0026d2fc302efdadf0bf7729f9b0464a1" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.670Z" + "updatedAt": "2018-04-24T13:47:21.810Z" } \ No newline at end of file diff --git a/build/contracts/Dataset.json b/build/contracts/Dataset.json index 6acc523d..bda0dab8 100644 --- a/build/contracts/Dataset.json +++ b/build/contracts/Dataset.json @@ -1490,5 +1490,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.865Z" + "updatedAt": "2018-04-24T13:30:35.515Z" } \ No newline at end of file diff --git a/build/contracts/DatasetHub.json b/build/contracts/DatasetHub.json index cb867ac7..3347cb00 100644 --- a/build/contracts/DatasetHub.json +++ b/build/contracts/DatasetHub.json @@ -3500,30 +3500,6 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": { - "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - } - }, - "links": {}, - "address": "0x97f2f83bfbf3bf9b9f641204ace4ba6cfe8f3c3e", - "transactionHash": "0x2ee1aeb9027d9420ef79e393815d42333353be2381ffa0c2ec5516bfd3792c14" - }, "4": { "events": { "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { @@ -3545,8 +3521,8 @@ } }, "links": {}, - "address": "0xc6ce0a9928ac8da11e34c7f8ac174af058162295", - "transactionHash": "0x5cf4c4c290a0b88f8e568c0bb9869b07f37ec9c8aff5b2d5a6b58d1385d97493" + "address": "0x07e12c896a86c54ad0a068fca5f0d0cd9e02aba0", + "transactionHash": "0xbb70e28561843a385dc2afdf2baa81da69769e46f536ec9f1fd72dd34373bc98" }, "42": { "events": { @@ -3569,10 +3545,10 @@ } }, "links": {}, - "address": "0x9542f1373ff375f5c6213a761e97c3ea6eb91cad", - "transactionHash": "0x72cd7fbf9a9c4863ef96c2806e159befc6c72806b832e0aff675f977691d2bdc" + "address": "0x4d4f1096e353b288b7f815a3c0bb878b3e0fa930", + "transactionHash": "0xbfb5913f0a958aa892366bffb12a12ea9da5a69a1448d6db093ee829b73d336e" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.673Z" + "updatedAt": "2018-04-24T13:47:21.813Z" } \ No newline at end of file diff --git a/build/contracts/ERC20.json b/build/contracts/ERC20.json index e4caad8e..85adc1f4 100644 --- a/build/contracts/ERC20.json +++ b/build/contracts/ERC20.json @@ -1795,5 +1795,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.903Z" + "updatedAt": "2018-04-24T13:30:35.542Z" } \ No newline at end of file diff --git a/build/contracts/IexecAPI.json b/build/contracts/IexecAPI.json index 2df9e644..28533346 100644 --- a/build/contracts/IexecAPI.json +++ b/build/contracts/IexecAPI.json @@ -6460,5 +6460,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.866Z" + "updatedAt": "2018-04-24T13:30:35.515Z" } \ No newline at end of file diff --git a/build/contracts/IexecCallbackInterface.json b/build/contracts/IexecCallbackInterface.json index 7135cfb6..72362f22 100644 --- a/build/contracts/IexecCallbackInterface.json +++ b/build/contracts/IexecCallbackInterface.json @@ -722,5 +722,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.867Z" + "updatedAt": "2018-04-24T13:30:35.516Z" } \ No newline at end of file diff --git a/build/contracts/IexecHub.json b/build/contracts/IexecHub.json index 2ef5d822..4d742fcb 100644 --- a/build/contracts/IexecHub.json +++ b/build/contracts/IexecHub.json @@ -46931,330 +46931,6 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": { - "0x359f2105b31d71ee8e2315c3dc3427b3f7297dcc85dd3883d4554e67f1f22d00": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "woid", - "type": "address" - }, - { - "indexed": true, - "name": "workerPool", - "type": "address" - } - ], - "name": "WorkOrderActivated", - "type": "event" - }, - "0xb3cae8ec1c2754530963fb2e254826aae88dda74178f1a0c5656776941e604b8": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "woid", - "type": "address" - }, - { - "indexed": false, - "name": "workerPool", - "type": "address" - } - ], - "name": "WorkOrderClaimed", - "type": "event" - }, - "0xed236d0a24cb7a32c76960696e44bac711b80ef76780688405dc96c2495b75f9": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "woid", - "type": "address" - }, - { - "indexed": false, - "name": "workerPool", - "type": "address" - } - ], - "name": "WorkOrderCompleted", - "type": "event" - }, - "0x03d3b6187bbe7d21aa3cf229e292ba41fa8bca6ec2128c0f1625178b8191cdc2": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "appOwner", - "type": "address" - }, - { - "indexed": true, - "name": "app", - "type": "address" - }, - { - "indexed": false, - "name": "appName", - "type": "string" - }, - { - "indexed": false, - "name": "appPrice", - "type": "uint256" - }, - { - "indexed": false, - "name": "appParams", - "type": "string" - } - ], - "name": "CreateApp", - "type": "event" - }, - "0x49413c774d3fe9c92f6ada69299963d9b4b1c13a1f2a95a019188e2c161ed143": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "datasetOwner", - "type": "address" - }, - { - "indexed": true, - "name": "dataset", - "type": "address" - }, - { - "indexed": false, - "name": "datasetName", - "type": "string" - }, - { - "indexed": false, - "name": "datasetPrice", - "type": "uint256" - }, - { - "indexed": false, - "name": "datasetParams", - "type": "string" - } - ], - "name": "CreateDataset", - "type": "event" - }, - "0x3c29f4ff1e741e465a1ad9cc4c0b8e51c046c021ca9e77172d812ae667f566f8": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "workerPoolOwner", - "type": "address" - }, - { - "indexed": true, - "name": "workerPool", - "type": "address" - }, - { - "indexed": false, - "name": "workerPoolDescription", - "type": "string" - } - ], - "name": "CreateWorkerPool", - "type": "event" - }, - "0x62bf08360c9d561749c54eaf4f8bf8cb6c8b6f4f40607bcec39a8172e714d25c": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "catid", - "type": "uint256" - }, - { - "indexed": false, - "name": "name", - "type": "string" - }, - { - "indexed": false, - "name": "description", - "type": "string" - }, - { - "indexed": false, - "name": "workClockTimeRef", - "type": "uint256" - } - ], - "name": "CreateCategory", - "type": "event" - }, - "0xd3548f8b6a2a11c4a35ef5a16dbf7142c9db5163c7d46e7f66482664277cff07": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "workerPool", - "type": "address" - }, - { - "indexed": false, - "name": "worker", - "type": "address" - } - ], - "name": "WorkerPoolSubscription", - "type": "event" - }, - "0x9644170e77fec17243f5fdc3519cba6d2162d1dda59af75508fd9a2005aeb784": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "workerPool", - "type": "address" - }, - { - "indexed": false, - "name": "worker", - "type": "address" - } - ], - "name": "WorkerPoolUnsubscription", - "type": "event" - }, - "0x5580db655b3146ef4d1fdba3305cf74dbc3f29126c7a3832533f84e00d149ee3": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "workerPool", - "type": "address" - }, - { - "indexed": false, - "name": "worker", - "type": "address" - } - ], - "name": "WorkerPoolEviction", - "type": "event" - }, - "0x98b231d22df4a95e9d99b5d3f4d25fab5a821c22d7f517a522731c2892ed4535": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "woid", - "type": "address" - }, - { - "indexed": true, - "name": "worker", - "type": "address" - } - ], - "name": "AccurateContribution", - "type": "event" - }, - "0xd21e70eb7104cb6f403402b79fe1c088dc56b69ecb7474ae68a3e861a5a6d499": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "woid", - "type": "address" - }, - { - "indexed": true, - "name": "worker", - "type": "address" - } - ], - "name": "FaultyContribution", - "type": "event" - }, - "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "owner", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Deposit", - "type": "event" - }, - "0x884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a9424364": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "owner", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Withdraw", - "type": "event" - }, - "0x619caafabdd75649b302ba8419e48cccf64f37f1983ac4727cfb38b57703ffc9": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "user", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Reward", - "type": "event" - }, - "0x4051ba94e08bb094159fc38391422b4b8ccfd2b1f8919c0eb37bb042d4b9cd8e": { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "user", - "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" - } - ], - "name": "Seize", - "type": "event" - } - }, - "links": {}, - "address": "0x8bbf09dc4514077b60a45cbd6d8294111534500d", - "transactionHash": "0x6d78bf5941175a90e47bcc48c4ada49012632ec57178a420fb43d59b5810955d" - }, "4": { "events": { "0x359f2105b31d71ee8e2315c3dc3427b3f7297dcc85dd3883d4554e67f1f22d00": { @@ -47576,8 +47252,8 @@ } }, "links": {}, - "address": "0x374bb77dd977716f813b820f5737cfc9a7a7aa05", - "transactionHash": "0xf5247ed94fa4ae172b9a9f830aac8ca799b94af3f8bc185bc3fd2117ead1f50f" + "address": "0x0439c512222d00c0e197d9b4f8bce6198a9902e4", + "transactionHash": "0x84a1182aa50da0649342b54ad837bf37dcb9c46ccd7d6547391e4a5daee77638" }, "42": { "events": { @@ -47900,10 +47576,10 @@ } }, "links": {}, - "address": "0xb6c77a4a16cc3373a46f1d143c67f09127a6a086", - "transactionHash": "0x8f48edb65d695eff021a68bdb3f4d8834d79d0ad0a1564902ad9105f6c908306" + "address": "0xd6fac685e694fcfb60738fa50bac7cd4c0bad7db", + "transactionHash": "0x53392c4d4a16a723751578c32e9045e466a37a894e8c964375d53a7104922f85" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.737Z" + "updatedAt": "2018-04-24T13:47:21.855Z" } \ No newline at end of file diff --git a/build/contracts/IexecHubAccessor.json b/build/contracts/IexecHubAccessor.json index 01c68181..b49e4ed0 100644 --- a/build/contracts/IexecHubAccessor.json +++ b/build/contracts/IexecHubAccessor.json @@ -1131,5 +1131,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.874Z" + "updatedAt": "2018-04-24T13:30:35.524Z" } \ No newline at end of file diff --git a/build/contracts/IexecHubInterface.json b/build/contracts/IexecHubInterface.json index 4ad12f1c..1be74efc 100644 --- a/build/contracts/IexecHubInterface.json +++ b/build/contracts/IexecHubInterface.json @@ -9472,5 +9472,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.875Z" + "updatedAt": "2018-04-24T13:30:35.524Z" } \ No newline at end of file diff --git a/build/contracts/IexecLib.json b/build/contracts/IexecLib.json index b9110308..184e9144 100644 --- a/build/contracts/IexecLib.json +++ b/build/contracts/IexecLib.json @@ -2089,5 +2089,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.876Z" + "updatedAt": "2018-04-24T13:30:35.525Z" } \ No newline at end of file diff --git a/build/contracts/Marketplace.json b/build/contracts/Marketplace.json index 319ecdcf..cdfb2c2b 100644 --- a/build/contracts/Marketplace.json +++ b/build/contracts/Marketplace.json @@ -12523,25 +12523,19 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": {}, - "links": {}, - "address": "0xdc61f092704dc567be178323a951edd59bde4736", - "transactionHash": "0x75198166e7e4b6f512154c27238dc5769ddfbc054ba1fa584c5856139042a008" - }, "4": { "events": {}, "links": {}, - "address": "0x446ff67e20cdffcd427946cc3b6fa9ec411bf5c3", - "transactionHash": "0x1a0a2f0e05e969cd0887a8d4113c6824f602e3bc55613307c95cc48bdd35a494" + "address": "0xfdb29ec352ad5efea3fad3cf1eeb6f9e61a1c1c7", + "transactionHash": "0xf33d9f86bd2ad148266888584474820ca71fc78176aaad827428e5579a1d2421" }, "42": { "events": {}, "links": {}, - "address": "0xf7ef6b1052ad2d7a8400cb2a9bfec1dd5e1eac90", - "transactionHash": "0x3ee5152dc2ba18cbadfb33ad8845277718e755c685b07de4229b0fb3600097c7" + "address": "0x32aedc290604f7a674781b232143b837a358d711", + "transactionHash": "0xa13fbf77364049cc20126a520dd578fbc6d774eeb2a05c53b66fb0c64a9e45a2" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.690Z" + "updatedAt": "2018-04-24T13:47:21.826Z" } \ No newline at end of file diff --git a/build/contracts/MarketplaceAccessor.json b/build/contracts/MarketplaceAccessor.json index a16240d9..86d96f6d 100644 --- a/build/contracts/MarketplaceAccessor.json +++ b/build/contracts/MarketplaceAccessor.json @@ -875,5 +875,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.879Z" + "updatedAt": "2018-04-24T13:30:35.528Z" } \ No newline at end of file diff --git a/build/contracts/MarketplaceInterface.json b/build/contracts/MarketplaceInterface.json index 92506346..5cf43e25 100644 --- a/build/contracts/MarketplaceInterface.json +++ b/build/contracts/MarketplaceInterface.json @@ -2037,5 +2037,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.879Z" + "updatedAt": "2018-04-24T13:30:35.528Z" } \ No newline at end of file diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json index a26b8dde..4223a688 100644 --- a/build/contracts/Migrations.json +++ b/build/contracts/Migrations.json @@ -1375,25 +1375,19 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": {}, - "links": {}, - "address": "0x670ed4bb1fd989cfaae1b6e508663f9174e74901", - "transactionHash": "0x1a2c06cad52560461769f84f7cc05504d371f3f90923d75c5188bf8f108e899a" - }, "4": { "events": {}, "links": {}, - "address": "0x5c5de6b1b80eee8e1431824e3931f853d0fedc0b", - "transactionHash": "0xad6d3e61ba7c2fc335f14644f0285d3cb966b201981335ab1cd9211851882842" + "address": "0x45cbd2d0e9a913f17669f226727b1849ff7bfcb7", + "transactionHash": "0x13171ebc1d23e5e5033c536e69021e6d56418cbd472f0cc66f796a6478bcf8b4" }, "42": { "events": {}, "links": {}, - "address": "0x6a6446fd53ff278e8e08ea97d6f85802bc0061fd", - "transactionHash": "0x361324899f441d4cc6ebcee0e207231f373bd658633ab28923c7370afd4859b0" + "address": "0x76b8c862234eb74aaa030c68f01c8d4baaeee5ee", + "transactionHash": "0xba892965edfbf968f96a19b1de8796241791cd8851f151da53d1cffb61c9e0be" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.681Z" + "updatedAt": "2018-04-24T13:47:21.816Z" } \ No newline at end of file diff --git a/build/contracts/Ownable.json b/build/contracts/Ownable.json index 44adeeb2..081418eb 100644 --- a/build/contracts/Ownable.json +++ b/build/contracts/Ownable.json @@ -1006,5 +1006,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.904Z" + "updatedAt": "2018-04-24T13:30:35.544Z" } \ No newline at end of file diff --git a/build/contracts/OwnableOZ.json b/build/contracts/OwnableOZ.json index d0bf61bf..107e4983 100644 --- a/build/contracts/OwnableOZ.json +++ b/build/contracts/OwnableOZ.json @@ -1443,5 +1443,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.879Z" + "updatedAt": "2018-04-24T13:30:35.528Z" } \ No newline at end of file diff --git a/build/contracts/RLC.json b/build/contracts/RLC.json index 38ebab69..03fd31d4 100644 --- a/build/contracts/RLC.json +++ b/build/contracts/RLC.json @@ -8719,5 +8719,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.683Z" + "updatedAt": "2018-04-24T13:47:21.819Z" } \ No newline at end of file diff --git a/build/contracts/SafeMath.json b/build/contracts/SafeMath.json index 1b82b5e0..7cd0cc4e 100644 --- a/build/contracts/SafeMath.json +++ b/build/contracts/SafeMath.json @@ -4975,5 +4975,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.906Z" + "updatedAt": "2018-04-24T13:30:35.545Z" } \ No newline at end of file diff --git a/build/contracts/SafeMathOZ.json b/build/contracts/SafeMathOZ.json index 25c4492f..06e81a13 100644 --- a/build/contracts/SafeMathOZ.json +++ b/build/contracts/SafeMathOZ.json @@ -5033,5 +5033,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.880Z" + "updatedAt": "2018-04-24T13:30:35.529Z" } \ No newline at end of file diff --git a/build/contracts/TestSha.json b/build/contracts/TestSha.json index 6c0e29d8..09c74e69 100644 --- a/build/contracts/TestSha.json +++ b/build/contracts/TestSha.json @@ -2778,5 +2778,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.880Z" + "updatedAt": "2018-04-24T13:30:35.529Z" } \ No newline at end of file diff --git a/build/contracts/TokenSpender.json b/build/contracts/TokenSpender.json index 5131800e..9c84b187 100644 --- a/build/contracts/TokenSpender.json +++ b/build/contracts/TokenSpender.json @@ -390,5 +390,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.907Z" + "updatedAt": "2018-04-24T13:30:35.546Z" } \ No newline at end of file diff --git a/build/contracts/WorkOrder.json b/build/contracts/WorkOrder.json index 83f14613..fc16762e 100644 --- a/build/contracts/WorkOrder.json +++ b/build/contracts/WorkOrder.json @@ -7536,5 +7536,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.881Z" + "updatedAt": "2018-04-24T13:30:35.530Z" } \ No newline at end of file diff --git a/build/contracts/WorkerPool.json b/build/contracts/WorkerPool.json index c8b9f2ac..f5c87136 100644 --- a/build/contracts/WorkerPool.json +++ b/build/contracts/WorkerPool.json @@ -46772,5 +46772,5 @@ }, "networks": {}, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:13:40.882Z" + "updatedAt": "2018-04-24T13:30:35.531Z" } \ No newline at end of file diff --git a/build/contracts/WorkerPoolHub.json b/build/contracts/WorkerPoolHub.json index 63a7303b..a2ba3ac9 100644 --- a/build/contracts/WorkerPoolHub.json +++ b/build/contracts/WorkerPoolHub.json @@ -5657,30 +5657,6 @@ "version": "0.4.21+commit.dfe3193c.Emscripten.clang" }, "networks": { - "3": { - "events": { - "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - } - }, - "links": {}, - "address": "0x3fb50bb0716e0967c2c76599aad214b62b9b74c8", - "transactionHash": "0x279013f3b1dbd073a8cdd5d1c32c3a37535a450c1e9b78e21a472ace3911c8d9" - }, "4": { "events": { "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0": { @@ -5702,8 +5678,8 @@ } }, "links": {}, - "address": "0x201d5e5bb4e865be7f9a84ff0f12a1ca1980dcbd", - "transactionHash": "0xf058caf372d72302d3efb70a9ac323f803d8b80087f352bd1fdb0b6f0718c64c" + "address": "0xce72d26a3bf413c76254e6d6af9745ff11383135", + "transactionHash": "0x3db74ce812efda0e43c9bb3105c59116f116f9797e55d3231e0a8cf4d86fbddb" }, "42": { "events": { @@ -5726,10 +5702,10 @@ } }, "links": {}, - "address": "0x4f9aaf6f6244cdee53c8147eb2839aeae548a207", - "transactionHash": "0x04097a44fd9a1078aeb9f182bc91b42c0b799373f7593afc92e8c3a532d794bb" + "address": "0x09e045d87158a06035d0204d13cc9199779a233d", + "transactionHash": "0xcfe9554fa8a29889afd7a25dd50a308549f7512b9706f18a6abe0361946abe19" } }, "schemaVersion": "2.0.0", - "updatedAt": "2018-04-12T21:44:21.676Z" + "updatedAt": "2018-04-24T13:47:21.806Z" } \ No newline at end of file diff --git a/config/categories.json b/config/categories.json index 6f39289f..bb9ff1a1 100644 --- a/config/categories.json +++ b/config/categories.json @@ -1,51 +1,38 @@ { "categories": [{ - "name": "Mega", + "name": "1", "description": { - "in": "100mo", - "out": "100mo" + "io": "10mo" }, - "workClockTimeRef": 120 - }, - { - "name": "MegaPlus", - "description": { - "in": "512mo", - "out": "512mo" - }, - "workClockTimeRef": 300 + "workClockTimeRef": 30 }, { - "name": "Giga", + "name": "2", "description": { - "in": "1Go", - "out": "1Go" + "io": "100mo" }, - "workClockTimeRef": 1800 + "workClockTimeRef": 120 }, { - "name": "GigaPlus", + "name": "3", "description": { - "in": "5Go", - "out": "5Go" + "io": "250mo" }, - "workClockTimeRef": 3600 + "workClockTimeRef": 900 }, { - "name": "GigaGrande", + "name": "4", "description": { - "in": "250go", - "out": "250go" + "io": "500mo" }, - "workClockTimeRef": 18000 + "workClockTimeRef": 1800 }, { - "name": "GigaMax", + "name": "5", "description": { - "in": "500go", - "out": "500go" + "io": "1go" }, - "workClockTimeRef": 36000 + "workClockTimeRef": 3600 } ] } diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js index 5e950e3e..74427789 100644 --- a/migrations/2_deploy_contracts.js +++ b/migrations/2_deploy_contracts.js @@ -12,7 +12,6 @@ const readFileAsync = Promise.promisify(fs.readFile); // Contracts FULL DEV DEPLOY with new RLC token created **/ - module.exports = function(deployer) { let aRLCInstance; let aWorkerPoolHubInstance; @@ -202,15 +201,10 @@ module.exports = function(deployer) { console.log("create category : "+categoriesConfigFileJson.categories[4].name); return aIexecHub.createCategory(categoriesConfigFileJson.categories[4].name,JSON.stringify(categoriesConfigFileJson.categories[4].description),categoriesConfigFileJson.categories[4].workClockTimeRef); }) - .then(categoriesCreated => { - console.log("create category : "+categoriesConfigFileJson.categories[5].name); - return aIexecHub.createCategory(categoriesConfigFileJson.categories[5].name,JSON.stringify(categoriesConfigFileJson.categories[5].description),categoriesConfigFileJson.categories[5].workClockTimeRef); - }) .then(categoriesCreated => { return aIexecHub.m_categoriesCount.call() }) .then(m_categoriesCount => console.log("m_categoriesCount is now: "+m_categoriesCount)) ; -}; -*/ +};*/ diff --git a/test/byFunctions/WorkerPool/emitWorkOrder.js b/test/byFunctions/WorkerPool/emitWorkOrder.js index e6328a83..b5a69e48 100644 --- a/test/byFunctions/WorkerPool/emitWorkOrder.js +++ b/test/byFunctions/WorkerPool/emitWorkOrder.js @@ -295,11 +295,11 @@ contract('IexecHub', function(accounts) { from: iExecCloudUser, gas:constants.AMOUNT_GAS_PROVIDED }); - assert.strictEqual(getCategoryWorkClockTimeRefCall.toNumber(), 120, "check getCategoryWorkClockTimeRef for cat 1 =120 sec"); + assert.strictEqual(getCategoryWorkClockTimeRefCall.toNumber(), 30, "check getCategoryWorkClockTimeRef for cat 1 =30 sec"); - assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), timestamp+1200, "consensusTimout = blocktime + 120 *10"); + assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), timestamp+300, "consensusTimout = blocktime + 30 *10"); //console.log(timestamp+600); - assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), consensusTimout.toNumber(), "consensusTimout = blocktime + 120 *5"); + assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), consensusTimout.toNumber(), "consensusTimout = blocktime + 30 *5"); assert.strictEqual(winnerCount.toNumber(), 0, "check no winnerCount"); diff --git a/truffle-hdwallet.js b/truffle-hdwallet.js index 912d2802..5c511e75 100644 --- a/truffle-hdwallet.js +++ b/truffle-hdwallet.js @@ -81,57 +81,55 @@ Saving artifacts... Running migration: 1_initial_migration.js Deploying Migrations... - ... 0xad6d3e61ba7c2fc335f14644f0285d3cb966b201981335ab1cd9211851882842 - Migrations: 0x5c5de6b1b80eee8e1431824e3931f853d0fedc0b + ... 0x13171ebc1d23e5e5033c536e69021e6d56418cbd472f0cc66f796a6478bcf8b4 + Migrations: 0x45cbd2d0e9a913f17669f226727b1849ff7bfcb7 Saving successful migration to network... - ... 0x95fafef424840b34950beef3c8074bfaccb8c1ccb2a47391cac08c6a655f3e1a + ... 0x22585c3899a99ad6547c48d109621fb73fbea1006f72c5eb22bcc323286f31e6 Saving artifacts... Running migration: 2_deploy_contracts.js Deploying WorkerPoolHub... - ... 0xf058caf372d72302d3efb70a9ac323f803d8b80087f352bd1fdb0b6f0718c64c - WorkerPoolHub: 0x201d5e5bb4e865be7f9a84ff0f12a1ca1980dcbd - WorkerPoolHub deployed at address: 0x201d5e5bb4e865be7f9a84ff0f12a1ca1980dcbd + ... 0x3db74ce812efda0e43c9bb3105c59116f116f9797e55d3231e0a8cf4d86fbddb + WorkerPoolHub: 0xce72d26a3bf413c76254e6d6af9745ff11383135 + WorkerPoolHub deployed at address: 0xce72d26a3bf413c76254e6d6af9745ff11383135 Deploying AppHub... - ... 0x06fa7774178e9297bf510c524714fcd999ab7790c44965dfaf744e9b0ebccb64 - AppHub: 0x700425c7684e069c27ec3b3784a22025f95c6057 - AppHub deployed at address: 0x700425c7684e069c27ec3b3784a22025f95c6057 + ... 0xae81343bafb8a275a59f84a6d20221364b9d37100f450a49792c1c0fc5bbd7f3 + AppHub: 0x71cb68b0d9bf2b4a03c2caa6ea54773ba413163f + AppHub deployed at address: 0x71cb68b0d9bf2b4a03c2caa6ea54773ba413163f Deploying DatasetHub... - ... 0x5cf4c4c290a0b88f8e568c0bb9869b07f37ec9c8aff5b2d5a6b58d1385d97493 - DatasetHub: 0xc6ce0a9928ac8da11e34c7f8ac174af058162295 - DatasetHub deployed at address: 0xc6ce0a9928ac8da11e34c7f8ac174af058162295 + ... 0xbb70e28561843a385dc2afdf2baa81da69769e46f536ec9f1fd72dd34373bc98 + DatasetHub: 0x07e12c896a86c54ad0a068fca5f0d0cd9e02aba0 + DatasetHub deployed at address: 0x07e12c896a86c54ad0a068fca5f0d0cd9e02aba0 Deploying IexecHub... - ... 0xf5247ed94fa4ae172b9a9f830aac8ca799b94af3f8bc185bc3fd2117ead1f50f - IexecHub: 0x374bb77dd977716f813b820f5737cfc9a7a7aa05 - IexecHub deployed at address: 0x374bb77dd977716f813b820f5737cfc9a7a7aa05 - ... 0x94ad95c7e80f69a4c4f7762811a0467e961cafd9f4f41e4c3185a41fd14e5693 + ... 0x84a1182aa50da0649342b54ad837bf37dcb9c46ccd7d6547391e4a5daee77638 + IexecHub: 0x0439c512222d00c0e197d9b4f8bce6198a9902e4 + IexecHub deployed at address: 0x0439c512222d00c0e197d9b4f8bce6198a9902e4 + ... 0xcf672d6dcac0ec9105ea0a324a90f30b8229e34883b02a834ec72c4c16cce33d transferOwnership of WorkerPoolHub to IexecHub - ... 0x2c205da845a051c60bbefdc3895959a4886ad2a7290280a67257f0319c1c58a7 + ... 0x6547118e2fc0be1f2d8c44a8c1f335a9293100f814ddd66a1584580b9bf1af48 transferOwnership of AppHub to IexecHub - ... 0x233a9bb5c643b0b1e471d5e1b04b07284aefd30b6ab14acc0fb04986e839f02f + ... 0x12d9d882199d0a67a24085ccaace9bbe821021ab55ec051fc951615925b854a5 transferOwnership of DatasetHub to IexecHub Deploying Marketplace... - ... 0x1a0a2f0e05e969cd0887a8d4113c6824f602e3bc55613307c95cc48bdd35a494 - Marketplace: 0x446ff67e20cdffcd427946cc3b6fa9ec411bf5c3 - Marketplace deployed at address: 0x446ff67e20cdffcd427946cc3b6fa9ec411bf5c3 - ... 0xdcc1f194ec32690756f2e998c597fb7eee7468c22fd887cf2719ef911e056660 + ... 0xf33d9f86bd2ad148266888584474820ca71fc78176aaad827428e5579a1d2421 + Marketplace: 0xfdb29ec352ad5efea3fad3cf1eeb6f9e61a1c1c7 + Marketplace deployed at address: 0xfdb29ec352ad5efea3fad3cf1eeb6f9e61a1c1c7 + ... 0x64a2ea020d7c63d9f1cc32fececa6385256542631ecc275dd1641fd0eef900dd attach Contracts to IexecHub done - ... 0x589a1ef5e1029d39719680cf708e2bf188b27d7ecf7f708adac602ec398b415a + ... 0x7d4e46de74449f36a5c067a2730eff136f162c27f363318987ee098608408f7a setCategoriesCreator to 0xcd7CcF952E0482ca41b46c6BBAd3A1852faD69dC - create category : Mega - ... 0xf8ef1e7f49b3bded46ba07a6544852c656d6e62b65236b219a306362ea323ae4 - create category : MegaPlus - ... 0x8631d4430758979c18583dfaae4827f4d354276fea0b5ac1de7a87c48b4b1dd8 - create category : Giga - ... 0x7b85bbab7a6892d160e52bea9b54f1b471cfdfac8874fb1d7e12e3cf095be418 - create category : GigaPlus - ... 0x7206e94cc1f929305bbe2ef29cc863f32ba5018545f497ddb40ae27995ff6478 - create category : GigaGrande - ... 0x21fe3027d572b13d999b8f6e863a4f33040871d3438455328a13f18f8ce3b157 - create category : GigaMax - ... 0xe2db7a9faedb4abcd87bd011f4314462e5b7714d9e3550f151f93209c3ab3b8d - m_categoriesCount is now: 6 + create category : 1 + ... 0xb26231545fa9c49491bb9e264abe07e7db1dfa7649ee6a99dba30d6ca538f81d + create category : 2 + ... 0x1e252ff8857710990be91fef28088ac220008f3c810642753759b63cea912a20 + create category : 3 + ... 0x25b1d2e75350e1ae19d25d828efe140e464eb67bd73fa63e966f11af1c77aa05 + create category : 4 + ... 0x81cbc28d564675748defa7c5425e827a51b80a0cd2755d2920d8e1b958af90ad + create category : 5 + ... 0x9ac6b88e1a345a2e21c71cf1f8740c0f06644df14e3d80be6b6b93ec8f2632e4 + m_categoriesCount is now: 5 Saving successful migration to network... - ... 0xac25b2960c1c3d4e67dc6ab133e81bf1e5ba694deb93dd0a41f821a1d043c8ab + ... 0x043526e478270f90fdb2c949de758d2d33f322b7833ac0d8020087e31b319193 Saving artifacts... */ }, @@ -145,57 +143,55 @@ Saving artifacts... Running migration: 1_initial_migration.js Deploying Migrations... - ... 0x361324899f441d4cc6ebcee0e207231f373bd658633ab28923c7370afd4859b0 - Migrations: 0x6a6446fd53ff278e8e08ea97d6f85802bc0061fd + ... 0xba892965edfbf968f96a19b1de8796241791cd8851f151da53d1cffb61c9e0be + Migrations: 0x76b8c862234eb74aaa030c68f01c8d4baaeee5ee Saving successful migration to network... - ... 0x98d93a02a5940cf863407a3997542c1983c9f21f2634aca6ac47df93a7b83a67 + ... 0xc5d72ca17f82ec08696e349ad6ef5f244e6d2d7458b4cd519176e1915764ba86 Saving artifacts... Running migration: 2_deploy_contracts.js Deploying WorkerPoolHub... - ... 0x04097a44fd9a1078aeb9f182bc91b42c0b799373f7593afc92e8c3a532d794bb - WorkerPoolHub: 0x4f9aaf6f6244cdee53c8147eb2839aeae548a207 - WorkerPoolHub deployed at address: 0x4f9aaf6f6244cdee53c8147eb2839aeae548a207 + ... 0xcfe9554fa8a29889afd7a25dd50a308549f7512b9706f18a6abe0361946abe19 + WorkerPoolHub: 0x09e045d87158a06035d0204d13cc9199779a233d + WorkerPoolHub deployed at address: 0x09e045d87158a06035d0204d13cc9199779a233d Deploying AppHub... - ... 0x222fbb484370bea62e90bdc12a1c12ed107e0135588f87851be74c9445d52d48 - AppHub: 0x2a3827b9f8d5aaf187eb2aeaa60b3bf2e1306475 - AppHub deployed at address: 0x2a3827b9f8d5aaf187eb2aeaa60b3bf2e1306475 + ... 0x1b49c194175d9debed9c88760e6994f0026d2fc302efdadf0bf7729f9b0464a1 + AppHub: 0xab9f3c7737caa21421046f0d453ef792c9d9667c + AppHub deployed at address: 0xab9f3c7737caa21421046f0d453ef792c9d9667c Deploying DatasetHub... - ... 0x72cd7fbf9a9c4863ef96c2806e159befc6c72806b832e0aff675f977691d2bdc - DatasetHub: 0x9542f1373ff375f5c6213a761e97c3ea6eb91cad - DatasetHub deployed at address: 0x9542f1373ff375f5c6213a761e97c3ea6eb91cad + ... 0xbfb5913f0a958aa892366bffb12a12ea9da5a69a1448d6db093ee829b73d336e + DatasetHub: 0x4d4f1096e353b288b7f815a3c0bb878b3e0fa930 + DatasetHub deployed at address: 0x4d4f1096e353b288b7f815a3c0bb878b3e0fa930 Deploying IexecHub... - ... 0x8f48edb65d695eff021a68bdb3f4d8834d79d0ad0a1564902ad9105f6c908306 - IexecHub: 0xb6c77a4a16cc3373a46f1d143c67f09127a6a086 - IexecHub deployed at address: 0xb6c77a4a16cc3373a46f1d143c67f09127a6a086 - ... 0xc70c2a19fe626f65ba2e7791c95c1642ff1f0cb3de2d580d2bedc99ba054bbac + ... 0x53392c4d4a16a723751578c32e9045e466a37a894e8c964375d53a7104922f85 + IexecHub: 0xd6fac685e694fcfb60738fa50bac7cd4c0bad7db + IexecHub deployed at address: 0xd6fac685e694fcfb60738fa50bac7cd4c0bad7db + ... 0x449e1e8454492b5a30dce570bd2df29a2d4a888f443af4b7906babdfaf638f22 transferOwnership of WorkerPoolHub to IexecHub - ... 0x3fc321c6195173a2c3bff680078c0552862741e6401229029218d3536c4afb8d + ... 0x27e926baf1d3bcbc0de60a2762f0ef6499eda7a7d89084df1a03fd9f71c3c255 transferOwnership of AppHub to IexecHub - ... 0xde64493dc7aadb9113d5f499133a515118badabdd8d3284631bf2f13294afa6b + ... 0x3559b3c8a96d9e8a95efda24f515d7c4b2562a4419dd7d244de406025c06f061 transferOwnership of DatasetHub to IexecHub Deploying Marketplace... - ... 0x3ee5152dc2ba18cbadfb33ad8845277718e755c685b07de4229b0fb3600097c7 - Marketplace: 0xf7ef6b1052ad2d7a8400cb2a9bfec1dd5e1eac90 - Marketplace deployed at address: 0xf7ef6b1052ad2d7a8400cb2a9bfec1dd5e1eac90 - ... 0x649460043b755ba2276c0c1f59b45fddf1ff56c48b95658a41ed584de57da69c + ... 0xa13fbf77364049cc20126a520dd578fbc6d774eeb2a05c53b66fb0c64a9e45a2 + Marketplace: 0x32aedc290604f7a674781b232143b837a358d711 + Marketplace deployed at address: 0x32aedc290604f7a674781b232143b837a358d711 + ... 0xb66225b86ec8c181307144bb832fe3a18a92133939fcb3bc16817e66aabb0072 attach Contracts to IexecHub done - ... 0x230ceff4f9dd1d28eafae45b791f2331927b5f2f12a8d49d3f0691874be280fa + ... 0x855c7f5b8dba04b4818a08b512e850313f2451233df7a7b73d0f6ad52a1efd9a setCategoriesCreator to 0xcd7CcF952E0482ca41b46c6BBAd3A1852faD69dC - create category : Mega - ... 0xc5de531b190cb15bf6431bc9aa0f53152d79149e2501f1007481fcf718da8d93 - create category : MegaPlus - ... 0xcb5fcfdf69c00b7e8a8f4cdf148011a03e12f30ba7c4fb4653b16957f03a03f4 - create category : Giga - ... 0x1b6f6573ba822e067cb1a002e8d133d6c33c1d89cfd3839ea80c73e298396a7b - create category : GigaPlus - ... 0xf4d7633ef7cd21abf5110bb40e2a6a07e87090b189e31daf4e89765e707677fd - create category : GigaGrande - ... 0x476f8f4c1039e6c8854528588a09016d17a342c726a729596fcc9acc30b0cb31 - create category : GigaMax - ... 0x700a302c41d08582740a8bfdf1ead75f13b05d3f78af642795fcb1eed60f3179 - m_categoriesCount is now: 6 + create category : 1 + ... 0xf7d35be5c6028761ad4c47a4fd8d4a5ed97bcd573c81d9ffe965b4d4cf9defba + create category : 2 + ... 0x3c2e1987d78201a7b3ed96bebea5ea67aa97d4cdf38d0a53ffcda94900659a02 + create category : 3 + ... 0x8a0a60b793a41c422037adbf48aac74dea09b367f51a7ffb0466b08f70981daf + create category : 4 + ... 0x1c9bfc3d2a117293bfcc60766ea3c7c8b610a6d624fadc1d713ded994694b319 + create category : 5 + ... 0xf07396c4bd2400567b8d0d1f9ca13677d52002ec2293862dc06bfe9ac3ba2c2e + m_categoriesCount is now: 5 Saving successful migration to network... - ... 0x0fa7f2a735ebce0f11e61b70247875562895795e56cd089bd7c8d1310c88e36d + ... 0xba462b16c8f8573b2b8764d53c30460b13a0f8a9720829f8447411b54acfddd9 Saving artifacts... */