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
628dea7a
Commit
628dea7a
authored
Sep 08, 2020
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update new contracts for solidity 0.7
parent
22de765f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
13 additions
and
13 deletions
+13
-13
ClashingImplementation.sol
contracts/mocks/ClashingImplementation.sol
+1
-1
DummyImplementation.sol
contracts/mocks/DummyImplementation.sol
+1
-1
InitializableMock.sol
contracts/mocks/InitializableMock.sol
+1
-1
MultipleInheritanceInitializableMocks.sol
contracts/mocks/MultipleInheritanceInitializableMocks.sol
+1
-1
RegressionImplementation.sol
contracts/mocks/RegressionImplementation.sol
+1
-1
SingleInheritanceInitializableMocks.sol
contracts/mocks/SingleInheritanceInitializableMocks.sol
+1
-1
Initializable.sol
contracts/proxy/Initializable.sol
+1
-1
Proxy.sol
contracts/proxy/Proxy.sol
+1
-1
ProxyAdmin.sol
contracts/proxy/ProxyAdmin.sol
+1
-1
TransparentUpgradeableProxy.sol
contracts/proxy/TransparentUpgradeableProxy.sol
+2
-2
UpgradeableProxy.sol
contracts/proxy/UpgradeableProxy.sol
+2
-2
No files found.
contracts/mocks/ClashingImplementation.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
/**
/**
...
...
contracts/mocks/DummyImplementation.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
abstract contract Impl {
abstract contract Impl {
function version() public pure virtual returns (string memory);
function version() public pure virtual returns (string memory);
...
...
contracts/mocks/InitializableMock.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "../proxy/Initializable.sol";
import "../proxy/Initializable.sol";
...
...
contracts/mocks/MultipleInheritanceInitializableMocks.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "../proxy/Initializable.sol";
import "../proxy/Initializable.sol";
...
...
contracts/mocks/RegressionImplementation.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "../proxy/Initializable.sol";
import "../proxy/Initializable.sol";
...
...
contracts/mocks/SingleInheritanceInitializableMocks.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "../proxy/Initializable.sol";
import "../proxy/Initializable.sol";
...
...
contracts/proxy/Initializable.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity >=0.4.24 <0.
7
.0;
pragma solidity >=0.4.24 <0.
8
.0;
/**
/**
...
...
contracts/proxy/Proxy.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
/**
/**
* @dev This abstract contract provides a fallback function that delegates all calls to another contract using the EVM
* @dev This abstract contract provides a fallback function that delegates all calls to another contract using the EVM
...
...
contracts/proxy/ProxyAdmin.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "../access/Ownable.sol";
import "../access/Ownable.sol";
import "./TransparentUpgradeableProxy.sol";
import "./TransparentUpgradeableProxy.sol";
...
...
contracts/proxy/TransparentUpgradeableProxy.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "./UpgradeableProxy.sol";
import "./UpgradeableProxy.sol";
...
@@ -30,7 +30,7 @@ contract TransparentUpgradeableProxy is UpgradeableProxy {
...
@@ -30,7 +30,7 @@ contract TransparentUpgradeableProxy is UpgradeableProxy {
* @dev Initializes an upgradeable proxy managed by `_admin`, backed by the implementation at `_logic`, and
* @dev Initializes an upgradeable proxy managed by `_admin`, backed by the implementation at `_logic`, and
* optionally initialized with `_data` as explained in {UpgradeableProxy-constructor}.
* optionally initialized with `_data` as explained in {UpgradeableProxy-constructor}.
*/
*/
constructor(address _logic, address _admin, bytes memory _data) p
ublic p
ayable UpgradeableProxy(_logic, _data) {
constructor(address _logic, address _admin, bytes memory _data) payable UpgradeableProxy(_logic, _data) {
assert(_ADMIN_SLOT == bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1));
assert(_ADMIN_SLOT == bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1));
_setAdmin(_admin);
_setAdmin(_admin);
}
}
...
...
contracts/proxy/UpgradeableProxy.sol
View file @
628dea7a
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.
6
.0;
pragma solidity ^0.
7
.0;
import "./Proxy.sol";
import "./Proxy.sol";
import "../utils/Address.sol";
import "../utils/Address.sol";
...
@@ -21,7 +21,7 @@ contract UpgradeableProxy is Proxy {
...
@@ -21,7 +21,7 @@ contract UpgradeableProxy is Proxy {
* If `_data` is nonempty, it's used as data in a delegate call to `_logic`. This will typically be an encoded
* If `_data` is nonempty, it's used as data in a delegate call to `_logic`. This will typically be an encoded
* function call, and allows initializating the storage of the proxy like a Solidity constructor.
* function call, and allows initializating the storage of the proxy like a Solidity constructor.
*/
*/
constructor(address _logic, bytes memory _data) p
ublic p
ayable {
constructor(address _logic, bytes memory _data) payable {
assert(_IMPLEMENTATION_SLOT == bytes32(uint256(keccak256("eip1967.proxy.implementation")) - 1));
assert(_IMPLEMENTATION_SLOT == bytes32(uint256(keccak256("eip1967.proxy.implementation")) - 1));
_setImplementation(_logic);
_setImplementation(_logic);
if(_data.length > 0) {
if(_data.length > 0) {
...
...
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