fix

src/components/pc/BlockChainBrowser/AddressOverview/index.vue

@@ -11,7 +11,7 @@
         {{ $t('lang.components.copy') }}
       </copy-btn>
       <div class="little-qrcode flex items-center justify-center">
-        <Popover placement="right" trigger="click">
+        <Popover placement="right" trigger="hover">
           <canvas id="qrcode" style="margin: 13px;"></canvas>
           <img
             slot="reference"

src/components/pc/BlockChainBrowser/LatestTx/index.vue

@@ -15,7 +15,7 @@
                   path: '/',
                 }"
               >
-                {{ item.hash | filterHash }}
+                {{ item.hash | filterHash(9) }}
               </router-link>
             </span>
           </div>
@@ -26,14 +26,16 @@
         <div class="middle">
           <div>
             <span class="graytxt">{{ $t('lang.trade.sender') }}：</span>
-            <span class="text-footer-color">{{ item.from | filterHash }}</span>
+            <span class="text-footer-color">
+              {{ item.from | filterHash(9) }}
+            </span>
           </div>
           <div class="graytxt">
             <span class="graytxt">{{ $t('lang.trade.receiver') }}：</span>
-            <span class="text-footer-color">{{ item.to | filterHash }}</span>
+            <span class="text-footer-color">{{ item.to | filterHash(9) }}</span>
           </div>
         </div>
-        <div class="right text-center">
+        <div class="right text-right">
           <div class="graytxt">{{ $t('lang.trade.txAmount') }}</div>
           <div class="text-darkBlue">{{ item | filterTradeValue }}</div>
         </div>
@@ -100,7 +102,7 @@ export default Vue.extend({
   color: #7c88ad;
 }
 .left {
-  min-width: 192px;
+  min-width: 233px;
 }
 
 .middle {

src/mixin/blockDetail.ts

@@ -3,6 +3,7 @@ import Vue from "vue";
 import { getBlockOverviewAndRelativeHeight } from "ycc-api/dist/cmjs/service/blockDetail";
 import { message } from "ant-design-vue";
 import { tradeAccuracy } from "@/utils/common";
+import { getConsensusList, getPackList, getVoteList } from "@/utils/consensus";
 const Rpc = getRpc("/yccApi");
 export default Vue.extend({
   data() {
@@ -68,6 +69,7 @@ export default Vue.extend({
       Rpc.getTxByHashes(searchArr).then((data) => {
         this.loadingTable = false;
         if (data.error == null) {
+          console.log(getConsensusList(data.result.txs)); // 共识节点
           // this.searchIcon(data.result.txs);
           this.Trades = this.checkGroup(data.result.txs);
         } else {

src/utils/consensus.ts

+export const getVoteList = (txs: any[]): { addr: string; reward: number }[] => {
+  const logsList: any[] = [];
+  txs.forEach((tx) => {
+    logsList.push(...tx.receipt.logs);
+  });
+
+  return logsList
+    .filter((i) => i.ty === 8)
+    .reduce((pi, ci) => {
+      if (ci.log.current.balance - ci.log.prev.balance === 0.25 * 1e8)
+        return pi; //筛选出投票地址
+      if (pi.find((item: { addr: any }) => item.addr === ci.log.prev.addr)) {
+        // 如果本地址已经在结果数组中存在了，就累加balance
+        pi.find(
+          (item: { addr: any }) => item.addr === ci.log.prev.addr
+        ).reward += ci.log.current.balance - ci.log.prev.balance;
+        return pi;
+      } else {
+        return [
+          ...pi,
+          {
+            addr: ci.log.prev.addr,
+            reward: ci.log.current.balance - ci.log.prev.balance,
+          },
+        ];
+      }
+    }, []);
+};
+
+export const getPackList = (txs: any[]): { addr: string; reward: number }[] => {
+  const logsList: any[] = [];
+  txs.forEach((tx) => {
+    logsList.push(...tx.receipt.logs);
+  });
+
+  return logsList
+    .filter((i) => i.ty === 8)
+    .reduce((pi, ci) => {
+      if (ci.log.current.balance - ci.log.prev.balance > 0.25 * 1e8) return pi; //筛选出打包地址
+      if (pi.find((item: { addr: any }) => item.addr === ci.log.prev.addr)) {
+        // 如果本地址已经在结果数组中存在了，就累加balance
+        pi.find(
+          (item: { addr: any }) => item.addr === ci.log.prev.addr
+        ).reward += ci.log.current.balance - ci.log.prev.balance;
+        return pi;
+      } else {
+        return [
+          ...pi,
+          {
+            addr: ci.log.prev.addr,
+            reward: ci.log.current.balance - ci.log.prev.balance,
+          },
+        ];
+      }
+    }, []);
+};
+
+interface iRetTypeOfGetConItem {
+  reward: number;
+  addr: string;
+  type: "pack" | "vote";
+}
+
+export const getConsensusList = (txs: any[]): iRetTypeOfGetConItem[] => {
+  const logsList: any[] = [];
+  txs.forEach((tx) => {
+    logsList.push(...tx.receipt.logs);
+  });
+
+  return logsList
+    .filter((i) => i.ty === 8)
+    .reduce<iRetTypeOfGetConItem[]>((pi, ci) => {
+      const reward = ci.log.current.balance - ci.log.prev.balance;
+      if (reward > 0.25 * 1e8) {
+        //筛选出打包地址
+        const theOne = pi.find(
+          (i) => i.type === "pack" && i.addr === ci.log.current.addr
+        );
+        if (theOne) {
+          theOne.reward += reward;
+          return [...pi];
+        } else {
+          return [
+            ...pi,
+            {
+              type: "pack",
+              addr: ci.log.current.addr,
+              reward: reward,
+            },
+          ];
+        }
+      } else {
+        //筛选出投票地址
+        const theOne = pi.find(
+          (i) => i.type === "vote" && i.addr === ci.log.current.addr
+        );
+
+        if (theOne) {
+          // 如果本地址已经在结果数组中存在了，就累加balance
+          theOne.reward += reward;
+          return [...pi];
+        } else {
+          return [
+            ...pi,
+            {
+              type: "vote",
+              addr: ci.log.prev.addr,
+              reward,
+            },
+          ];
+        }
+      }
+    }, [] as iRetTypeOfGetConItem[]);
+};