Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
exchain
nebula
Commits
e2b3293a
Unverified
Commit
e2b3293a
authored
Aug 30, 2021
by
elenadimitrova
Committed by
Kelvin Fichter
Nov 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix linting issues
parent
75d52adf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
L1ChugSplashProxy.sol
...ages/contracts/contracts/chugsplash/L1ChugSplashProxy.sol
+7
-5
TestERC20.sol
packages/contracts/contracts/test-helpers/TestERC20.sol
+5
-5
No files found.
packages/contracts/contracts/chugsplash/L1ChugSplashProxy.sol
View file @
e2b3293a
...
@@ -25,16 +25,18 @@ contract L1ChugSplashProxy {
...
@@ -25,16 +25,18 @@ contract L1ChugSplashProxy {
bytes13 constant internal DEPLOY_CODE_PREFIX = 0x600D380380600D6000396000f3;
bytes13 constant internal DEPLOY_CODE_PREFIX = 0x600D380380600D6000396000f3;
// bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
// bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
bytes32 constant internal IMPLEMENTATION_KEY = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
bytes32 constant internal IMPLEMENTATION_KEY =
0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
// bytes32(uint256(keccak256('eip1967.proxy.admin')) - 1)
// bytes32(uint256(keccak256('eip1967.proxy.admin')) - 1)
bytes32 constant internal OWNER_KEY = 0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
bytes32 constant internal OWNER_KEY =
0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
/***************
/***************
* Constructor *
* Constructor *
***************/
***************/
/**
/**
* @param _owner Address of the initial contract owner.
* @param _owner Address of the initial contract owner.
*/
*/
...
@@ -286,7 +288,7 @@ contract L1ChugSplashProxy {
...
@@ -286,7 +288,7 @@ contract L1ChugSplashProxy {
*/
*/
function _getOwner()
function _getOwner()
internal
internal
view
view
returns (
returns (
address
address
)
)
...
@@ -344,7 +346,7 @@ contract L1ChugSplashProxy {
...
@@ -344,7 +346,7 @@ contract L1ChugSplashProxy {
// overwrite the calldata that we just copied into memory but that doesn't really
// overwrite the calldata that we just copied into memory but that doesn't really
// matter because we'll be returning in a second anyway.
// matter because we'll be returning in a second anyway.
returndatacopy(0x0, 0x0, returndatasize())
returndatacopy(0x0, 0x0, returndatasize())
// Success == 0 means a revert. We'll revert too and pass the data up.
// Success == 0 means a revert. We'll revert too and pass the data up.
if iszero(success) {
if iszero(success) {
revert(0x0, returndatasize())
revert(0x0, returndatasize())
...
...
packages/contracts/contracts/test-helpers/TestERC20.sol
View file @
e2b3293a
...
@@ -5,8 +5,8 @@ pragma solidity >0.5.0 <0.8.0;
...
@@ -5,8 +5,8 @@ pragma solidity >0.5.0 <0.8.0;
contract TestERC20 {
contract TestERC20 {
using SafeMath for uint;
using SafeMath for uint;
string public constant name =
'Test'
;
string public constant name =
"Test"
;
string public constant symbol =
'TST'
;
string public constant symbol =
"TST"
;
uint8 public constant decimals = 18;
uint8 public constant decimals = 18;
uint256 public totalSupply;
uint256 public totalSupply;
mapping(address => uint) public balanceOf;
mapping(address => uint) public balanceOf;
...
@@ -55,14 +55,14 @@ contract TestERC20 {
...
@@ -55,14 +55,14 @@ contract TestERC20 {
library SafeMath {
library SafeMath {
function add(uint256 x, uint256 y) internal pure returns (uint256 z) {
function add(uint256 x, uint256 y) internal pure returns (uint256 z) {
require((z = x + y) >= x,
'ds-math-add-overflow'
);
require((z = x + y) >= x,
"ds-math-add-overflow"
);
}
}
function sub(uint256 x, uint256 y) internal pure returns (uint256 z) {
function sub(uint256 x, uint256 y) internal pure returns (uint256 z) {
require((z = x - y) <= x,
'ds-math-sub-underflow'
);
require((z = x - y) <= x,
"ds-math-sub-underflow"
);
}
}
function mul(uint256 x, uint256 y) internal pure returns (uint256 z) {
function mul(uint256 x, uint256 y) internal pure returns (uint256 z) {
require(y == 0 || (z = x * y) / y == x,
'ds-math-mul-overflow'
);
require(y == 0 || (z = x * y) / y == x,
"ds-math-mul-overflow"
);
}
}
}
}
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