Merge pull request #22 from persistenceOne/rohit/stketh_exchange_rate

Rohit/stketh exchange rate
persistenceOne · May 27, 2022 · 18b392d · 18b392d
2 parents 8395d1b + d8bb4b8
commit 18b392d
Show file tree

Hide file tree

Showing 7 changed files with 37,208 additions and 2,697 deletions.
diff --git a/contracts/Oracle.sol b/contracts/Oracle.sol
@@ -414,7 +414,7 @@ contract Oracle is IOracle, CoreRef {
             _getFrameFirstEpochId(currentFrameEpochId, beaconData)
         );
         require(
-            currentFrameEpochId <=
+            currentFrameEpochId <
             _getFrameFirstEpochId(currentFrameEpochId, beaconData) +
             beaconData.epochsPerTimePeriod
         );

diff --git a/contracts/StakingPool.sol b/contracts/StakingPool.sol
@@ -36,7 +36,7 @@ contract StakingPool is IStakingPool, OwnableUpgradeable{
 
     uint256 public DEVIATION; // 5% deviation is acceptable
     uint256 public constant BASIS_POINT = 10000;
-    event RewardRedeemed(uint256 amount, uint256 time, address node_operator);
+    event RewardRedeemed(uint256 amount, address node_operator);
 
     mapping(address => UserInfo) public userInfos;
 
@@ -79,7 +79,7 @@ contract StakingPool is IStakingPool, OwnableUpgradeable{
 
         if(pending > 0){
             stkEth.transfer(usr, pending);
-            emit RewardRedeemed(pending,block.timestamp,usr);
+            emit RewardRedeemed(pending,usr);
         }
 
         user.rewardDebt = accRewardPerValidator*userValidators/1e12;

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -37,18 +37,30 @@ module.exports = {
     //   allowUnlimitedContractSize: true,
     // },
     local: {
-      url: "http://localhost:8545",
+      url: process.env.RPC_URL,
+      accounts: {
+        mnemonic: process.env.MNEMONIC
+      }
     },
     rinkeby: {
       url: "https://eth-rinkeby.alchemyapi.io/v2/RYejb4WXXjHmxxscJB4qNpIZkXMOXskn",
       accounts: ["0a0ddf30ecb569d0133c6108d6223a8d793a57e954443864ea8cce6ac25af30a"],
     },
     goerli: {
+      url: "http://127.0.0.1:8545",
+      chainId: 5,
+      gasMultiplier: 2,
+      accounts: {
+        mnemonic: process.env.MNEMONIC
+      }
+    },
+    mainnet: {
       url: process.env.RPC_URL,
-      accounts: [process.env.PRIVATE_KEY],
-      gas: 500000,
-      gasPrice: 2000000009,
-      gasMultiplier: 2
+      chainId: 1,
+      gasMultiplier: 2,
+      accounts: {
+        mnemonic: process.env.MNEMONIC
+      }
     }
   },
   // gasReporter: {