truffle 2=>3
This commit is contained in:
@ -13,6 +13,17 @@ import "./DayLimit.sol";
|
|||||||
* Wallet(w).from(anotherOwner).confirm(h);
|
* Wallet(w).from(anotherOwner).confirm(h);
|
||||||
*/
|
*/
|
||||||
contract MultisigWallet is Multisig, Shareable, DayLimit {
|
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`.
|
// kills the contract sending everything to `_to`.
|
||||||
function kill(address _to) onlymanyowners(sha3(msg.data)) external {
|
function kill(address _to) onlymanyowners(sha3(msg.data)) external {
|
||||||
suicide(_to);
|
suicide(_to);
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
var Migrations = artifacts.require("./Migrations.sol");
|
||||||
|
|
||||||
module.exports = function(deployer) {
|
module.exports = function(deployer) {
|
||||||
deployer.deploy(Migrations);
|
deployer.deploy(Migrations);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
"babel-preset-es2015": "^6.18.0",
|
"babel-preset-es2015": "^6.18.0",
|
||||||
"babel-preset-stage-2": "^6.18.0",
|
"babel-preset-stage-2": "^6.18.0",
|
||||||
"babel-preset-stage-3": "^6.17.0",
|
"babel-preset-stage-3": "^6.17.0",
|
||||||
|
"babel-register": "^6.23.0",
|
||||||
"ethereumjs-testrpc": "^3.0.2",
|
"ethereumjs-testrpc": "^3.0.2",
|
||||||
"truffle": "^3.1.1"
|
"truffle": "^3.1.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
testrpc &
|
testrpc &
|
||||||
trpc_pid=$!
|
trpc_pid=$!
|
||||||
node_modules/truffle/cli.js test
|
truffle test
|
||||||
kill -9 $trpc_pid
|
kill -9 $trpc_pid
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
const assertJump = require('./helpers/assertJump');
|
const assertJump = require('./helpers/assertJump');
|
||||||
|
|
||||||
|
var BasicTokenMock = artifacts.require("./helpers/BasicTokenMock.sol");
|
||||||
|
|
||||||
contract('BasicToken', function(accounts) {
|
contract('BasicToken', function(accounts) {
|
||||||
|
|
||||||
it("should return the correct totalSupply after construction", async function() {
|
it("should return the correct totalSupply after construction", async function() {
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
const assertJump = require('./helpers/assertJump');
|
const assertJump = require('./helpers/assertJump');
|
||||||
const timer = require('./helpers/timer');
|
const timer = require('./helpers/timer');
|
||||||
|
var VestedTokenMock = artifacts.require("./helpers/VestedTokenMock.sol");
|
||||||
|
|
||||||
contract('VestedToken', function(accounts) {
|
contract('VestedToken', function(accounts) {
|
||||||
let token = null
|
let token = null
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../token/BasicToken.sol';
|
import '../../contracts/token/BasicToken.sol';
|
||||||
|
|
||||||
|
|
||||||
// mock class using BasicToken
|
// mock class using BasicToken
|
||||||
@ -1,5 +1,5 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
import "../DayLimit.sol";
|
import "../../contracts/DayLimit.sol";
|
||||||
|
|
||||||
contract DayLimitMock is DayLimit {
|
contract DayLimitMock is DayLimit {
|
||||||
uint public totalSpending;
|
uint public totalSpending;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import {Bounty, Target} from "../Bounty.sol";
|
import {Bounty, Target} from "../../contracts/Bounty.sol";
|
||||||
|
|
||||||
|
|
||||||
contract InsecureTargetMock is Target {
|
contract InsecureTargetMock is Target {
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../LimitBalance.sol';
|
import '../../contracts/LimitBalance.sol';
|
||||||
|
|
||||||
|
|
||||||
// mock class using LimitBalance
|
// mock class using LimitBalance
|
||||||
@ -1,5 +1,5 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
import "../MultisigWallet.sol";
|
import "../../contracts/MultisigWallet.sol";
|
||||||
|
|
||||||
contract MultisigWalletMock is MultisigWallet {
|
contract MultisigWalletMock is MultisigWallet {
|
||||||
uint public totalSpending;
|
uint public totalSpending;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../lifecycle/Pausable.sol';
|
import '../../contracts/lifecycle/Pausable.sol';
|
||||||
|
|
||||||
|
|
||||||
// mock class using Pausable
|
// mock class using Pausable
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../payment/PullPayment.sol';
|
import '../../contracts/payment/PullPayment.sol';
|
||||||
|
|
||||||
|
|
||||||
// mock class using PullPayment
|
// mock class using PullPayment
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../SafeMath.sol';
|
import '../../contracts/SafeMath.sol';
|
||||||
|
|
||||||
|
|
||||||
contract SafeMathMock is SafeMath {
|
contract SafeMathMock is SafeMath {
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import {Bounty, Target} from "../Bounty.sol";
|
import {Bounty, Target} from "../../contracts/Bounty.sol";
|
||||||
|
|
||||||
|
|
||||||
contract SecureTargetMock is Target {
|
contract SecureTargetMock is Target {
|
||||||
@ -1,5 +1,5 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
import "../ownership/Shareable.sol";
|
import "../../contracts/ownership/Shareable.sol";
|
||||||
|
|
||||||
contract ShareableMock is Shareable {
|
contract ShareableMock is Shareable {
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
|
|
||||||
import '../token/StandardToken.sol';
|
import '../../contracts/token/StandardToken.sol';
|
||||||
|
|
||||||
|
|
||||||
// mock class using StandardToken
|
// mock class using StandardToken
|
||||||
@ -1,6 +1,6 @@
|
|||||||
pragma solidity ^0.4.4;
|
pragma solidity ^0.4.4;
|
||||||
|
|
||||||
import '../token/VestedToken.sol';
|
import '../../contracts/token/VestedToken.sol';
|
||||||
|
|
||||||
// mock class using StandardToken
|
// mock class using StandardToken
|
||||||
contract VestedTokenMock is VestedToken {
|
contract VestedTokenMock is VestedToken {
|
||||||
@ -1,3 +1,6 @@
|
|||||||
|
require('babel-register');
|
||||||
|
require('babel-polyfill');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
networks: {
|
networks: {
|
||||||
development: {
|
development: {
|
||||||
|
|||||||
Reference in New Issue
Block a user