V2 deploy (#95)

Added deploy scripts for all core contracts. `/deployments` contains the rinkeby deployment. Added faucet for testnet. Co-authored-by: 0xdavinchee <[email protected]> Co-authored-by: LolChocotaco <[email protected]>
OlympusDAO · Dec 18, 2021 · 3bb3605 · 3bb3605
1 parent 58805b6
commit 3bb3605
Show file tree

Hide file tree

Showing 89 changed files with 11,956 additions and 21,990 deletions.
diff --git a/.env.example b/.env.example
@@ -1,3 +1,4 @@
 ALCHEMY_API_KEY=RuGxhTpkUt3S6InAt33l_3NZc4pFwXxS
 ETHERSCAN_API_KEY=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
 MNEMONIC=here is where your twelve words mnemonic should be put my friend
+PRIVATE_KEY=PrivateKeyGoesHere
diff --git a/.gitignore b/.gitignore
@@ -13,13 +13,15 @@ types/
 node_modules/
 .env
 yarn-error.log
+.package-lock.json
 
 .yalc
 yalc.lock
 
 contractsInfo.json
 deployments/hardhat
 deployments/localhost
+deployments/**/solcinputs
 
 /.dapp
 

diff --git a/contracts/BondDepository.sol b/contracts/BondDepository.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 pragma abicoder v2;
 

diff --git a/contracts/BondTeller.sol b/contracts/BondTeller.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeMath.sol";

diff --git a/contracts/OlympusAuthority.sol b/contracts/OlympusAuthority.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./interfaces/IOlympusAuthority.sol";

diff --git a/contracts/OlympusERC20.sol b/contracts/OlympusERC20.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeMath.sol";

diff --git a/contracts/Staking.sol b/contracts/Staking.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeMath.sol";

diff --git a/contracts/StakingDistributor.sol b/contracts/StakingDistributor.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeERC20.sol";

diff --git a/contracts/StandardBondingCalculator.sol b/contracts/StandardBondingCalculator.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeMath.sol";

diff --git a/contracts/Treasury.sol b/contracts/Treasury.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/SafeMath.sol";

diff --git a/contracts/interfaces/IBondingCalculator.sol b/contracts/interfaces/IBondingCalculator.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IBondingCalculator {

diff --git a/contracts/interfaces/IDistributor.sol b/contracts/interfaces/IDistributor.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IDistributor {

diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IERC20 {

diff --git a/contracts/interfaces/IERC20Metadata.sol b/contracts/interfaces/IERC20Metadata.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IERC20.sol";

diff --git a/contracts/interfaces/IGovernable.sol b/contracts/interfaces/IGovernable.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 

diff --git a/contracts/interfaces/IGuardable.sol b/contracts/interfaces/IGuardable.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 

diff --git a/contracts/interfaces/IOHM.sol b/contracts/interfaces/IOHM.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IERC20.sol";

diff --git a/contracts/interfaces/IOlympusAuthority.sol b/contracts/interfaces/IOlympusAuthority.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity =0.7.5;
 
 interface IOlympusAuthority {

diff --git a/contracts/interfaces/IOracle.sol b/contracts/interfaces/IOracle.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IOracle {

diff --git a/contracts/interfaces/IOwnable.sol b/contracts/interfaces/IOwnable.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 

diff --git a/contracts/interfaces/IStaking.sol b/contracts/interfaces/IStaking.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IStaking {

diff --git a/contracts/interfaces/IStakingV1.sol b/contracts/interfaces/IStakingV1.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IStakingV1 {

diff --git a/contracts/interfaces/ITeller.sol b/contracts/interfaces/ITeller.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface ITeller {

diff --git a/contracts/interfaces/ITreasury.sol b/contracts/interfaces/ITreasury.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface ITreasury {

diff --git a/contracts/interfaces/ITreasuryV1.sol b/contracts/interfaces/ITreasuryV1.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface ITreasuryV1 {

diff --git a/contracts/interfaces/IUniswapV2ERC20.sol b/contracts/interfaces/IUniswapV2ERC20.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IUniswapV2ERC20 {

diff --git a/contracts/interfaces/IUniswapV2Pair.sol b/contracts/interfaces/IUniswapV2Pair.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IUniswapV2ERC20.sol";

diff --git a/contracts/interfaces/IUniswapV2Router.sol b/contracts/interfaces/IUniswapV2Router.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IUniswapV2Router {

diff --git a/contracts/interfaces/IWarmup.sol b/contracts/interfaces/IWarmup.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 interface IWarmup {

diff --git a/contracts/interfaces/IgOHM.sol b/contracts/interfaces/IgOHM.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IERC20.sol";

diff --git a/contracts/interfaces/IsOHM.sol b/contracts/interfaces/IsOHM.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IERC20.sol";

diff --git a/contracts/interfaces/IwsOHM.sol b/contracts/interfaces/IwsOHM.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.7.5;
 
 import "./IERC20.sol";

diff --git a/contracts/libraries/Address.sol b/contracts/libraries/Address.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 

diff --git a/contracts/libraries/Counters.sol b/contracts/libraries/Counters.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./SafeMath.sol";

diff --git a/contracts/libraries/FixedPoint.sol b/contracts/libraries/FixedPoint.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./FullMath.sol";

diff --git a/contracts/libraries/FullMath.sol b/contracts/libraries/FullMath.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 library FullMath {

diff --git a/contracts/libraries/SafeMath.sol b/contracts/libraries/SafeMath.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 

diff --git a/contracts/migration/CrossChainMigrator.sol b/contracts/migration/CrossChainMigrator.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.7.5;
 
 import "../interfaces/IERC20.sol";

diff --git a/contracts/migration/OlympusTokenMigrator.sol b/contracts/migration/OlympusTokenMigrator.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.7.5;
 
 import "../interfaces/IERC20.sol";

diff --git a/contracts/mocks/DAI.sol b/contracts/mocks/DAI.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.7.5;
 
 contract LibNote {

diff --git a/contracts/sOlympusERC20.sol b/contracts/sOlympusERC20.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.7.5;
 
 import "./libraries/Address.sol";

diff --git a/contracts/testnet/OhmFaucet.sol b/contracts/testnet/OhmFaucet.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity 0.7.5;
+
+import "../interfaces/IERC20.sol";
+import "../types/Ownable.sol";
+
+contract OhmFaucet is Ownable {
+    IERC20 public ohm;
+
+    constructor(address _ohm) {
+        ohm = IERC20(_ohm);
+    }
+
+    function setOhm(address _ohm) external onlyOwner {
+        ohm = IERC20(_ohm);
+    }
+
+    function dispense() external {
+        ohm.transfer(msg.sender, 1e9);
+    }
+}
diff --git a/deployments/mainnet/.chainId b/deployments/mainnet/.chainId
@@ -0,0 +1 @@
+1