Merge pull request #352 from Lumerin-protocol/halving

Halving

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lumerin-wallet-desktop",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "engines": {
     "node": ">=14"
   },
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@electron/remote": "2.0.9",
-    "@lumerin/wallet-core": "github:Lumerin-protocol/WalletCore#1.1.0",
+    "@lumerin/wallet-core": "github:Lumerin-protocol/WalletCore#1.1.1",
     "@reach/menu-button": "0.17.0",
     "@tabler/icons": "1.119.0",
     "axios": "0.27.2",

src/components/contracts/SellerHub.js

@@ -81,6 +81,7 @@ function SellerHub({
   contractsRefresh,
   allowSendTransaction,
   networkDifficulty,
+  blockReward,
   selectedCurrency,
   formUrl,
   ...props
@@ -117,7 +118,8 @@ function SellerHub({
         props.lmrCoinPrice,
         props.btcCoinPrice,
         address,
-        networkDifficulty
+        networkDifficulty,
+        blockReward
       );
     }
   }, [contracts]);
@@ -133,7 +135,10 @@ function SellerHub({
         );
         const lmrCoinPrice = param[1];
         const btcCoinPrice = param[2];
-        const reward = formatBtcPerTh(param[4]);
+
+        const networkDifficulty = param[4];
+        const blockReward = param[5];
+        const reward = formatBtcPerTh(networkDifficulty, blockReward);
         const deviation = +settings.deviation;
         const result = contracts.reduce((acc, contract) => {
           const contractProfitTarget =
@@ -481,7 +486,7 @@ function SellerHub({
     count: contractsToShow.length ?? 0,
     rented: rentedContracts.reduce(speedReducer, 0),
     totalPosted: contractsToShow.reduce(speedReducer, 0),
-    networkReward: formatBtcPerTh(networkDifficulty)
+    networkReward: formatBtcPerTh(networkDifficulty, blockReward)
   };
   const showArchive = deadContracts?.length;
   const onArchiveOpen = () => setIsArchiveModalActive(true);

src/components/contracts/utils.js

@@ -67,12 +67,11 @@ export const formatPrice = (price, symbol) => {
   return `${Math.round(value * 100) / 100} ${symbol}`;
 };
 
-export const formatBtcPerTh = networkDifficulty => {
+export const formatBtcPerTh = (networkDifficulty, blockReward) => {
   const networkHashrate =
     (networkDifficulty * Math.pow(2, 32)) / 600 / Math.pow(10, 12);
 
   const miningHours = 24;
-  const blockReward = 6.25;
   const hashrate = 1; // TH/s
   const blocksExpected = 1 / 0.1667; // 1 block every 10 minutes
   const profitPerTh =

src/store/hocs/withContractsState.js

@@ -81,6 +81,7 @@ const withContractsState = WrappedComponent => {
     allowSendTransaction: selectors.isAllowSendTransaction(state),
     contractsLastUpdatedAt: selectors.getContractsLastUpdated(state),
     networkDifficulty: selectors.getNetworkDifficulty(state),
+    blockReward: selectors.getBlockReward(state),
     lmrCoinPrice: selectors.getRate(state),
     ethCoinPrice: selectors.getRateEth(state),
     btcCoinPrice: selectors.getRateBtc(state),

src/store/reducers/meta.js

@@ -66,7 +66,8 @@ const reducer = handleActions(
     'network-difficulty-updated': (state, { payload }) => {
       return {
         ...state,
-        networkDifficulty: payload.difficulty
+        networkDifficulty: payload.difficulty,
+        blockReward: payload.reward
       };
     },
 

src/store/selectors/chain.js

@@ -107,6 +107,12 @@ export const getNetworkDifficulty = createSelector(
     chainData ? chainMetaData.networkDifficulty : null
 );
 
+export const getBlockReward = createSelector(
+  getChain,
+  getChainMeta,
+  (chainData, chainMetaData) => (chainData ? chainMetaData.blockReward : null)
+);
+
 export const getRateEth = createSelector(
   getChain,
   getChainMeta,