From 67f0ca96522805b450933fb669383e1ed028d1bf Mon Sep 17 00:00:00 2001
From: liuqiang <liuqiang1357@163.com>
Date: Mon, 17 Aug 2020 14:48:25 +0800
Subject: [PATCH 1/5] support new governance method: setFeePercentage

---
 package.json                                  |   2 +-
 .../NodeManagement/NodeStakeAuthorization.vue |  53 ++--
 src/lang/en.js                                | 237 +++++++++---------
 src/lang/zh.js                                | 235 ++++++++---------
 src/store/modules/NodeAuthorization.js        |  10 +-
 yarn.lock                                     |   8 +-
 6 files changed, 287 insertions(+), 258 deletions(-)

diff --git a/package.json b/package.json
index 0c49c20..51ca39a 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "nedb": "^1.8.0",
     "node-hid": "^1.3.0",
     "numeral": "^2.0.6",
-    "ontology-ts-sdk": "^1.1.9",
+    "ontology-ts-sdk": "^1.1.10-alpha.1",
     "opn": "^5.4.0",
     "popper.js": "^1.14.3",
     "usb": "^1.6.3",
diff --git a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
index 7380e19..e533aba 100644
--- a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
+++ b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
@@ -119,6 +119,7 @@
 }
 .node-reward-proportion {
     margin-top:10px;
+    margin-right: 10px;
     float:left;
 }
 .node-reward-proportion p {
@@ -126,7 +127,10 @@
 }
 .edit-proportion-btn {
     margin-top: 10px;
-    margin-left: 20px;
+}
+.h-spacer {
+  display: inline-block;
+  width: 10px;
 }
 </style>
 <template>
@@ -159,7 +163,7 @@
             </div>
             <div class="content-row">
                 <div class="content-column">
-                    <span>{{$t('nodeMgmt.userStake')}}</span>
+                    <span>{{$t('nodeMgmt.userStakeAmount')}}</span>
                     <span>{{current_peer.totalPosStr}} ONT</span>
                 </div>
             </div>
@@ -172,10 +176,17 @@
         <div class="clearfix">
             <div class="font-medium-black rewardProportionTip">{{$t('nodeMgmt.rewardProportion')}}</div>
             <div class="node-reward-proportion">
+                <p class="font-medium">{{$t('nodeMgmt.nodeStake')}}</p>
                 <p class="font-medium">{{peer_attrs.tPeerCost}}%  ({{$t('nodeMgmt.activeT')}})</p>
                 <p class="font-medium">{{peer_attrs.t1PeerCost}}%  ({{$t('nodeMgmt.activeT1')}})</p>
                 <p class="font-medium">{{peer_attrs.t2PeerCost}}%  ({{$t('nodeMgmt.activeT2')}})</p>
             </div>
+            <div class="node-reward-proportion">
+                <p class="font-medium">{{$t('nodeMgmt.userStake')}}</p>
+                <p class="font-medium">{{peer_attrs.tStakeCost}}%  ({{$t('nodeMgmt.activeT')}})</p>
+                <p class="font-medium">{{peer_attrs.t1StakeCost}}%  ({{$t('nodeMgmt.activeT1')}})</p>
+                <p class="font-medium">{{peer_attrs.t2StakeCost}}%  ({{$t('nodeMgmt.activeT2')}})</p>
+            </div>
             <a-button type="primary" class="btn-next edit-proportion-btn" @click="editProportion">{{$t('nodeMgmt.edit')}}</a-button>
         </div>
 
@@ -205,22 +216,30 @@
             @ok="confirmChangeCost"
             @cancel="handleCancelChangeCost"
             >
-            <div class="clearfix" style="margin-top:10px;">
-                <span class="rewardProportionTip font-medium">{{$t('nodeMgmt.changeRewardProportion')}}</span>
-                <!-- <a-slider :min="0" :max="100" v-model="peerCost" :step="1" class="reward-slider"/> -->
-                <a-input-number
-                    :min="0"
-                    :max="100"
-                    class="reward-input"
-                    v-model="peerCost"
-                    style="width:60px;"
-                /> %
+            <div class="clearfix">
+              {{$t('nodeMgmt.nodeStake')}}:
+              <a-input-number
+                  :min="0"
+                  :max="100"
+                  class="reward-input"
+                  v-model="peerCost"
+                  style="width:60px;"
+              /> %
+              <span class="h-spacer" />
+              {{$t('nodeMgmt.userStake')}}:
+              <a-input-number
+                  :min="0"
+                  :max="100"
+                  class="reward-input"
+                  v-model="stakeCost"
+                  style="width:60px;"
+              /> %
             </div>
-            <div>
+            <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
                 <span>{{$t('nodeMgmt.rewardsProportionTip')}}</span>
             </div>
-            <div style="margin-bottom:5px;">
+            <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
                 <span>{{$t('nodeMgmt.changesTakeEffect')}}</span>
             </div>
@@ -242,7 +261,8 @@ export default {
     },
     data(){
         return {
-            peerCost:0,
+            peerCost: 0,
+            stakeCost: 0,
             validUnit:true,
             unit:0,
             intervalId:0,
@@ -311,10 +331,11 @@ export default {
             }
         },
         confirmChangeCost() {
-            const tx = GovernanceTxBuilder.makeSetPeerCostTx(
+            const tx = GovernanceTxBuilder.makeSetFeePercentageTx(
                     this.stakeDetail.publickey,
                     new Crypto.Address(this.stakeWallet.address),
                     parseInt(this.peerCost),
+                    parseInt(this.stakeCost),
                     new Crypto.Address(this.stakeWallet.address),
                     GAS_PRICE,
                     GAS_LIMIT
diff --git a/src/lang/en.js b/src/lang/en.js
index 62b4875..42bd568 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -539,6 +539,7 @@ export default {
     normalUser: 'If you are a normal user, you can participate in stake authorization here.',
     stakeAuthorizaton: 'Stake Authorization',
     nodeStake: 'Node Stake',
+    userStake: 'User Stake',
     userStakeAuthorization: 'User Stake Authorization',
     newStake: 'Submit A New Stake',
     allowStakes: 'Allow stakes from other users',
@@ -547,7 +548,7 @@ export default {
     yourStakeAmount: 'Your node stake amount',
     stakeLimit: 'Total max stake limit',
     userNumber: 'Current number of users staking',
-    userStake: 'Current total stake of users',
+    userStakeAmount: 'Current total stake of users',
     rewardsPerMonth: 'Estimate total rewards per month',
     rewardsTip: 'Estimate total rewards per month includes your rewards and the rewards of other uesrs staking.',
     rewardProportion: 'Reward proportion for yourself: ',
@@ -633,123 +634,123 @@ Within their 50% share each consensus node will receive their share according to
     noClaimbleInitPos: 'No claimable ONT.',
     redeemInitPosOk: 'Redeem',
     hasClaimableInitPos: 'You have redeemable init pos. Please redeem this part first.',
-      noClaimbleToRefund: 'No redeemable ONT to refund.',
-      newNodeApply: 'New Node Apply',
-      nodeApplyTip: ''
-    },
-    vote: {
-        node: 'Node',
-        vote: 'Vote',
-        voteTip: "For authorized users, vote here",
-        login: 'Sign in',
-        notSeeWallet: "Didn't see your wallet? Import one ",
-        importHere: 'here',
-        notStart: 'Not started',
-        inProgress: 'In Progress',
-        finished: 'Finished',
-        canceled: 'Canceled',
-        nodeCanVoteOnly: '*Only users from consensus nodes are allowed to vote.',
-        title: 'Title',
-        detail: 'Detail',
-        votingStarts: 'Vote start time',
-        votingEnds: 'Vote end time',
-        back: 'Back',
-        submit: 'Submit',
-        submitVoteSuccess: 'Vote succeeded',
-        submitVoteFail: 'Vote failed',
-        stopVoteSuccess: 'Vote cancelled',
-        stopVoteFail: 'Vote cancellation failed',
-        createVoteSuccess: 'Vote created',
-        createVoteFail: 'Vote creation failed',
-        onlySupportEnglish: 'Only English is allowed',
-        fillBlanks: 'Please fill in the blanks.',
-        endTimeError: "The vote must end in a future time.",
-        votingTopics: 'Voting Topics',
-        votingDetail: 'Voting Detail',
-        stopVote: 'Cancel Voting',
-        info: 'Info',
-        startTime: 'Starting time',
-        endTime: 'Ending time',
-        hash: 'Hash',
-        creatorAddress: 'Creator address',
-        votingStatus: 'Vote status',
-        myVotes: 'My vote(s)',
-        approval: 'Approved',
-        opposition: 'Denied',
-        allVotes: 'All votes',
-        created: 'Created by me',
-        duration: 'Duration',
-        notAllowVote: 'You cannot vote now, the vote is: ',
-        notAllowStop: 'You cannot stop the vote now, the vote is : ',
-        name: 'Name',
-        address: 'Address',
-        votes: 'Number of votes',
-        selectWallet: 'Select node operation wallet',
-        startTimeError: 'Start time cannot be later than end time.',
-        new: 'New'
-    },
-    nodeApply: {
-        newNodeApply: 'New node apply',
-        stakeWallet: 'Stake wallet',
-        operationWallet: 'Node operation wallet',
-        selectOperationWallet: 'Select operation wallet',
-        operationPk: 'Operation wallet public key',
-        enterOperationPk: 'Enter operation wallet public key',
-        invalidOperationPk: 'Invalid operation wallet',
-        stakeAmount: 'Stake amount',
-        inputStakeAmount: 'Enter stake amount',
-        next: 'Next',
-        ok: 'OK',
-        cancel: 'Cancel',
-        operationWalletPublickey: 'Node operation wallet publickey',
-        registerSuccess: 'Congratulations on the successful node registration',
-        completeNodeInfo: 'Complete node info now',
-        later: 'Later',
-        sameWalletNotAllowed: 'The operation wallet and staking wallet can not be the same',
-        operationWalletRequired: 'Operation wallet is required',
-        stakeWalletRequired: 'Stake wallet is required',
-        stakeAmountRequired: 'Stake amount is required',
-        minStateAmount: 'The stake amount is at least 10,000 ONT',
-        proxyServiceTip: 'The Ontology community now provides node operation by proxy service.',
-        proxyServiceLink: 'Click here to find out more.'
-    },
-    myNode: {
-        myNode: 'My nodes',
-        stakeWalletAddress: 'Stake wallet address',
-        operationWalletPk: 'Operation wallet public key',
-        manage: 'Manage',
-        applyNode: 'Apply new node'
-    },
-    nodeInfo: {
-        nodeInfo: 'Node info',
-        name: 'Name',
-        enterName: 'Name',
-        logo: 'Logo',
-        enterLogo: 'Url of logo',
-        location: 'Region',
-        enterLocation: 'Region of node',
-        ip: 'IP',
-        enterIp: 'Ip of node',
-        description: 'Description',
-        enterDesc: 'Description of node',
-        website: 'Website',
-        enterWebsite: 'Website of node',
-        telegram: 'Telegram',
-        enterTelegram: 'Telegram of node',
-        twitter: 'Twitter',
-        enterTwitter: 'Twitter',
-        facebook: 'Facebook',
-        enterFacebook: 'Facebook',
-        contactOntologyEmail: 'Email to contact with Ontology',
-        enterContactEmail: 'Email to contact with Ontology',
-        openEmail: 'Open email',
-        enterOpenEmail: 'Open email',
-        ifOpenInfo: 'Switch to open info',
-        submit: 'Submit',
-        updateSuccess: 'Update node info succeed',
-        updateFailed: 'Update node info failed',
-        ledgerWalletNotSupportForNow: 'Nodes registered with ledger currently do not support updating node-related information. Please email to: '
-    },
+    noClaimbleToRefund: 'No redeemable ONT to refund.',
+    newNodeApply: 'New Node Apply',
+    nodeApplyTip: ''
+  },
+  vote: {
+    node: 'Node',
+    vote: 'Vote',
+    voteTip: "For authorized users, vote here",
+    login: 'Sign in',
+    notSeeWallet: "Didn't see your wallet? Import one ",
+    importHere: 'here',
+    notStart: 'Not started',
+    inProgress: 'In Progress',
+    finished: 'Finished',
+    canceled: 'Canceled',
+    nodeCanVoteOnly: '*Only users from consensus nodes are allowed to vote.',
+    title: 'Title',
+    detail: 'Detail',
+    votingStarts: 'Vote start time',
+    votingEnds: 'Vote end time',
+    back: 'Back',
+    submit: 'Submit',
+    submitVoteSuccess: 'Vote succeeded',
+    submitVoteFail: 'Vote failed',
+    stopVoteSuccess: 'Vote cancelled',
+    stopVoteFail: 'Vote cancellation failed',
+    createVoteSuccess: 'Vote created',
+    createVoteFail: 'Vote creation failed',
+    onlySupportEnglish: 'Only English is allowed',
+    fillBlanks: 'Please fill in the blanks.',
+    endTimeError: "The vote must end in a future time.",
+    votingTopics: 'Voting Topics',
+    votingDetail: 'Voting Detail',
+    stopVote: 'Cancel Voting',
+    info: 'Info',
+    startTime: 'Starting time',
+    endTime: 'Ending time',
+    hash: 'Hash',
+    creatorAddress: 'Creator address',
+    votingStatus: 'Vote status',
+    myVotes: 'My vote(s)',
+    approval: 'Approved',
+    opposition: 'Denied',
+    allVotes: 'All votes',
+    created: 'Created by me',
+    duration: 'Duration',
+    notAllowVote: 'You cannot vote now, the vote is: ',
+    notAllowStop: 'You cannot stop the vote now, the vote is : ',
+    name: 'Name',
+    address: 'Address',
+    votes: 'Number of votes',
+    selectWallet: 'Select node operation wallet',
+    startTimeError: 'Start time cannot be later than end time.',
+    new: 'New'
+  },
+  nodeApply: {
+    newNodeApply: 'New node apply',
+    stakeWallet: 'Stake wallet',
+    operationWallet: 'Node operation wallet',
+    selectOperationWallet: 'Select operation wallet',
+    operationPk: 'Operation wallet public key',
+    enterOperationPk: 'Enter operation wallet public key',
+    invalidOperationPk: 'Invalid operation wallet',
+    stakeAmount: 'Stake amount',
+    inputStakeAmount: 'Enter stake amount',
+    next: 'Next',
+    ok: 'OK',
+    cancel: 'Cancel',
+    operationWalletPublickey: 'Node operation wallet publickey',
+    registerSuccess: 'Congratulations on the successful node registration',
+    completeNodeInfo: 'Complete node info now',
+    later: 'Later',
+    sameWalletNotAllowed: 'The operation wallet and staking wallet can not be the same',
+    operationWalletRequired: 'Operation wallet is required',
+    stakeWalletRequired: 'Stake wallet is required',
+    stakeAmountRequired: 'Stake amount is required',
+    minStateAmount: 'The stake amount is at least 10,000 ONT',
+    proxyServiceTip: 'The Ontology community now provides node operation by proxy service.',
+    proxyServiceLink: 'Click here to find out more.'
+  },
+  myNode: {
+    myNode: 'My nodes',
+    stakeWalletAddress: 'Stake wallet address',
+    operationWalletPk: 'Operation wallet public key',
+    manage: 'Manage',
+    applyNode: 'Apply new node'
+  },
+  nodeInfo: {
+    nodeInfo: 'Node info',
+    name: 'Name',
+    enterName: 'Name',
+    logo: 'Logo',
+    enterLogo: 'Url of logo',
+    location: 'Region',
+    enterLocation: 'Region of node',
+    ip: 'IP',
+    enterIp: 'Ip of node',
+    description: 'Description',
+    enterDesc: 'Description of node',
+    website: 'Website',
+    enterWebsite: 'Website of node',
+    telegram: 'Telegram',
+    enterTelegram: 'Telegram of node',
+    twitter: 'Twitter',
+    enterTwitter: 'Twitter',
+    facebook: 'Facebook',
+    enterFacebook: 'Facebook',
+    contactOntologyEmail: 'Email to contact with Ontology',
+    enterContactEmail: 'Email to contact with Ontology',
+    openEmail: 'Open email',
+    enterOpenEmail: 'Open email',
+    ifOpenInfo: 'Switch to open info',
+    submit: 'Submit',
+    updateSuccess: 'Update node info succeed',
+    updateFailed: 'Update node info failed',
+    ledgerWalletNotSupportForNow: 'Nodes registered with ledger currently do not support updating node-related information. Please email to: '
+  },
   exchange: {
     exchange: 'Exchange',
     changelly: 'Changelly',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 59b6808..dc42dfd 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -537,6 +537,7 @@ export default {
     normalUser: '您是普通用户，从这里可以参加授权质押',
     stakeAuthorizaton: '节点授权质押',
     nodeStake: '节点质押',
+    userStake: '用户质押',
     userStakeAuthorization: '用户授权质押',
     newStake: '提交新的节点质押',
     allowStakes: '允许其他用户授权质押',
@@ -545,7 +546,7 @@ export default {
     yourStakeAmount: '您的节点质押数额',
     stakeLimit: '节点质押数额上限',
     userNumber: '当前参与授权质押的用户数量',
-    userStake: '当前用户授权质押数额',
+    userStakeAmount: '当前用户授权质押数额',
     rewardsPerMonth: '预计每月收益总额',
     rewardsTip: '预计每月收益总额包括节点的和参与授权质押用户的收益总额',
     rewardProportion: '节点收益分配比例: ',
@@ -629,122 +630,122 @@ export default {
     redeemInitPosOk: '确认提取',
     hasClaimableInitPos: '您还有可提取的初始质押。请先提取该部分ONT。',
     noClaimbleToRefund: '没有可提取的ONT。无法提款。',
-      newNodeApply: '注册新节点',
-      nodeApplyTip: '注册成为本体的节点'
-    },
-    vote: {
-        node: 'Node',
-        vote: '治理投票',
-        voteTip: "如果您是已授权的用户，从这里可以参与Ontology的治理投票",
-        login: '登录',
-        notSeeWallet: '没有看到您的钱包？导入一个。',
-        importHere: '由此导入',
-        notStart: '未开始',
-        inProgress: '进行中',
-        finished: '已结束',
-        canceled: '已取消',
-        nodeCanVoteOnly: '当前仅北斗共识节点用户可以参与投票',
-        title: '标题',
-        detail: '内容',
-        votingStarts: '投票开始时间',
-        votingEnds: '投票结束时间',
-        back: '返回',
-        submit: '提交',
-        submitVoteSuccess: '投票成功!',
-        submitVoteFail: '投票失败!',
-        stopVoteSuccess: '取消投票成功!',
-        stopVoteFail: '取消投票失败!',
-        createVoteSuccess: '创建投票成功!',
-        createVoteFail: '创建投票失败!',
-        onlySupportEnglish: '目前仅支持输入英文内容',
-        fillBlanks: '请填写空白',
-        endTimeError: "投票结束时间必须是将来时间",
-        votingTopics: '投票主题',
-        votingDetail: '投票内容',
-        stopVote: '停止投票',
-        info: '信息',
-        startTime: '开始时间',
-        endTime: '结束时间',
-        hash: 'Hash',
-        creatorAddress: '创建者地址',
-        votingStatus: '投票状态',
-        myVotes: '我的投票',
-        approval: '赞成',
-        opposition: '反对',
-        allVotes: '所有投票',
-        created: '我创建的',
-        duration: '持续时间',
-        notAllowVote: '您现在不能投票。该项投票现在是: ',
-        notAllowStop: '您现在不能结束投票。该项投票现在是: ',
-        name: '名称',
-        address: '地址',
-        votes: '投票数',
-        selectWallet: '请选择节点运营钱包',
-        startTimeError: '投票开始时间不能晚于结束时间',
-        new: '新建'
-    },
-    nodeApply: {
-        newNodeApply: '注册新节点',
-        stakeWallet: '节点质押钱包',
-        operationWallet: '节点运营钱包',
-        selectOperationWallet: '选择运营钱包',
-        operationPk: '运营钱包公钥',
-        enterOperationPk: '输入运营钱包公钥',
-        invalidOperationPk: '错误的运营钱包',
-        stakeAmount: '质押金额',
-        inputStakeAmount: '输入质押金额',
-        next: '下一步',
-        ok: '确认',
-        cancel: '取消',
-        operationWalletPublickey: '运营钱包公钥',
-        registerSuccess: '恭喜注册节点成功',
-        completeNodeInfo: '立刻完善节点信息',
-        later: '稍后再说',
-        sameWalletNotAllowed: '运营钱包和质押钱包不能是同一个钱包',
-        operationWalletRequired: '运营钱包是必需的',
-        stakeWalletRequired: '质押钱包是必需的',
-        stakeAmountRequired: '质押金额是必需的',
-        minStateAmount: '质押金额至少是10,000 ONT',
-        proxyServiceTip: '本体社区提供了节点代运营服务。',
-        proxyServiceLink: '点击这里查看详情。'
-    },
-    myNode: {
-        myNode: '我的节点',
-        stakeWalletAddress: '质押钱包地址',
-        operationWalletPk: '运营钱包公钥',
-        manage: '管理',
-        applyNode: '注册新节点'
-    },
-    nodeInfo: {
-        nodeInfo: '节点信息',
-        name: '名称',
-        enterName: '节点名称',
-        logo: 'Logo',
-        enterLogo: 'Logo链接',
-        location: '地区',
-        enterLocation: '节点所在地区',
-        ip: 'IP',
-        enterIp: '节点的IP',
-        description: '描述',
-        enterDesc: '节点的描述',
-        website: '网站',
-        enterWebsite: '节点网站',
-        telegram: 'Telegram',
-        enterTelegram: '节点的Telegram',
-        twitter: 'Twitter',
-        enterTwitter: '节点的Twitter',
-        facebook: 'Facebook',
-        enterFacebook: '节点的Facebook',
-        contactOntologyEmail: '联系Ontology的邮箱',
-        enterContactEmail: '联系邮箱',
-        openEmail: '公开的邮箱',
-        enterOpenEmail: '公开的邮箱',
-        ifOpenInfo: '是否公开节点信息',
-        submit: '提交',
-        updateSuccess: '更新成功',
-        updateFailed: '更新失败',
-        ledgerWalletNotSupportForNow: '使用Ledger注册的节点，暂时不支持更新节点相关信息.请发送邮件至：'
-    },
+    newNodeApply: '注册新节点',
+    nodeApplyTip: '注册成为本体的节点',
+  },
+  vote: {
+    node: 'Node',
+    vote: '治理投票',
+    voteTip: "如果您是已授权的用户，从这里可以参与Ontology的治理投票",
+    login: '登录',
+    notSeeWallet: '没有看到您的钱包？导入一个。',
+    importHere: '由此导入',
+    notStart: '未开始',
+    inProgress: '进行中',
+    finished: '已结束',
+    canceled: '已取消',
+    nodeCanVoteOnly: '当前仅北斗共识节点用户可以参与投票',
+    title: '标题',
+    detail: '内容',
+    votingStarts: '投票开始时间',
+    votingEnds: '投票结束时间',
+    back: '返回',
+    submit: '提交',
+    submitVoteSuccess: '投票成功!',
+    submitVoteFail: '投票失败!',
+    stopVoteSuccess: '取消投票成功!',
+    stopVoteFail: '取消投票失败!',
+    createVoteSuccess: '创建投票成功!',
+    createVoteFail: '创建投票失败!',
+    onlySupportEnglish: '目前仅支持输入英文内容',
+    fillBlanks: '请填写空白',
+    endTimeError: "投票结束时间必须是将来时间",
+    votingTopics: '投票主题',
+    votingDetail: '投票内容',
+    stopVote: '停止投票',
+    info: '信息',
+    startTime: '开始时间',
+    endTime: '结束时间',
+    hash: 'Hash',
+    creatorAddress: '创建者地址',
+    votingStatus: '投票状态',
+    myVotes: '我的投票',
+    approval: '赞成',
+    opposition: '反对',
+    allVotes: '所有投票',
+    created: '我创建的',
+    duration: '持续时间',
+    notAllowVote: '您现在不能投票。该项投票现在是: ',
+    notAllowStop: '您现在不能结束投票。该项投票现在是: ',
+    name: '名称',
+    address: '地址',
+    votes: '投票数',
+    selectWallet: '请选择节点运营钱包',
+    startTimeError: '投票开始时间不能晚于结束时间',
+    new: '新建'
+  },
+  nodeApply: {
+    newNodeApply: '注册新节点',
+    stakeWallet: '节点质押钱包',
+    operationWallet: '节点运营钱包',
+    selectOperationWallet: '选择运营钱包',
+    operationPk: '运营钱包公钥',
+    enterOperationPk: '输入运营钱包公钥',
+    invalidOperationPk: '错误的运营钱包',
+    stakeAmount: '质押金额',
+    inputStakeAmount: '输入质押金额',
+    next: '下一步',
+    ok: '确认',
+    cancel: '取消',
+    operationWalletPublickey: '运营钱包公钥',
+    registerSuccess: '恭喜注册节点成功',
+    completeNodeInfo: '立刻完善节点信息',
+    later: '稍后再说',
+    sameWalletNotAllowed: '运营钱包和质押钱包不能是同一个钱包',
+    operationWalletRequired: '运营钱包是必需的',
+    stakeWalletRequired: '质押钱包是必需的',
+    stakeAmountRequired: '质押金额是必需的',
+    minStateAmount: '质押金额至少是10,000 ONT',
+    proxyServiceTip: '本体社区提供了节点代运营服务。',
+    proxyServiceLink: '点击这里查看详情。'
+  },
+  myNode: {
+    myNode: '我的节点',
+    stakeWalletAddress: '质押钱包地址',
+    operationWalletPk: '运营钱包公钥',
+    manage: '管理',
+    applyNode: '注册新节点'
+  },
+  nodeInfo: {
+    nodeInfo: '节点信息',
+    name: '名称',
+    enterName: '节点名称',
+    logo: 'Logo',
+    enterLogo: 'Logo链接',
+    location: '地区',
+    enterLocation: '节点所在地区',
+    ip: 'IP',
+    enterIp: '节点的IP',
+    description: '描述',
+    enterDesc: '节点的描述',
+    website: '网站',
+    enterWebsite: '节点网站',
+    telegram: 'Telegram',
+    enterTelegram: '节点的Telegram',
+    twitter: 'Twitter',
+    enterTwitter: '节点的Twitter',
+    facebook: 'Facebook',
+    enterFacebook: '节点的Facebook',
+    contactOntologyEmail: '联系Ontology的邮箱',
+    enterContactEmail: '联系邮箱',
+    openEmail: '公开的邮箱',
+    enterOpenEmail: '公开的邮箱',
+    ifOpenInfo: '是否公开节点信息',
+    submit: '提交',
+    updateSuccess: '更新成功',
+    updateFailed: '更新失败',
+    ledgerWalletNotSupportForNow: '使用Ledger注册的节点，暂时不支持更新节点相关信息.请发送邮件至：'
+  },
   exchange: {
     exchange: 'Exchange',
     changelly: 'Changelly',
diff --git a/src/store/modules/NodeAuthorization.js b/src/store/modules/NodeAuthorization.js
index 97ef772..02b6e1b 100644
--- a/src/store/modules/NodeAuthorization.js
+++ b/src/store/modules/NodeAuthorization.js
@@ -107,7 +107,10 @@ const state = {
         maxAuthorizeStr: '0',
         t2PeerCost: 0,
         t1PeerCost: 0,
-        tPeerCost: 0
+        tPeerCost: 0,
+        t2StakeCost: 0,
+        t1StakeCost: 0,
+        tStakeCost: 0,
     },
     current_node: '',
     authorizationInfo:'',
@@ -144,7 +147,10 @@ const mutations = {
             maxAuthorizeStr: numeral(payload.peerAttrs.maxAuthorize).format('0,0'),
             t2PeerCost: payload.peerAttrs.t2PeerCost,
             t1PeerCost: payload.peerAttrs.t1PeerCost,
-            tPeerCost: payload.peerAttrs.tPeerCost
+            tPeerCost: payload.peerAttrs.tPeerCost,
+            t2StakeCost: payload.peerAttrs.t2StakeCost,
+            t1StakeCost: payload.peerAttrs.t1StakeCost,
+            tStakeCost: payload.peerAttrs.tStakeCost
         }
     },
     UPDATE_CURRENT_NODE(state, payload) {
diff --git a/yarn.lock b/yarn.lock
index aec2acd..c55fe6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7185,10 +7185,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-ontology-ts-sdk@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.9.tgz#c15302effa0bc561f792068a8ebd38532ef0b9e5"
-  integrity sha512-BgDJ99S8pMRx5yKNvyINGQXfSOOjSIvEwPdpF9ECYkEYQlWy3Z0z22Ios9ufX1uSTar8sNg2feleeR5GXe2fSQ==
+ontology-ts-sdk@^1.1.10-alpha.1:
+  version "1.1.10-alpha.1"
+  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.10-alpha.1.tgz#3b3b6e7df515f8305ba428ec5654b7c06d8191e3"
+  integrity sha512-e/m3OTeEwLoQ7iAAx3NPHF4UxjoGlaQQ0vlaMzeJeAZdG8pX+iEZuz+jtM+1JcqMD0jzdOnpFJoAAqIolbsIsw==
   dependencies:
     "@ont-community/html5-websocket" "^2.0.2"
     "@ont-dev/hdkey-secp256r1" "^1.1.2"

From 2dfdb07c5b37b928e645d182709e6eea8dc353cf Mon Sep 17 00:00:00 2001
From: liuqiang <liuqiang1357@163.com>
Date: Thu, 20 Aug 2020 19:31:46 +0800
Subject: [PATCH 2/5] update dependency

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 51ca39a..aeeae1d 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "nedb": "^1.8.0",
     "node-hid": "^1.3.0",
     "numeral": "^2.0.6",
-    "ontology-ts-sdk": "^1.1.10-alpha.1",
+    "ontology-ts-sdk": "^1.1.12",
     "opn": "^5.4.0",
     "popper.js": "^1.14.3",
     "usb": "^1.6.3",
diff --git a/yarn.lock b/yarn.lock
index c55fe6b..f7fb169 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7185,10 +7185,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-ontology-ts-sdk@^1.1.10-alpha.1:
-  version "1.1.10-alpha.1"
-  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.10-alpha.1.tgz#3b3b6e7df515f8305ba428ec5654b7c06d8191e3"
-  integrity sha512-e/m3OTeEwLoQ7iAAx3NPHF4UxjoGlaQQ0vlaMzeJeAZdG8pX+iEZuz+jtM+1JcqMD0jzdOnpFJoAAqIolbsIsw==
+ontology-ts-sdk@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.12.tgz#42cc6d790daacf615db175c26fc2bb5b819766b6"
+  integrity sha512-qhaUXGnD90q/58i4+xGJp9B73T0+23JQcPrVfoPNF3tH4snQSCtGc3CvJkOIv/4APFJSSQSlLvgMVY3UI2fypQ==
   dependencies:
     "@ont-community/html5-websocket" "^2.0.2"
     "@ont-dev/hdkey-secp256r1" "^1.1.2"

From 254cc811eeaaaf99d48f148cbfbc44408b5854cc Mon Sep 17 00:00:00 2001
From: liuqiang <liuqiang1357@163.com>
Date: Fri, 28 Aug 2020 10:59:31 +0800
Subject: [PATCH 3/5] refine rewards proportion tip

---
 package.json                                              | 2 +-
 .../Node/NodeManagement/NodeStakeAuthorization.vue        | 6 +++++-
 src/lang/en.js                                            | 3 ++-
 src/lang/zh.js                                            | 3 ++-
 yarn.lock                                                 | 8 ++++----
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index aeeae1d..088ade4 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "nedb": "^1.8.0",
     "node-hid": "^1.3.0",
     "numeral": "^2.0.6",
-    "ontology-ts-sdk": "^1.1.12",
+    "ontology-ts-sdk": "^1.1.14-alpha.3",
     "opn": "^5.4.0",
     "popper.js": "^1.14.3",
     "usb": "^1.6.3",
diff --git a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
index e533aba..13524f7 100644
--- a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
+++ b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
@@ -237,7 +237,11 @@
             </div>
             <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
-                <span>{{$t('nodeMgmt.rewardsProportionTip')}}</span>
+                <span>{{$t('nodeMgmt.rewardsProportionTip1')}}</span>
+            </div>
+            <div style="margin-top:5px;">
+                <a-icon type="exclamation-circle-o" />
+                <span>{{$t('nodeMgmt.rewardsProportionTip2')}}</span>
             </div>
             <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
diff --git a/src/lang/en.js b/src/lang/en.js
index 42bd568..a566666 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -553,7 +553,8 @@ export default {
     rewardsTip: 'Estimate total rewards per month includes your rewards and the rewards of other uesrs staking.',
     rewardProportion: 'Reward proportion for yourself: ',
     current: 'current',
-    rewardsProportionTip: '0% indicates the node will share all transaction fees rewards to stake authorized users.',
+    rewardsProportionTip1: '0% (nodes) indicates that the node will share all transaction fees and released ONG with users who have authorized stake.',
+    rewardsProportionTip2: '0% (users) indicates that the node will share all transaction fees and released ONG with users who have authorized stake.',
     confirm: 'Confirm',
     changesTakeEffect: ' Changes will take effect in two consensus rounds (each round is approximately every 30 days). ',
     stakeAuthorization: 'Stake Authorization',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index dc42dfd..d22d648 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -551,7 +551,8 @@ export default {
     rewardsTip: '预计每月收益总额包括节点的和参与授权质押用户的收益总额',
     rewardProportion: '节点收益分配比例: ',
     current: '当前',
-    rewardsProportionTip: '0%表示节点分享全部交易手续费收益给参与授权质押的用户。',
+    rewardsProportionTip1: '节点质押0%表示节点分享节点质押部分的全部交易手续费和解绑ONG收益给参与授权质押的用户。',
+    rewardsProportionTip2: '节点质押0%表示节点分享节点质押部分的全部交易手续费和解绑ONG收益给参与授权质押的用户。',
     confirm: '确认',
     changesTakeEffect: '更改需在经过两轮共识周期后生效(每轮周期大约30天)。',
     stakeAuthorization: '授权质押',
diff --git a/yarn.lock b/yarn.lock
index f7fb169..da0c3b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7185,10 +7185,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-ontology-ts-sdk@^1.1.12:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.12.tgz#42cc6d790daacf615db175c26fc2bb5b819766b6"
-  integrity sha512-qhaUXGnD90q/58i4+xGJp9B73T0+23JQcPrVfoPNF3tH4snQSCtGc3CvJkOIv/4APFJSSQSlLvgMVY3UI2fypQ==
+ontology-ts-sdk@^1.1.14-alpha.3:
+  version "1.1.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/ontology-ts-sdk/-/ontology-ts-sdk-1.1.14-alpha.3.tgz#aecf572292f19e94ecbd91cf5690f089a1e1ec07"
+  integrity sha512-Go+N8e5EDfYwhA89PSZ0BhaXYkQB2YGtI9HsDkUlgBVJZLiB4Dvq6jLawIFUPaISjT/JFDbpof6X/VaWyFM91Q==
   dependencies:
     "@ont-community/html5-websocket" "^2.0.2"
     "@ont-dev/hdkey-secp256r1" "^1.1.2"

From fafd8896b618a7713fc2d6c5b040db590db3aaa1 Mon Sep 17 00:00:00 2001
From: liuqiang <liuqiang1357@163.com>
Date: Sat, 29 Aug 2020 11:03:51 +0800
Subject: [PATCH 4/5] update node stake reward ui text, add user proportion
 field in node list page

---
 src/components/Node/NodeAuthorize/NodeList.vue    |  8 +++++---
 .../NodeManagement/NodeStakeAuthorization.vue     | 12 ++++++------
 src/lang/en.js                                    | 15 ++++++++-------
 src/lang/zh.js                                    | 15 ++++++++-------
 src/store/modules/NodeAuthorization.js            |  1 +
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/Node/NodeAuthorize/NodeList.vue b/src/components/Node/NodeAuthorize/NodeList.vue
index e945fa5..dc54795 100644
--- a/src/components/Node/NodeAuthorize/NodeList.vue
+++ b/src/components/Node/NodeAuthorize/NodeList.vue
@@ -88,6 +88,7 @@
                     <a-icon type="info-circle-o" class="proportion-info-icon" @click="showProportionTip"/>
                 </p>
                 </div>
+            <span slot="nodeProportion" slot-scope="text, record">{{record.nodeProportion}} / {{record.userProportion}}</span>
             <a slot="name" slot-scope="text, record" class="node-name" :class="record.status ===2 ? 'node-consensus' : 'node-candidate' "
                 @click="handleNodeDetail(record)">
 
@@ -129,10 +130,10 @@ export default {
                 scopedSlots: {customRender: 'name'}
             },
             {
-                // title: this.$t('nodeMgmt.nodeProportion'),
                 dataIndex: 'nodeProportion',
                 key: 'nodeProportion',
-                slots: {title: 'nodeProportionTitle'}
+                slots: {title: 'nodeProportionTitle'},
+                scopedSlots: {customRender: 'nodeProportion'}
             },
             {
                 title: this.$t('nodeMgmt.currentStake'),
@@ -228,7 +229,8 @@ export default {
                 content: h('div',{}, [
                 h('p', {
                     style: {
-                        margin:0
+                        margin:0,
+                        whiteSpace: 'pre-line'
                     }
                 },content),
                 h('a', {
diff --git a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
index 13524f7..50e6072 100644
--- a/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
+++ b/src/components/Node/NodeManagement/NodeStakeAuthorization.vue
@@ -176,13 +176,13 @@
         <div class="clearfix">
             <div class="font-medium-black rewardProportionTip">{{$t('nodeMgmt.rewardProportion')}}</div>
             <div class="node-reward-proportion">
-                <p class="font-medium">{{$t('nodeMgmt.nodeStake')}}</p>
+                <p class="font-medium">{{$t('nodeMgmt.nodeRewardProportion')}}</p>
                 <p class="font-medium">{{peer_attrs.tPeerCost}}%  ({{$t('nodeMgmt.activeT')}})</p>
                 <p class="font-medium">{{peer_attrs.t1PeerCost}}%  ({{$t('nodeMgmt.activeT1')}})</p>
                 <p class="font-medium">{{peer_attrs.t2PeerCost}}%  ({{$t('nodeMgmt.activeT2')}})</p>
             </div>
             <div class="node-reward-proportion">
-                <p class="font-medium">{{$t('nodeMgmt.userStake')}}</p>
+                <p class="font-medium">{{$t('nodeMgmt.userRewardProportion')}}</p>
                 <p class="font-medium">{{peer_attrs.tStakeCost}}%  ({{$t('nodeMgmt.activeT')}})</p>
                 <p class="font-medium">{{peer_attrs.t1StakeCost}}%  ({{$t('nodeMgmt.activeT1')}})</p>
                 <p class="font-medium">{{peer_attrs.t2StakeCost}}%  ({{$t('nodeMgmt.activeT2')}})</p>
@@ -217,7 +217,7 @@
             @cancel="handleCancelChangeCost"
             >
             <div class="clearfix">
-              {{$t('nodeMgmt.nodeStake')}}:
+              {{$t('nodeMgmt.nodeRewardProportion')}}:
               <a-input-number
                   :min="0"
                   :max="100"
@@ -226,7 +226,7 @@
                   style="width:60px;"
               /> %
               <span class="h-spacer" />
-              {{$t('nodeMgmt.userStake')}}:
+              {{$t('nodeMgmt.userRewardProportion')}}:
               <a-input-number
                   :min="0"
                   :max="100"
@@ -237,11 +237,11 @@
             </div>
             <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
-                <span>{{$t('nodeMgmt.rewardsProportionTip1')}}</span>
+                <span>{{$t('nodeMgmt.nodeRewardProportionTip')}}</span>
             </div>
             <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
-                <span>{{$t('nodeMgmt.rewardsProportionTip2')}}</span>
+                <span>{{$t('nodeMgmt.userRewardProportionTip')}}</span>
             </div>
             <div style="margin-top:5px;">
                 <a-icon type="exclamation-circle-o" />
diff --git a/src/lang/en.js b/src/lang/en.js
index a566666..3816c98 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -539,7 +539,6 @@ export default {
     normalUser: 'If you are a normal user, you can participate in stake authorization here.',
     stakeAuthorizaton: 'Stake Authorization',
     nodeStake: 'Node Stake',
-    userStake: 'User Stake',
     userStakeAuthorization: 'User Stake Authorization',
     newStake: 'Submit A New Stake',
     allowStakes: 'Allow stakes from other users',
@@ -551,10 +550,12 @@ export default {
     userStakeAmount: 'Current total stake of users',
     rewardsPerMonth: 'Estimate total rewards per month',
     rewardsTip: 'Estimate total rewards per month includes your rewards and the rewards of other uesrs staking.',
-    rewardProportion: 'Reward proportion for yourself: ',
+    rewardProportion: 'Fee Sharing Ratio: ',
+    nodeRewardProportion: 'Fee Sharing Ratio (Node)',
+    userRewardProportion: 'Fee Sharing Ratio (User)',
     current: 'current',
-    rewardsProportionTip1: '0% (nodes) indicates that the node will share all transaction fees and released ONG with users who have authorized stake.',
-    rewardsProportionTip2: '0% (users) indicates that the node will share all transaction fees and released ONG with users who have authorized stake.',
+    nodeRewardProportionTip: 'Fee Sharing Ratio (Node): Node will receive x percentage of the transaction fees and released ONG yield of the total amount of node’s own initial ONT stake (excl. ONT staked by users).',
+    userRewardProportionTip: 'Fee Sharing Ratio (User): Node will receive x percentage of the transaction fees and released ONG yield of the total amount of ONT staked by users (excl. node’s own initial stake).',
     confirm: 'Confirm',
     changesTakeEffect: ' Changes will take effect in two consensus rounds (each round is approximately every 30 days). ',
     stakeAuthorization: 'Stake Authorization',
@@ -600,8 +601,8 @@ export default {
     refresh: 'Refresh',
     totalStakeAmount: 'Total Authorization Amount',
     blocks: 'Blocks',
-    proportionNextRound: "Reward proportion for others",
-    proportionNextRoundTip: 'This is the portion of transaction fees received the node has chosen to share with users who have authorized stakes with them in the next consensus round. Note not all nodes share the Ontology Foundation bonus with users who have authorized stakes with them. Please check the link below for more.',
+    proportionNextRound: "Fee Sharing Ratio (Node/User)",
+    proportionNextRoundTip: 'This is the percentage of the transactions fees and released ONG yield of the total amount of stake yield for node’s own initial stake and the total user’s stake, that the node has chosen to share with their stakers in the next consensus round.\nPlease note that not all nodes share the Ontology Foundation bonus with stakers. Click the below link for more details.',
     authorizationFAQ: 'OWallet Stake Authorization FAQ',
     nodeAndUser: 'Node / User',
     authorizeTip: `If new stake is cancelled it will be cancelled immediately and be shown as redeemable ONT. If authorized ONT from previous consensus rounds is cancelled it will be redeemable only at the beginning of the next consensus round for candidate nodes (or one round later for consensus nodes). If a user has both authorized ONT from this consensus round and a previous consensus round and cancels an ONT amount exceeding the amount from this consensus round, they will receive authorized ONT from this consensus round first and the remaining authorized ONT in the next consensus round.`,
@@ -613,7 +614,7 @@ Within their 50% share each consensus node will receive their share according to
     activeT: 'Active in current round',
     activeT1: 'Active in next round',
     activeT2: 'Active in next 2 round',
-    changeRewardProportion: 'Change Reward Proportion',
+    changeRewardProportion: 'Change Fee Sharing Ratio',
     edit: 'Edit',
     stakeHistory: 'My Stake',
     cancelUnits: 'units',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index d22d648..341e26e 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -537,7 +537,6 @@ export default {
     normalUser: '您是普通用户，从这里可以参加授权质押',
     stakeAuthorizaton: '节点授权质押',
     nodeStake: '节点质押',
-    userStake: '用户质押',
     userStakeAuthorization: '用户授权质押',
     newStake: '提交新的节点质押',
     allowStakes: '允许其他用户授权质押',
@@ -549,10 +548,12 @@ export default {
     userStakeAmount: '当前用户授权质押数额',
     rewardsPerMonth: '预计每月收益总额',
     rewardsTip: '预计每月收益总额包括节点的和参与授权质押用户的收益总额',
-    rewardProportion: '节点收益分配比例: ',
+    rewardProportion: '收益分配比例: ',
+    nodeRewardProportion: '节点质押收益分配比例',
+    userRewardProportion: '用户质押收益分配比例',
     current: '当前',
-    rewardsProportionTip1: '节点质押0%表示节点分享节点质押部分的全部交易手续费和解绑ONG收益给参与授权质押的用户。',
-    rewardsProportionTip2: '节点质押0%表示节点分享节点质押部分的全部交易手续费和解绑ONG收益给参与授权质押的用户。',
+    nodeRewardProportionTip: '节点质押收益分配比例：表示节点获得节点质押部分的ONT收到的交易手续费和解绑ONG收益的百分比。',
+    userRewardProportionTip: '用户质押收益分配比例：表示节点获得用户质押部分的ONT收到的交易手续费和解绑ONG收益的百分比。',
     confirm: '确认',
     changesTakeEffect: '更改需在经过两轮共识周期后生效(每轮周期大约30天)。',
     stakeAuthorization: '授权质押',
@@ -598,8 +599,8 @@ export default {
     refresh: '刷新',
     totalStakeAmount: '授权质押总额',
     blocks: '区块',
-    proportionNextRound: '节点质押收益分配比例',
-    proportionNextRoundTip: '这是节点选择的在下一轮共识中，分享给授权质押用户，其所得交易手续费的比例。请注意，并非所有节点都与授权质押用户分享本体基金会的奖励。点击下面的链接查看更多相关信息。',
+    proportionNextRound: '质押用户收益分配比例（节点/用户）',
+    proportionNextRoundTip: '这是节点选择的在下一轮共识中，分享给授权质押用户的节点自身质押部分ONT和用户质押部分ONT收到的手续费收益和解绑ONG收益的比例。\n请注意，并非所有节点都与授权质押用户分享本体基金会的奖励。点击下面的链接查看更多相关信息。',
     authorizationFAQ: '节点授权质押常见问题解答',
     nodeAndUser: '节点 / 用户',
     authorizeTip: '用户对该节点的授权抵押金额，包括本轮新授权的ONT和已生效的授权ONT，取消授权会优先取消本轮新授权的ONT，取消后进入用户的可提取ONT中。本轮新授权的ONT不足则会取消已生效的授权ONT，按照节点是候选/共识状态分别锁定1轮或2轮，之后进入用户的可提取ONT中。',
@@ -608,7 +609,7 @@ export default {
     activeT: '本轮生效',
     activeT1: '下一轮生效',
     activeT2: '下下轮生效',
-    changeRewardProportion: '修改节点分配比例',
+    changeRewardProportion: '修改收益分配比例',
     edit: '修改',
     stakeHistory: '我的质押',
     cancelUnits: '份',
diff --git a/src/store/modules/NodeAuthorization.js b/src/store/modules/NodeAuthorization.js
index 02b6e1b..8f67e44 100644
--- a/src/store/modules/NodeAuthorization.js
+++ b/src/store/modules/NodeAuthorization.js
@@ -401,6 +401,7 @@ const actions = {
                 const list = result.slice(pageNum * pageSize, (pageNum + 1) * pageSize).map(item => {
                     item.rank = item.node_rank;
                     item.nodeProportion = item.node_proportion;
+                    item.userProportion = item.user_proportion;
                     item.currentStake = numeral(item.current_stake).format('0,0');
                     item.process = item.progress;
                     item.maxAuthorize = item.max_authorize;

From 7d07e1a3651586e91da2e1acf264326eca1607bd Mon Sep 17 00:00:00 2001
From: liuqiang <liuqiang1357@163.com>
Date: Mon, 7 Sep 2020 11:37:05 +0800
Subject: [PATCH 5/5] udpate version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 088ade4..de3275b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "owallet",
   "homepage": "http://ont.io",
-  "version": "v0.9.25",
+  "version": "v0.9.26",
   "author": "Ontology Foundation Ltd. <devops@ont.io>",
   "description": "OWallet is a comprehensive Ontology desktop wallet",
   "license": "Apache-2.0",