diff --git a/.gitignore b/.gitignore index 4d29575..aa66f22 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,13 @@ npm-debug.log* yarn-debug.log* yarn-error.log* + +build/ +node_modules/ +.idea/ +.vscode/ +coverage.json +coverage/ +coverageEnv/ +flat/ +.env diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol new file mode 100644 index 0000000..c378ffb --- /dev/null +++ b/contracts/Migrations.sol @@ -0,0 +1,23 @@ +pragma solidity >=0.4.21 <0.6.0; + +contract Migrations { + address public owner; + uint public last_completed_migration; + + constructor() public { + owner = msg.sender; + } + + modifier restricted() { + if (msg.sender == owner) _; + } + + function setCompleted(uint completed) public restricted { + last_completed_migration = completed; + } + + function upgrade(address new_address) public restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/migrations/1_initial_migration.js b/migrations/1_initial_migration.js new file mode 100644 index 0000000..ee2135d --- /dev/null +++ b/migrations/1_initial_migration.js @@ -0,0 +1,5 @@ +const Migrations = artifacts.require("Migrations"); + +module.exports = function(deployer) { + deployer.deploy(Migrations); +}; diff --git a/package.json b/package.json index e912aa8..cac092b 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,52 @@ { "name": "defi-puzzle", - "version": "0.1.0", - "private": true, + "version": "1.0.0", + "description": "", + "main": "truffle-config.js", "dependencies": { + "openzeppelin-solidity": "2.3.0", + "solidity-linked-list": "2.1.2", "classnames": "^2.2.6", "react": "^16.9.0", "react-dom": "^16.9.0", "react-scripts": "3.1.1" }, + "devDependencies": { + "dotenv": "^8.1.0", + "ganache-cli": "^6.6.0", + "elliptic": "^6.5.0", + "solidity-coverage": "^0.6.4", + "solium": "^1.2.4", + "solium-plugin-zeppelin": "^0.0.2", + "truffle": "^5.0.33", + "truffle-hdwallet-provider": "^1.0.17" + }, + "directories": { + "test": "test" + }, + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/topmonks/defi-puzzle.git" + }, "scripts": { "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "solium": "./node_modules/.bin/solium -d contracts", + "truffle": "./node_modules/.bin/truffle", + "test-contracts": "./node_modules/.bin/truffle test", + "coverage": "./node_modules/.bin/solidity-coverage", + "ganache": "./node_modules/.bin/ganache-cli -m 'gadget luxury river width frost salmon input defense embark card banner raccoon'", + "migrate": "./node_modules/.bin/truffle migrate --network ganache_cli --reset" }, "eslintConfig": { "extends": "react-app" }, + "bugs": { + "url": "https://github.com/topmonks/defi-puzzle/issues" + }, + "homepage": "https://github.com/topmonks/defi-puzzle#readme", "browserslist": { "production": [ ">0.2%", diff --git a/truffle-config.js b/truffle-config.js new file mode 100644 index 0000000..3865690 --- /dev/null +++ b/truffle-config.js @@ -0,0 +1,99 @@ +/** + * 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 + */ + + 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:
, // 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" + // } + } + } +}