Skip to content

O
openzeppelin-contracts-upgradeable
Unverified Commit 7ac0502c by Santiago Palladino Committed by GitHub
Options

Rename to @openzeppelin/contracts-ethereum-package (#54) 

* Change import path from zos-lib to upgrades in all contracts

* Update readme with new naming

* Update package and deps names

* Change path to initializable in AST of networks.jsons

* Migrate manifest version

* Use new oz file locations

* Rename in ERC20Migrator comments

* Update SDK install instructions in README

* Update gitignore to use new session file name

* trigger CI

* Fixes to readme and package version

* Use 2.5.0 release of OpenZeppelin SDK
parent dee9a2b8
Showing with 121 additions and 122 deletions
.gitignore
......@@ -38,7 +38,7 @@ build/
# truffle
.node-xmlhttprequest-*
.zos.session
.openzeppelin/.session
# IntelliJ IDE
.idea
zos.kovan.json → .openzeppelin/kovan.json
......@@ -45,7 +45,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -53,7 +53,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -61,7 +61,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -204,7 +204,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -212,7 +212,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -220,7 +220,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -348,7 +348,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -356,7 +356,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -364,7 +364,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -655,7 +655,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -663,7 +663,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -671,7 +671,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -930,7 +930,7 @@
},
"solidityLibs": {},
"proxies": {},
"zosversion": "2",
"manifestVersion": "2.2",
"frozen": true,
"app": {
"address": "0xf5829d56998ccc1405b7eabccac78164af270d39"
......
zos.mainnet.json → .openzeppelin/mainnet.json
......@@ -107,7 +107,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 11836,
"type": "t_bool",
......@@ -115,7 +115,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 11838,
"type": "t_bool",
......@@ -123,7 +123,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 11887,
"type": "t_array:50<t_uint256>",
......@@ -393,7 +393,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 11836,
"type": "t_bool",
......@@ -401,7 +401,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 11838,
"type": "t_bool",
......@@ -409,7 +409,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 11887,
"type": "t_array:50<t_uint256>",
......@@ -598,7 +598,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 11836,
"type": "t_bool",
......@@ -606,7 +606,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 11838,
"type": "t_bool",
......@@ -614,7 +614,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 11887,
"type": "t_array:50<t_uint256>",
......@@ -722,7 +722,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 11836,
"type": "t_bool",
......@@ -730,7 +730,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 11838,
"type": "t_bool",
......@@ -738,7 +738,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 11887,
"type": "t_array:50<t_uint256>",
......@@ -836,7 +836,7 @@
},
"solidityLibs": {},
"proxies": {},
"zosversion": "2",
"manifestVersion": "2.2",
"frozen": true,
"app": {
"address": "0x2Ba1a8C7352a5B5Ea3ea3408F89e1bA7920d36CE"
......
zos.json → .openzeppelin/project.json
{
"zosversion": "2",
"name": "openzeppelin-eth",
"manifestVersion": "2.2",
"name": "@openzeppelin/contracts-ethereum-package",
"publish": true,
"version": "2.2.0",
"contracts": {
......
zos.rinkeby.json → .openzeppelin/rinkeby.json
......@@ -46,7 +46,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -54,7 +54,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -62,7 +62,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -172,7 +172,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -180,7 +180,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -188,7 +188,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -348,7 +348,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -356,7 +356,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -364,7 +364,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -655,7 +655,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -663,7 +663,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -671,7 +671,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -930,7 +930,7 @@
},
"solidityLibs": {},
"proxies": {},
"zosversion": "2",
"manifestVersion": "2.2",
"frozen": true,
"app": {
"address": "0x291439e6444daec9e47ae359aa79fd1811a42679"
......
zos.ropsten.json → .openzeppelin/ropsten.json
......@@ -45,7 +45,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -53,7 +53,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -61,7 +61,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -202,7 +202,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -210,7 +210,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -218,7 +218,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -344,7 +344,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -352,7 +352,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -360,7 +360,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -610,7 +610,7 @@
"storage": [
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initialized",
"astId": 13503,
"type": "t_bool",
......@@ -618,7 +618,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "initializing",
"astId": 13505,
"type": "t_bool",
......@@ -626,7 +626,7 @@
},
{
"contract": "Initializable",
"path": "zos-lib/contracts/Initializable.sol",
"path": "@openzeppelin/upgrades/contracts/Initializable.sol",
"label": "______gap",
"astId": 13554,
"type": "t_array:50<t_uint256>",
......@@ -836,7 +836,7 @@
},
"solidityLibs": {},
"proxies": {},
"zosversion": "2",
"manifestVersion": "2.2",
"frozen": true,
"app": {
"address": "0x27a09abca2c4d9f914dbc7bea164b0e6b74ce7a9"
......
contracts/access/roles/CapperRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
......
contracts/access/roles/MinterRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
......
contracts/access/roles/PauserRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
......
contracts/access/roles/SignerRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
......
contracts/access/roles/WhitelistAdminRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
......
contracts/access/roles/WhitelistedRole.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Roles.sol";
import "./WhitelistAdminRole.sol";
......
contracts/crowdsale/Crowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../math/SafeMath.sol";
import "../token/ERC20/SafeERC20.sol";
......
contracts/crowdsale/distribution/FinalizableCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../math/SafeMath.sol";
import "../validation/TimedCrowdsale.sol";
......
contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol";
......
contracts/crowdsale/distribution/RefundableCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../math/SafeMath.sol";
import "./FinalizableCrowdsale.sol";
import "../../payment/escrow/RefundEscrow.sol";
......
contracts/crowdsale/distribution/RefundablePostDeliveryCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./RefundableCrowdsale.sol";
import "./PostDeliveryCrowdsale.sol";
......
contracts/crowdsale/emission/AllowanceCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Crowdsale.sol";
import "../../token/ERC20/IERC20.sol";
import "../../token/ERC20/SafeERC20.sol";
......
contracts/crowdsale/emission/MintedCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Crowdsale.sol";
import "../../token/ERC20/ERC20Mintable.sol";
......
contracts/crowdsale/price/IncreasingPriceCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol";
......
contracts/crowdsale/validation/CappedCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
......
contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
import "../../access/roles/CapperRole.sol";
......
contracts/crowdsale/validation/PausableCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../Crowdsale.sol";
import "../../lifecycle/Pausable.sol";
......
contracts/crowdsale/validation/TimedCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
......
contracts/drafts/ERC1046/ERC20Metadata.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../token/ERC20/IERC20.sol";
/**
......
contracts/drafts/ERC20Migrator.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../token/ERC20/SafeERC20.sol";
......@@ -22,9 +22,9 @@ import "../math/Math.sol";
* is migrated, and remain there forever.
* Although this contract can be used in many different scenarios, the main
* motivation was to provide a way to migrate ERC20 tokens into an upgradeable
* version of it using ZeppelinOS. To read more about how this can be done
* version of it using the OpenZeppelin SDK. To read more about how this can be done
* using this implementation, please follow the official documentation site of
* ZeppelinOS: https://docs.zeppelinos.org/docs/erc20_onboarding.html
* the OpenZeppelinSDK: https://docs.zeppelinos.org/docs/erc20_onboarding.html
* Example of usage:
* ```
* const migrator = await ERC20Migrator.new(legacyToken.address);
......
contracts/drafts/ERC20Snapshot.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../math/SafeMath.sol";
import "../utils/Arrays.sol";
import "../drafts/Counters.sol";
......
contracts/drafts/SignatureBouncer.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../access/roles/SignerRole.sol";
import "../cryptography/ECDSA.sol";
......
contracts/drafts/TokenVesting.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../token/ERC20/SafeERC20.sol";
import "../ownership/Ownable.sol";
import "../math/SafeMath.sol";
......
contracts/examples/SampleCrowdsale.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";
......
contracts/examples/SimpleToken.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../token/ERC20/ERC20.sol";
import "../token/ERC20/ERC20Detailed.sol";
......
contracts/introspection/ERC165.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC165.sol";
/**
......
contracts/lifecycle/Pausable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../access/roles/PauserRole.sol";
/**
......
contracts/ownership/Ownable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
/**
* @title Ownable
......
contracts/ownership/Secondary.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
/**
* @title Secondary
......
contracts/payment/PaymentSplitter.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../math/SafeMath.sol";
......
contracts/payment/PullPayment.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./escrow/Escrow.sol";
......
contracts/payment/escrow/RefundEscrow.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ConditionalEscrow.sol";
......
contracts/token/ERC20/ERC20.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC20.sol";
import "../../math/SafeMath.sol";
......
contracts/token/ERC20/ERC20Burnable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC20.sol";
/**
......
contracts/token/ERC20/ERC20Capped.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC20Mintable.sol";
/**
......
contracts/token/ERC20/ERC20Detailed.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC20.sol";
/**
......
contracts/token/ERC20/ERC20Mintable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC20.sol";
import "../../access/roles/MinterRole.sol";
......
contracts/token/ERC20/ERC20Pausable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC20.sol";
import "../../lifecycle/Pausable.sol";
......
contracts/token/ERC20/StandaloneERC20.sol
pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC20Detailed.sol";
import "./ERC20Mintable.sol";
import "./ERC20Pausable.sol";
......
contracts/token/ERC20/TokenTimelock.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./SafeERC20.sol";
/**
......
contracts/token/ERC721/ERC721.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721.sol";
import "./IERC721Receiver.sol";
import "../../math/SafeMath.sol";
......
contracts/token/ERC721/ERC721Burnable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
/**
......
contracts/token/ERC721/ERC721Enumerable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721Enumerable.sol";
import "./ERC721.sol";
import "../../introspection/ERC165.sol";
......
contracts/token/ERC721/ERC721Full.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
import "./ERC721Enumerable.sol";
import "./ERC721Metadata.sol";
......
contracts/token/ERC721/ERC721Holder.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721Receiver.sol";
contract ERC721Holder is Initializable, IERC721Receiver {
......
contracts/token/ERC721/ERC721Metadata.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
import "./IERC721Metadata.sol";
import "../../introspection/ERC165.sol";
......
contracts/token/ERC721/ERC721MetadataMintable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721Metadata.sol";
import "../../access/roles/MinterRole.sol";
......
contracts/token/ERC721/ERC721Mintable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
import "../../access/roles/MinterRole.sol";
......
contracts/token/ERC721/ERC721Pausable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
import "../../lifecycle/Pausable.sol";
......
contracts/token/ERC721/IERC721.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "../../introspection/IERC165.sol";
/**
......
contracts/token/ERC721/IERC721Enumerable.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721.sol";
/**
......
contracts/token/ERC721/IERC721Full.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721.sol";
import "./IERC721Enumerable.sol";
import "./IERC721Metadata.sol";
......
contracts/token/ERC721/IERC721Metadata.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./IERC721.sol";
/**
......
contracts/token/ERC721/StandaloneERC721.sol
pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
import "./ERC721.sol";
import "./ERC721Enumerable.sol";
import "./ERC721Metadata.sol";
......
contracts/utils/ReentrancyGuard.sol
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "@openzeppelin/upgrades/contracts/Initializable.sol";
/**
* @title Helps contracts guard against reentrancy attacks.
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
{
"name": "openzeppelin-eth",
"version": "2.2.0",
"name": "@openzeppelin/contracts-ethereum-package",
"version": "2.2.1-rc.0",
"description": "Secure Smart Contract library for Solidity",
"files": [
"build",
"contracts",
"test/behaviors",
"zos.json",
"zos.*.json"
".openzeppelin"
],
"scripts": {
"build": "scripts/build.sh",
......@@ -25,7 +24,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/OpenZeppelin/openzeppelin-eth.git"
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package.git"
},
"keywords": [
"solidity",
......@@ -38,9 +37,9 @@
"author": "OpenZeppelin Community <maintainers@openzeppelin.org>",
"license": "MIT",
"bugs": {
"url": "https://github.com/OpenZeppelin/openzeppelin-eth/issues"
"url": "https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package/issues"
},
"homepage": "https://github.com/OpenZeppelin/openzeppelin-eth",
"homepage": "https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package",
"devDependencies": {
"chai": "^4.1.2",
"coveralls": "^3.0.1",
......@@ -60,10 +59,10 @@
"solhint": "^1.5.0",
"solidity-coverage": "https://github.com:rotcivegaf/solidity-coverage.git#5875f5b7bc74d447f3312c9c0e9fc7814b482477",
"truffle": "^5.0.0",
"zos": "^2.0.0",
"zos-lib": "^2.1.0"
"@openzeppelin/cli": "2.5.0",
"@openzeppelin/upgrades": "2.5.0"
},
"peerDependencies": {
"zos-lib": "^2.1.0"
"@openzeppelin/upgrades": "2.5.0"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment