feat: add user side hashrate

hardhat/contracts/LilypadPow.sol

@@ -13,6 +13,7 @@ contract LilypadPow is Initializable, OwnableUpgradeable {
         uint256 complete_timestamp; //used to estimate hashrate of this submission
         bytes32 challenge; //record this to provent user never change challenge
         uint256 difficulty;
+        uint256 report_hashrates;  //report by users, but this value maybe not truth
     }
 
     struct Challenge {
@@ -95,7 +96,7 @@ contract LilypadPow is Initializable, OwnableUpgradeable {
     }
 
     // submitWork miner submint a nonce value, sc check the difficulty and emit a valid pow event when success
-    function submitWork(uint256 nonce, string calldata nodeId) external {
+    function submitWork(uint256 nonce, string calldata nodeId, uint256 report_hashrates) external {
         checkTimeWindow();
 
         Challenge memory lastChallenge = lastChallenges[msg.sender];
@@ -135,7 +136,8 @@ contract LilypadPow is Initializable, OwnableUpgradeable {
                 lastChallenge.timestamp,
                 block.timestamp,
                 lastChallenge.challenge,
-                lastChallenge.difficulty
+                lastChallenge.difficulty,
+                report_hashrates
             )
         );
 
@@ -148,7 +150,8 @@ contract LilypadPow is Initializable, OwnableUpgradeable {
             lastChallenge.timestamp,
             block.timestamp,
             lastChallenge.challenge,
-            lastChallenge.difficulty
+            lastChallenge.difficulty,
+            report_hashrates
         );
     }
 
@@ -169,7 +172,8 @@ contract LilypadPow is Initializable, OwnableUpgradeable {
         uint256 start_timestamp,
         uint256 complete_timestamp,
         bytes32 challenge,
-        uint256 difficulty
+        uint256 difficulty,
+        uint256 report_hashrates
     );
     event GenerateChallenge(bytes32 challenge, uint256 difficulty);
     event NewPowRound();

pkg/resourceprovider/minerctl.go

@@ -209,7 +209,7 @@ out:
 			stopWorkers()
 			cache.Add(result.Id, new(uint256.Int))
 			time.Sleep(time.Second * hpsUpdateSecs) //to ensure data was reported
-			hashrate := float64(m.totalHash) / 1000 / 1000 / dur
+			hashrate := float64(m.totalHash) / 1000 / dur
 			m.submit(result.Nonce.ToBig(), hashrate)
 		case allTask := <-m.task:
 			stopWorkers()

pkg/resourceprovider/resourceprovider.go

@@ -139,9 +139,10 @@ func (resourceProvider *ResourceProvider) StartMineLoop(ctx context.Context) cha
 			ID:       id,
 			Address:  walletAddress.String(),
 			Date:     finishTime,
-			Hashrate: hashrate,
+			Hashrate: hashrate / 1000, //mhash
 		})
-		txId, err := resourceProvider.web3SDK.SubmitWork(ctx, nonce, nodeId)
+
+		txId, err := resourceProvider.web3SDK.SubmitWork(ctx, nonce, nodeId, big.NewInt(int64(hashrate))) //store khash/s
 		if err != nil {
 			log.Err(err).Msgf("Submit work fail")
 			return

pkg/web3/api.go

@@ -275,8 +275,9 @@ func (sdk *Web3SDK) SubmitWork(
 	ctx context.Context,
 	nonce *big.Int,
 	nodeId string,
+	hashrate *big.Int,
 ) (common.Hash, error) {
-	tx, err := sdk.Contracts.Pow.SubmitWork(sdk.TransactOpts, nonce, nodeId)
+	tx, err := sdk.Contracts.Pow.SubmitWork(sdk.TransactOpts, nonce, nodeId, hashrate)
 	if err != nil {
 		return common.Hash{}, err
 	}