Update packages and reformat code

GambiarraFinance · Jul 23, 2020 · 3f4912e · 3f4912e
1 parent 6639db9
commit 3f4912e
Show file tree

Hide file tree

Showing 35 changed files with 1,351 additions and 1,053 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) CENTRE SECZ 2018-2020
+Copyright (c) 2018-2020 CENTRE SECZ
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 contract Migrations {
     address public owner;
     uint256 public last_completed_migration;

diff --git a/contracts/test/ContractThatCallsPublicFunctions.sol b/contracts/test/ContractThatCallsPublicFunctions.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { ContractWithPublicFunctions } from "./ContractWithPublicFunctions.sol";
 
-
 contract ContractThatCallsPublicFunctions {
     function callSetFoo(address contractAddress, string calldata foo)
         external

diff --git a/contracts/test/ContractThatReverts.sol b/contracts/test/ContractThatReverts.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 // solhint-disable no-unused-vars
 // solhint-disable no-complex-fallback
 // solhint-disable reason-string

diff --git a/contracts/test/ContractWithExternalFunctions.sol b/contracts/test/ContractWithExternalFunctions.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 contract ContractWithExternalFunctions {
     string private _foo;
     uint256 private _bar;

diff --git a/contracts/test/ContractWithPublicFunctions.sol b/contracts/test/ContractWithPublicFunctions.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 contract ContractWithPublicFunctions {
     string private _foo;
     uint256 private _bar;

diff --git a/contracts/test/DummyERC20.sol b/contracts/test/DummyERC20.sol
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
-
 contract DummyERC20 is ERC20 {
     constructor(
         string memory tokenName,

diff --git a/contracts/test/UpgradedFiatToken.sol b/contracts/test/UpgradedFiatToken.sol
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { FiatTokenV1 } from "../v1/FiatTokenV1.sol";
 
-
 /**
  * @title UpgradedFiatToken
  * @dev ERC20 Token backed by fiat reserves

diff --git a/contracts/test/UpgradedFiatTokenNewFieldsNewLogicTest.sol b/contracts/test/UpgradedFiatTokenNewFieldsNewLogicTest.sol
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { FiatTokenV1 } from "../v1/FiatTokenV1.sol";
 
-
 /**
  * @title UpgradedFiatTokenNewFieldsNewLogicTest
  * @dev ERC20 Token backed by fiat reserves

diff --git a/contracts/test/UpgradedFiatTokenNewFieldsTest.sol b/contracts/test/UpgradedFiatTokenNewFieldsTest.sol
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { FiatTokenV1 } from "../v1/FiatTokenV1.sol";
 
-
 /**
  * @title UpgradedFiatTokenNewFieldsTest
  * @dev ERC20 Token backed by fiat reserves

diff --git a/contracts/upgradeability/AdminUpgradeabilityProxy.sol b/contracts/upgradeability/AdminUpgradeabilityProxy.sol
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { UpgradeabilityProxy } from "./UpgradeabilityProxy.sol";
 
-
 /**
  * @notice This contract combines an upgradeability proxy with an authorization
  * mechanism for administrative tasks.
@@ -48,7 +47,8 @@ contract AdminUpgradeabilityProxy is UpgradeabilityProxy {
      * This is the keccak-256 hash of "org.zeppelinos.proxy.admin", and is
      * validated in the constructor.
      */
-    bytes32 private constant ADMIN_SLOT = 0x10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b;
+    bytes32
+        private constant ADMIN_SLOT = 0x10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b;
 
     /**
      * @dev Modifier to check whether the `msg.sender` is the admin.

diff --git a/contracts/upgradeability/Proxy.sol b/contracts/upgradeability/Proxy.sol
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 /**
  * @notice Implements delegation of calls to other contracts, with proper
  * forwarding of return values and bubbling of failures.

diff --git a/contracts/upgradeability/UpgradeabilityProxy.sol b/contracts/upgradeability/UpgradeabilityProxy.sol
@@ -27,7 +27,6 @@ pragma solidity 0.6.8;
 import { Proxy } from "./Proxy.sol";
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 
-
 /**
  * @notice This contract implements a proxy that allows to change the
  * implementation address to which it will delegate.
@@ -49,7 +48,8 @@ contract UpgradeabilityProxy is Proxy {
      * This is the keccak-256 hash of "org.zeppelinos.proxy.implementation", and is
      * validated in the constructor.
      */
-    bytes32 private constant IMPLEMENTATION_SLOT = 0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3;
+    bytes32
+        private constant IMPLEMENTATION_SLOT = 0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3;
 
     /**
      * @dev Contract constructor.

diff --git a/contracts/util/ECRecover.sol b/contracts/util/ECRecover.sol
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2016-2019 zOS Global Limited
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@
 
 pragma solidity 0.6.8;
 
-
 /**
  * @title ECRecover
  * @notice A library that provides a safe ECDSA recovery function

diff --git a/contracts/util/EIP712.sol b/contracts/util/EIP712.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { ECRecover } from "./ECRecover.sol";
 
-
 /**
  * @title EIP712
  * @notice A library that provides EIP712 helper functions

diff --git a/contracts/v1.1/FiatTokenV1_1.sol b/contracts/v1.1/FiatTokenV1_1.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@ pragma solidity 0.6.8;
 import { FiatTokenV1 } from "../v1/FiatTokenV1.sol";
 import { Rescuable } from "./Rescuable.sol";
 
-
 /**
  * @title FiatTokenV1_1
  * @dev ERC20 Token backed by fiat reserves

diff --git a/contracts/v1.1/Rescuable.sol b/contracts/v1.1/Rescuable.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ import { Ownable } from "../v1/Ownable.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
 
-
 contract Rescuable is Ownable {
     using SafeERC20 for IERC20;
 

diff --git a/contracts/v1/AbstractFiatTokenV1.sol b/contracts/v1/AbstractFiatTokenV1.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-
 abstract contract AbstractFiatTokenV1 is IERC20 {
     function _approve(
         address owner,

diff --git a/contracts/v1/Blacklistable.sol b/contracts/v1/Blacklistable.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { Ownable } from "./Ownable.sol";
 
-
 /**
  * @title Blacklistable Token
  * @dev Allows accounts to be blacklisted by a "blacklister" role

diff --git a/contracts/v1/FiatTokenProxy.sol b/contracts/v1/FiatTokenProxy.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ import {
     AdminUpgradeabilityProxy
 } from "../upgradeability/AdminUpgradeabilityProxy.sol";
 
-
 /**
  * @title FiatTokenProxy
  * @dev This contract proxies FiatToken calls and enables FiatToken upgrades

diff --git a/contracts/v1/FiatTokenV1.sol b/contracts/v1/FiatTokenV1.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@ import { Ownable } from "./Ownable.sol";
 import { Pausable } from "./Pausable.sol";
 import { Blacklistable } from "./Blacklistable.sol";
 
-
 /**
  * @title FiatToken
  * @dev ERC20 Token backed by fiat reserves

diff --git a/contracts/v1/Ownable.sol b/contracts/v1/Ownable.sol
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2018 zOS Global Limited.
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
  */
 pragma solidity 0.6.8;
 
-
 /**
  * @notice The Ownable contract has an owner address, and provides basic
  * authorization control functions

diff --git a/contracts/v1/Pausable.sol b/contracts/v1/Pausable.sol
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2016 Smart Contract Solutions, Inc.
- * Copyright (c) CENTRE SECZ 2018-20200
+ * Copyright (c) 2018-2020 CENTRE SECZ0
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@ pragma solidity 0.6.8;
 
 import { Ownable } from "./Ownable.sol";
 
-
 /**
  * @notice Base contract which allows children to implement an emergency stop
  * mechanism

diff --git a/contracts/v2/AbstractFiatTokenV2.sol b/contracts/v2/AbstractFiatTokenV2.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ pragma solidity 0.6.8;
 
 import { AbstractFiatTokenV1 } from "../v1/AbstractFiatTokenV1.sol";
 
-
 abstract contract AbstractFiatTokenV2 is AbstractFiatTokenV1 {
     function _increaseAllowance(
         address owner,

diff --git a/contracts/v2/EIP712Domain.sol b/contracts/v2/EIP712Domain.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 /**
  * @title EIP712 Domain
  */

diff --git a/contracts/v2/FiatTokenUtil.sol b/contracts/v2/FiatTokenUtil.sol
@@ -1,7 +1,7 @@
 /**
  * SPDX-License-Identifier: MIT
  *
- * Copyright (c) CENTRE SECZ 2018-2020
+ * Copyright (c) 2018-2020 CENTRE SECZ
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 
 pragma solidity 0.6.8;
 
-
 contract FiatTokenUtil {
     // (address,address,uint256,uint256,uint256,bytes32) = 20*2 + 32*4 = 168
     uint256 private constant _TRANSFER_PARAM_SIZE = 168;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ pragma solidity 0.6.8; @@
     import { FiatTokenV1 } from "../v1/FiatTokenV1.sol";
     /**
      * @title UpgradedFiatToken
      * @dev ERC20 Token backed by fiat reserves
@@ Expand Down @@