truffle 2=>3

This commit is contained in:
Manuel Araoz
2017-02-15 12:14:50 -03:00
parent a69333e2b8
commit 7e7193ae61
19 changed files with 33 additions and 13 deletions

View File

@ -13,6 +13,17 @@ import "./DayLimit.sol";
* Wallet(w).from(anotherOwner).confirm(h);
*/
contract MultisigWallet is Multisig, Shareable, DayLimit {
struct Transaction {
address to;
uint value;
bytes data;
}
function MultisigWallet(address[] _owners, uint _required, uint _daylimit)
Shareable(_owners, _required)
DayLimit(_daylimit) { }
// kills the contract sending everything to `_to`.
function kill(address _to) onlymanyowners(sha3(msg.data)) external {
suicide(_to);

View File

@ -1,3 +1,5 @@
var Migrations = artifacts.require("./Migrations.sol");
module.exports = function(deployer) {
deployer.deploy(Migrations);
};

View File

@ -7,6 +7,7 @@
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-2": "^6.18.0",
"babel-preset-stage-3": "^6.17.0",
"babel-register": "^6.23.0",
"ethereumjs-testrpc": "^3.0.2",
"truffle": "^3.1.1"
},

View File

@ -2,6 +2,6 @@
testrpc &
trpc_pid=$!
node_modules/truffle/cli.js test
truffle test
kill -9 $trpc_pid

View File

@ -1,5 +1,7 @@
const assertJump = require('./helpers/assertJump');
var BasicTokenMock = artifacts.require("./helpers/BasicTokenMock.sol");
contract('BasicToken', function(accounts) {
it("should return the correct totalSupply after construction", async function() {

View File

@ -1,5 +1,6 @@
const assertJump = require('./helpers/assertJump');
const timer = require('./helpers/timer');
var VestedTokenMock = artifacts.require("./helpers/VestedTokenMock.sol");
contract('VestedToken', function(accounts) {
let token = null

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../token/BasicToken.sol';
import '../../contracts/token/BasicToken.sol';
// mock class using BasicToken

View File

@ -1,5 +1,5 @@
pragma solidity ^0.4.4;
import "../DayLimit.sol";
import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
uint public totalSpending;

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import {Bounty, Target} from "../Bounty.sol";
import {Bounty, Target} from "../../contracts/Bounty.sol";
contract InsecureTargetMock is Target {

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../LimitBalance.sol';
import '../../contracts/LimitBalance.sol';
// mock class using LimitBalance

View File

@ -1,5 +1,5 @@
pragma solidity ^0.4.4;
import "../MultisigWallet.sol";
import "../../contracts/MultisigWallet.sol";
contract MultisigWalletMock is MultisigWallet {
uint public totalSpending;

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../lifecycle/Pausable.sol';
import '../../contracts/lifecycle/Pausable.sol';
// mock class using Pausable

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../payment/PullPayment.sol';
import '../../contracts/payment/PullPayment.sol';
// mock class using PullPayment

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../SafeMath.sol';
import '../../contracts/SafeMath.sol';
contract SafeMathMock is SafeMath {

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import {Bounty, Target} from "../Bounty.sol";
import {Bounty, Target} from "../../contracts/Bounty.sol";
contract SecureTargetMock is Target {

View File

@ -1,5 +1,5 @@
pragma solidity ^0.4.4;
import "../ownership/Shareable.sol";
import "../../contracts/ownership/Shareable.sol";
contract ShareableMock is Shareable {

View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.4;
import '../token/StandardToken.sol';
import '../../contracts/token/StandardToken.sol';
// mock class using StandardToken

View File

@ -1,6 +1,6 @@
pragma solidity ^0.4.4;
import '../token/VestedToken.sol';
import '../../contracts/token/VestedToken.sol';
// mock class using StandardToken
contract VestedTokenMock is VestedToken {

View File

@ -1,3 +1,6 @@
require('babel-register');
require('babel-polyfill');
module.exports = {
networks: {
development: {