From b49a62f44c7f660a5385ab190162427ec50f418f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=A1=D0=BE=D0=B1=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=B2?= Date: Sun, 23 Jun 2019 15:01:34 +0300 Subject: [PATCH] Updated migrations --- truffle/contracts/Lazy.sol | 4 +--- truffle/package.json | 9 +++++---- truffle/truffle.js | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/truffle/contracts/Lazy.sol b/truffle/contracts/Lazy.sol index 174f6e0..9f52de2 100644 --- a/truffle/contracts/Lazy.sol +++ b/truffle/contracts/Lazy.sol @@ -72,9 +72,7 @@ contract Lazy is Structs { msg.sender.transfer(stake); } - function taskDataById(uint id) external view returns( - uint[13] memory data - ) { + function taskDataById(uint id) external view returns(uint[13] memory data) { Task memory task = tasks[id]; data[0] = task.data.input[0]; diff --git a/truffle/package.json b/truffle/package.json index 4a5d1bd..44a387f 100644 --- a/truffle/package.json +++ b/truffle/package.json @@ -2,19 +2,20 @@ "name": "testsuite-contract", "version": "1.0.0", "description": "", - "main": "truffle-config.js", + "main": "truffle.js", "directories": { "test": "test" }, "dependencies": { + "any-promise": "^1.3.0", "babel-polyfill": "^6.26.0", "babel-register": "^6.26.0", + "bindings": "^1.5.0", "ganache-cli": "^6.4.1", "openzeppelin-solidity": "^2.1.3", - "truffle": "5.0.8", - "truffle-hdwallet-provider": "1.0.5" + "truffle": "5.0.24", + "truffle-hdwallet-provider": "^1.0.0-web3one.5" }, - "devDependencies": {}, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/truffle/truffle.js b/truffle/truffle.js index c3f69bb..3e9befb 100644 --- a/truffle/truffle.js +++ b/truffle/truffle.js @@ -1,6 +1,6 @@ -/*require('babel-register'); -require('babel-polyfill'); -*/ +// require('babel-register'); +// require('babel-polyfill'); + var HDWalletProvider = require("truffle-hdwallet-provider"); var mnemonicRopsten = "..."; @@ -41,7 +41,6 @@ module.exports = { network_id: 42, from: deployerAddressKovan.toLowerCase(), } - }, compilers: { solc: {