Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
056320ed
Commit
056320ed
authored
Nov 08, 2016
by
Manuel Aráoz
Committed by
GitHub
Nov 08, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #60 from OpenZeppelin/sol-0.4.4
migrate to 0.4.4
parents
0c0eb292
83f41046
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
28 additions
and
39 deletions
+28
-39
Bounty.sol
contracts/Bounty.sol
+1
-1
ERC20.sol
contracts/ERC20.sol
+1
-1
Killable.sol
contracts/Killable.sol
+1
-1
LimitFunds.sol
contracts/LimitFunds.sol
+1
-1
Migrations.sol
contracts/Migrations.sol
+1
-1
Ownable.sol
contracts/Ownable.sol
+1
-1
PullPayment.sol
contracts/PullPayment.sol
+1
-1
Rejector.sol
contracts/Rejector.sol
+0
-9
SafeMath.sol
contracts/SafeMath.sol
+1
-1
StandardToken.sol
contracts/StandardToken.sol
+1
-1
Stoppable.sol
contracts/Stoppable.sol
+1
-1
BadArrayUse.sol
contracts/examples/BadArrayUse.sol
+1
-1
BadFailEarly.sol
contracts/examples/BadFailEarly.sol
+1
-1
BadPushPayments.sol
contracts/examples/BadPushPayments.sol
+1
-1
GoodArrayUse.sol
contracts/examples/GoodArrayUse.sol
+1
-1
GoodFailEarly.sol
contracts/examples/GoodFailEarly.sol
+1
-1
GoodPullPayments.sol
contracts/examples/GoodPullPayments.sol
+1
-1
ProofOfExistence.sol
contracts/examples/ProofOfExistence.sol
+2
-4
PullPaymentBid.sol
contracts/examples/PullPaymentBid.sol
+1
-1
StoppableBid.sol
contracts/examples/StoppableBid.sol
+1
-1
InsecureTargetMock.sol
contracts/test-helpers/InsecureTargetMock.sol
+1
-1
PullPaymentMock.sol
contracts/test-helpers/PullPaymentMock.sol
+1
-1
SecureTargetMock.sol
contracts/test-helpers/SecureTargetMock.sol
+1
-1
StandardTokenMock.sol
contracts/test-helpers/StandardTokenMock.sol
+1
-1
StoppableMock.sol
contracts/test-helpers/StoppableMock.sol
+1
-1
CrowdsaleToken.sol
contracts/token/CrowdsaleToken.sol
+1
-1
SimpleToken.sol
contracts/token/SimpleToken.sol
+1
-1
TestOwnable.sol
test/TestOwnable.sol
+1
-1
No files found.
contracts/Bounty.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import './PullPayment.sol';
import './PullPayment.sol';
import './Killable.sol';
import './Killable.sol';
...
...
contracts/ERC20.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
// see https://github.com/ethereum/EIPs/issues/20
// see https://github.com/ethereum/EIPs/issues/20
...
...
contracts/Killable.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import "./Ownable.sol";
import "./Ownable.sol";
/*
/*
...
...
contracts/LimitFunds.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract LimitFunds {
contract LimitFunds {
uint LIMIT = 5000;
uint LIMIT = 5000;
...
...
contracts/Migrations.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract Migrations {
contract Migrations {
address public owner;
address public owner;
uint public last_completed_migration;
uint public last_completed_migration;
...
...
contracts/Ownable.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
/*
/*
* Ownable
* Ownable
...
...
contracts/PullPayment.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
/*
/*
* PullPayment
* PullPayment
* Base contract supporting async send for pull payments.
* Base contract supporting async send for pull payments.
...
...
contracts/Rejector.sol
deleted
100644 → 0
View file @
0c0eb292
pragma solidity ^0.4.0;
/*
* Rejector
* Base contract for rejecting direct deposits.
* Fallback function throws immediately.
*/
contract Rejector {
function() { throw; }
}
contracts/SafeMath.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
/**
/**
* Math operations with safety checks
* Math operations with safety checks
...
...
contracts/StandardToken.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import './ERC20.sol';
import './ERC20.sol';
import './SafeMath.sol';
import './SafeMath.sol';
...
...
contracts/Stoppable.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import "./Ownable.sol";
import "./Ownable.sol";
/*
/*
...
...
contracts/examples/BadArrayUse.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../PullPayment.sol';
import '../PullPayment.sol';
// UNSAFE CODE, DO NOT USE!
// UNSAFE CODE, DO NOT USE!
...
...
contracts/examples/BadFailEarly.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
// UNSAFE CODE, DO NOT USE!
// UNSAFE CODE, DO NOT USE!
contract BadFailEarly {
contract BadFailEarly {
...
...
contracts/examples/BadPushPayments.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
// UNSAFE CODE, DO NOT USE!
// UNSAFE CODE, DO NOT USE!
contract BadPushPayments {
contract BadPushPayments {
...
...
contracts/examples/GoodArrayUse.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../PullPayment.sol';
import '../PullPayment.sol';
contract GoodArrayUse is PullPayment {
contract GoodArrayUse is PullPayment {
...
...
contracts/examples/GoodFailEarly.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract GoodFailEarly {
contract GoodFailEarly {
...
...
contracts/examples/GoodPullPayments.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract GoodPullPayments {
contract GoodPullPayments {
address highestBidder;
address highestBidder;
uint highestBid;
uint highestBid;
...
...
contracts/examples/ProofOfExistence.sol
View file @
056320ed
pragma solidity ^0.4.0;
pragma solidity ^0.4.4;
import "../Rejector.sol";
/*
/*
* Proof of Existence example contract
* Proof of Existence example contract
* see https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05
* see https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05
*/
*/
contract ProofOfExistence
is Rejector
{
contract ProofOfExistence {
mapping (bytes32 => bool) public proofs;
mapping (bytes32 => bool) public proofs;
...
...
contracts/examples/PullPaymentBid.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../PullPayment.sol';
import '../PullPayment.sol';
...
...
contracts/examples/StoppableBid.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../PullPayment.sol';
import '../PullPayment.sol';
import '../Stoppable.sol';
import '../Stoppable.sol';
...
...
contracts/test-helpers/InsecureTargetMock.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract InsecureTargetMock {
contract InsecureTargetMock {
function checkInvariant() returns(bool){
function checkInvariant() returns(bool){
...
...
contracts/test-helpers/PullPaymentMock.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../PullPayment.sol';
import '../PullPayment.sol';
// mock class using PullPayment
// mock class using PullPayment
...
...
contracts/test-helpers/SecureTargetMock.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
contract SecureTargetMock {
contract SecureTargetMock {
function checkInvariant() returns(bool){
function checkInvariant() returns(bool){
...
...
contracts/test-helpers/StandardTokenMock.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../StandardToken.sol';
import '../StandardToken.sol';
// mock class using StandardToken
// mock class using StandardToken
...
...
contracts/test-helpers/StoppableMock.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import '../Stoppable.sol';
import '../Stoppable.sol';
// mock class using Stoppable
// mock class using Stoppable
...
...
contracts/token/CrowdsaleToken.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import "../StandardToken.sol";
import "../StandardToken.sol";
...
...
contracts/token/SimpleToken.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import "../StandardToken.sol";
import "../StandardToken.sol";
...
...
test/TestOwnable.sol
View file @
056320ed
pragma solidity ^0.4.
0
;
pragma solidity ^0.4.
4
;
import "truffle/Assert.sol";
import "truffle/Assert.sol";
import "truffle/DeployedAddresses.sol";
import "truffle/DeployedAddresses.sol";
import "../contracts/Ownable.sol";
import "../contracts/Ownable.sol";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment