Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit 11115e6

Browse files
authored
Merge pull request #14 from davesag/feature/update-solidity-version-and-dependencies
[Optimisation, n/a] updated solitidy version, node version, and many dependencies
2 parents e62d653 + 415af47 commit 11115e6

File tree

9 files changed

+4949
-4026
lines changed

9 files changed

+4949
-4026
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 2
77
jobs:
88
build:
99
docker:
10-
- image: circleci/node:9.7.1
10+
- image: circleci/node:9.11.1
1111

1212
steps:
1313
- checkout

contracts/CTKNCrowdsale.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.4.19;
1+
pragma solidity ^0.4.23;
22

33
import 'zeppelin-solidity/contracts/math/SafeMath.sol';
44
import 'zeppelin-solidity/contracts/crowdsale/distribution/RefundableCrowdsale.sol';

contracts/CTKNToken.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.4.19;
1+
pragma solidity ^0.4.23;
22

33
import 'zeppelin-solidity/contracts/token/ERC20/MintableToken.sol';
44
import './ERC884Draft.sol';
@@ -123,7 +123,7 @@ contract CTKNToken is ERC884Draft, MintableToken {
123123
require(hash != ZERO_BYTES);
124124
require(verified[addr] == ZERO_BYTES);
125125
verified[addr] = hash;
126-
VerifiedAddressAdded(addr, hash, msg.sender);
126+
emit VerifiedAddressAdded(addr, hash, msg.sender);
127127
}
128128

129129
/**
@@ -140,7 +140,7 @@ contract CTKNToken is ERC884Draft, MintableToken {
140140
require(balances[addr] == 0);
141141
if (verified[addr] != ZERO_BYTES) {
142142
verified[addr] = ZERO_BYTES;
143-
VerifiedAddressRemoved(addr, msg.sender);
143+
emit VerifiedAddressRemoved(addr, msg.sender);
144144
}
145145
}
146146

@@ -163,7 +163,7 @@ contract CTKNToken is ERC884Draft, MintableToken {
163163
bytes32 oldHash = verified[addr];
164164
if (oldHash != hash) {
165165
verified[addr] = hash;
166-
VerifiedAddressUpdated(addr, oldHash, hash, msg.sender);
166+
emit VerifiedAddressUpdated(addr, oldHash, hash, msg.sender);
167167
}
168168
}
169169

@@ -200,7 +200,7 @@ contract CTKNToken is ERC884Draft, MintableToken {
200200
balances[replacement] = balances[original];
201201
// zero out the original balance
202202
balances[original] = 0;
203-
VerifiedAddressSuperseded(original, replacement, msg.sender);
203+
emit VerifiedAddressSuperseded(original, replacement, msg.sender);
204204
}
205205

206206
/**

contracts/ERC884Draft.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.4.19;
1+
pragma solidity ^0.4.23;
22

33
import 'zeppelin-solidity/contracts/token/ERC20/ERC20.sol';
44

contracts/Migrations.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.4.19;
1+
pragma solidity ^0.4.23;
22

33

44
contract Migrations {

contracts/mocks/MockCTKN.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.4.19;
1+
pragma solidity ^0.4.23;
22

33
import 'zeppelin-solidity/contracts/token/ERC20/MintableToken.sol';
44

contracts/mocks/MockCTKNCrowdsaleWithMutableDates.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// solhint-disable no-empty-blocks
2-
pragma solidity ^0.4.19;
2+
pragma solidity ^0.4.23;
33

44
import '../CTKNCrowdsale.sol';
55

0 commit comments

Comments
 (0)