This commit is contained in:
Evgeny Marchenko 2019-06-22 17:33:56 +03:00
parent 917bb4247f
commit 5cede74b52
7 changed files with 126 additions and 115 deletions

View File

@ -0,0 +1,8 @@
pragma solidity ^0.5.4;
pragma experimental ABIEncoderV2;
import "./Structs.sol";
contract IVerifier is Structs {
function isValid(Data calldata data, Proof calldata proof) external returns (bool);
}

View File

@ -0,0 +1,12 @@
pragma solidity ^0.5.4;
interface Structs {
struct Data {
uint x;
}
struct Proof {
uint x;
}
}

View File

@ -1,20 +1,8 @@
pragma solidity ^0.5.4;
pragma experimental ABIEncoderV2;
interface Structs {
struct Data {
uint x;
}
struct Proof {
uint x;
}
}
contract Verifier is Structs {
function isValid(Data calldata data, Proof calldata proof) external returns (bool);
}
import "./IVerifier.sol";
import "./Structs.sol";
contract Lazy is Structs {
event Submitted(address indexed sender, uint256 index, Task task);
@ -26,14 +14,14 @@ contract Lazy is Structs {
Data data;
Proof proof;
address payable submitter;
uint96 timestamp;
uint timestamp;
Status status;
}
Task[] public tasks;
uint256 public stake;
Verifier public verifier;
IVerifier public verifier;
/// @dev This function submits data.
/// @param data - public inptut for zkp
@ -76,5 +64,20 @@ contract Lazy is Structs {
task.status = Status.FINALIZED;
msg.sender.transfer(stake);
}
function last5Timestamps() view external returns (uint256[5] memory result) {
uint256 length = tasks.length;
for (uint256 i = 1; i <= 5; i++) {
result[i - 1] = tasks[length - i].timestamp;
}
return result;
}
function getDataById(uint256 id) view external returns (Task memory task) {
task = tasks[tasks.length - 1 - id];
}
}

View File

@ -0,0 +1,5 @@
var Lazy = artifacts.require('Lazy');
module.exports = function(deployer) {
deployer.deploy(Lazy);
}

23
truffle/package.json Normal file
View File

@ -0,0 +1,23 @@
{
"name": "testsuite-contract",
"version": "1.0.0",
"description": "",
"main": "truffle-config.js",
"directories": {
"test": "test"
},
"dependencies": {
"babel-polyfill": "^6.26.0",
"babel-register": "^6.26.0",
"ganache-cli": "^6.4.1",
"openzeppelin-solidity": "^2.1.3",
"truffle": "5.0.8",
"truffle-hdwallet-provider": "1.0.5"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC"
}

View File

@ -1,99 +0,0 @@
/**
* Use this file to configure your truffle project. It's seeded with some
* common settings for different networks and features like migrations,
* compilation and testing. Uncomment the ones you need or modify
* them to suit your project as necessary.
*
* More information about configuration can be found at:
*
* truffleframework.com/docs/advanced/configuration
*
* To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
* to sign your transactions before they're sent to a remote public node. Infura accounts
* are available for free at: infura.io/register.
*
* You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
* public/private key pairs. If you're publishing your code to GitHub make sure you load this
* phrase from a file you've .gitignored so it doesn't accidentally become public.
*
*/
// const HDWalletProvider = require('truffle-hdwallet-provider');
// const infuraKey = "fj4jll3k.....";
//
// const fs = require('fs');
// const mnemonic = fs.readFileSync(".secret").toString().trim();
module.exports = {
/**
* Networks define how you connect to your ethereum client and let you set the
* defaults web3 uses to send transactions. If you don't specify one truffle
* will spin up a development blockchain for you on port 9545 when you
* run `develop` or `test`. You can ask a truffle command to use a specific
* network from the command line, e.g
*
* $ truffle test --network <network-name>
*/
networks: {
// Useful for testing. The `development` name is special - truffle uses it by default
// if it's defined here and no other network is specified at the command line.
// You should run a client (like ganache-cli, geth or parity) in a separate terminal
// tab if you use this network and you must also set the `host`, `port` and `network_id`
// options below to some value.
//
// development: {
// host: "127.0.0.1", // Localhost (default: none)
// port: 8545, // Standard Ethereum port (default: none)
// network_id: "*", // Any network (default: none)
// },
// Another network with more advanced options...
// advanced: {
// port: 8777, // Custom port
// network_id: 1342, // Custom network
// gas: 8500000, // Gas sent with each transaction (default: ~6700000)
// gasPrice: 20000000000, // 20 gwei (in wei) (default: 100 gwei)
// from: <address>, // Account to send txs from (default: accounts[0])
// websockets: true // Enable EventEmitter interface for web3 (default: false)
// },
// Useful for deploying to a public network.
// NB: It's important to wrap the provider as a function.
// ropsten: {
// provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
// network_id: 3, // Ropsten's id
// gas: 5500000, // Ropsten has a lower block limit than mainnet
// confirmations: 2, // # of confs to wait between deployments. (default: 0)
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
// skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
// },
// Useful for private networks
// private: {
// provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
// network_id: 2111, // This network is yours, in the cloud.
// production: true // Treats this network as if it was a public net. (default: false)
// }
},
// Set default mocha options here, use special reporters etc.
mocha: {
// timeout: 100000
},
// Configure your compilers
compilers: {
solc: {
// version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version)
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
// settings: { // See the solidity docs for advice about optimization and evmVersion
// optimizer: {
// enabled: false,
// runs: 200
// },
// evmVersion: "byzantium"
// }
}
}
}

59
truffle/truffle.js Normal file
View File

@ -0,0 +1,59 @@
/*require('babel-register');
require('babel-polyfill');
*/
var HDWalletProvider = require("truffle-hdwallet-provider");
var mnemonicRopsten = "...";
var infuraLinkRopsten = "...";
var deployerAddressRopsten = "...";
var mnemonicKovan = "...";
var infuraLinkKovan = "...";
var deployerAddressKovan = "...";
var addressIndex = 0; // address index in MetaMask
module.exports = {
networks: {
development: {
host: "localhost",
network_id: "*",
port: 8545,
},
coverage: {
host: "localhost",
network_id: "*",
port: 8555, // <-- If you change this, also set the port option in .solcover.js.
gas: 0xfffffffffff, // <-- Use this high gas value
gasPrice: 0x01 // <-- Use this low gas price
},
ropsten: {
provider: function() {
return new HDWalletProvider(mnemonicRopsten, infuraLinkRopsten, addressIndex);
},
network_id: 3,
from: deployerAddressRopsten.toLowerCase(),
},
kovan: {
provider: function() {
return new HDWalletProvider(mnemonicKovan, infuraLinkKovan, addressIndex);
},
network_id: 42,
from: deployerAddressKovan.toLowerCase(),
}
},
compilers: {
solc: {
version: "0.5.4",
settings: {
optimizer: {
enabled: true,
runs: 200
}
}
}
}
// See <http://truffleframework.com/docs/advanced/configuration>
// to customize your Truffle configuration!
};