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
OpenZeppelin · Jul 20, 2019 · 7ac0502 · 7ac0502
1 parent dee9a2b
commit 7ac0502
Show file tree

Hide file tree

Showing 63 changed files with 10,599 additions and 17,050 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,7 +38,7 @@ build/
 # truffle
 .node-xmlhttprequest-*
 
-.zos.session
+.openzeppelin/.session
 
 # IntelliJ IDE
 .idea
diff --git a/zos.kovan.json → .openzeppelin/kovan.json b/zos.kovan.json → .openzeppelin/kovan.json
@@ -45,23 +45,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +204,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +348,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +655,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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"

diff --git a/zos.mainnet.json → .openzeppelin/mainnet.json b/zos.mainnet.json → .openzeppelin/mainnet.json
@@ -107,23 +107,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 11836,
           "type": "t_bool",
           "src": "757:24:140"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 11838,
           "type": "t_bool",
           "src": "876:25:140"
         },
         {
           "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,23 +393,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 11836,
           "type": "t_bool",
           "src": "757:24:140"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 11838,
           "type": "t_bool",
           "src": "876:25:140"
         },
         {
           "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,23 +598,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 11836,
           "type": "t_bool",
           "src": "757:24:140"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 11838,
           "type": "t_bool",
           "src": "876:25:140"
         },
         {
           "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,23 +722,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 11836,
           "type": "t_bool",
           "src": "757:24:140"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 11838,
           "type": "t_bool",
           "src": "876:25:140"
         },
         {
           "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"

diff --git a/zos.json → .openzeppelin/project.json b/zos.json → .openzeppelin/project.json
@@ -1,6 +1,6 @@
 {
-  "zosversion": "2",
-  "name": "openzeppelin-eth",
+  "manifestVersion": "2.2",
+  "name": "@openzeppelin/contracts-ethereum-package",
   "publish": true,
   "version": "2.2.0",
   "contracts": {

diff --git a/zos.rinkeby.json → .openzeppelin/rinkeby.json b/zos.rinkeby.json → .openzeppelin/rinkeby.json
@@ -46,23 +46,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +172,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +348,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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,23 +655,23 @@
       "storage": [
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initialized",
           "astId": 13503,
           "type": "t_bool",
           "src": "757:24:147"
         },
         {
           "contract": "Initializable",
-          "path": "zos-lib/contracts/Initializable.sol",
+          "path": "@openzeppelin/upgrades/contracts/Initializable.sol",
           "label": "initializing",
           "astId": 13505,
           "type": "t_bool",
           "src": "876:25:147"
         },
         {
           "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"