Skip to content

Commit

Permalink
Rubicon Protocol v1.1 (#24)
Browse files Browse the repository at this point in the history
* clean

* clean

* 1.1

* clean v1.1

* truffle.yml update

* OVM Proxy

* clean
  • Loading branch information
bghughes authored Sep 25, 2021
1 parent bf0740a commit df4531c
Show file tree
Hide file tree
Showing 15 changed files with 233 additions and 848 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/truffle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Checks out a copy of your repository on the ubuntu-latest machine
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v1.1.0

- name: Use Node.js
uses: actions/setup-node@v1
Expand Down
13 changes: 0 additions & 13 deletions contracts/interfaces/IWETH.sol

This file was deleted.

22 changes: 0 additions & 22 deletions contracts/peripheral_contracts/EquityToken.sol

This file was deleted.

5 changes: 2 additions & 3 deletions contracts/proxy/OVMProxy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity >=0.6.0 <0.8.0;

/**
* @dev This abstract contract provides a fallback function that delegates all calls to another contract using the EVM
* @dev This abstract contract provides an OVM-safe fallback function that delegates all calls to another contract using the EVM
* instruction `delegatecall`. We refer to the second contract as the _implementation_ behind the proxy, and it has to
* be specified by overriding the virtual {_implementation} function.
*
Expand All @@ -14,12 +14,11 @@ pragma solidity >=0.6.0 <0.8.0;
*/
abstract contract OVMProxy {
/**
* @dev Delegates the current call to `implementation`.
* @dev Delegates the current call to `implementation` with OVM-safe logic.
*
* This function does not return to its internall call site, it will return directly to the external caller.
*/
function _delegate(address implementation) internal virtual {
// solhint-disable-next-line no-inline-assembly
(bool success, bytes memory returndata) = implementation.delegatecall(
msg.data
);
Expand Down
2 changes: 1 addition & 1 deletion contracts/proxy/TransparentUpgradeableProxy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ contract TransparentUpgradeableProxy is UpgradeableProxy {
event AdminChanged(address previousAdmin, address newAdmin);

/**
* @dev Emitted when the admin calls implementation()
* @dev Emitted when the admin calls implementation() and provides a way to publicly call the implementation's address
*/
event Implementation(address currentImplementation);

Expand Down
Loading

0 comments on commit df4531c

Please sign in to comment.