Skip to content

Fix package-lock.json #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2021
Merged

Fix package-lock.json #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cf7fee
Fix package-lock.json
May 6, 2021
d689282
Fix solidity linter version
May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions contracts/mocks/GasTokenMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ contract Rlp {
uint256 constant MAX_NONCE = 256**9 - 1;

// count number of bytes required to represent an unsigned integer
function count_bytes(uint256 n) pure internal returns (uint256 c) {
uint i = 0;
uint mask = 1;
function count_bytes(uint256 n) internal pure returns (uint256 c) {
uint256 i = 0;
uint256 mask = 1;
while (n >= mask) {
i += 1;
mask *= 256;
Expand All @@ -18,7 +18,7 @@ contract Rlp {
return i;
}

function mk_contract_address(address a, uint256 n) pure internal returns (address rlp) {
function mk_contract_address(address a, uint256 n) internal pure returns (address rlp) {
/*
* make sure the RLP encoding fits in one word:
* total_length 1 byte
Expand Down Expand Up @@ -116,7 +116,7 @@ contract GasTokenMock is Rlp {
// Spec: Send `value` amount of tokens from address `from` to address `to`
function transferFrom(address from, address to, uint256 value) public returns (bool success) {
address spender = msg.sender;
if(value <= s_allowances[from][spender] && internalTransfer(from, to, value)) {
if (value <= s_allowances[from][spender] && internalTransfer(from, to, value)) {
s_allowances[from][spender] -= value;
return true;
} else {
Expand Down Expand Up @@ -150,9 +150,9 @@ contract GasTokenMock is Rlp {
// GasToken specifics
//////////////////////////////////////////////////////////////////////////

uint8 constant public decimals = 2;
string constant public name = "Gastoken.io";
string constant public symbol = "GST2";
uint8 public constant decimals = 2;
string public constant name = "Gastoken.io";
string public constant symbol = "GST2";

// We build a queue of nonces at which child contracts are stored. s_head is
// the nonce at the head of the queue, s_tail is the nonce behind the tail
Expand Down
8 changes: 7 additions & 1 deletion contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ import "../OtherSideBridgeStorage.sol";
import "./CompoundConnector.sol";
import "../GSNForeignERC20Bridge.sol";

contract ForeignBridgeErcToNative is BasicForeignBridge, ERC20Bridge, OtherSideBridgeStorage, CompoundConnector, GSNForeignERC20Bridge {
contract ForeignBridgeErcToNative is
BasicForeignBridge,
ERC20Bridge,
OtherSideBridgeStorage,
CompoundConnector,
GSNForeignERC20Bridge
{
function initialize(
address _validatorContract,
address _erc20token,
Expand Down
Loading