diff --git a/src/components/chain/contract/Vester.js b/src/components/chain/contract/Vester.js index e531330..a94f62a 100644 --- a/src/components/chain/contract/Vester.js +++ b/src/components/chain/contract/Vester.js @@ -55,10 +55,11 @@ export class Vester { * @returns */ async claim() { + const userAddress = await this.bc.eoaProvider.getSigner().getAddress() return this.execMethod({ provider: this.bc.eoaProvider, method: 'claim', - params: [] + params: [userAddress] }); } /** @@ -89,10 +90,11 @@ export class Vester { * 查询当前用户可以领取的CEC数量 */ async queryClaimable() { + const userAddress = await this.bc.eoaProvider.getSigner().getAddress() return this.queryMethod({ provider: this.bc.eoaProvider, method: 'claimable', - params: [] + params: [userAddress] }); } /** diff --git a/src/components/staking/header.vue b/src/components/staking/header.vue index 440e539..498fecd 100644 --- a/src/components/staking/header.vue +++ b/src/components/staking/header.vue @@ -36,7 +36,7 @@
CEC disarm
-

{{ cecInfoData.CecDisarm }}

+

{{ priceCalculated(cecInfoData.CecDisarm) }}

  • @@ -47,7 +47,7 @@
    CEC collection
    -

    {{ cecInfoData.CecCollection }}

    +

    {{ priceCalculated(cecInfoData.CecCollection) }}

  • @@ -60,7 +60,7 @@
    esCEC
    -

    {{ cecInfoData.esCecBalance }}

    +

    {{ priceCalculated(cecInfoData.esCecBalance) }}

  • @@ -71,7 +71,7 @@
    esCEC Staking
    -

    {{ cecInfoData.esCecStaked }}

    +

    {{ priceCalculated(cecInfoData.esCecStaked) }}

  • @@ -82,7 +82,7 @@
    esCEC conversion
    -

    {{ cecInfoData.esCecConversion }}

    +

    {{ priceCalculated(cecInfoData.esCecConversion) }}

  • @@ -93,7 +93,7 @@
    esCEC collection
    -

    {{ cecInfoData.esCecCollection }}

    +

    {{ priceCalculated(cecInfoData.esCecCollection) }}

  • @@ -182,8 +182,17 @@ const getCecData = async () => { cecInfoData.value.esCecBalance = BigInt(await bc.erc20.esCecBalanceOf(address)).toString() cecInfoData.value.CecStaked = BigInt(await bc.staking.queryCECStaked()).toString() cecInfoData.value.esCecStaked = BigInt(await bc.staking.queryEsCECStaked()).toString() - // let ClaimableByCEC = await bc.staking.queryCumulativeByCEC() - // let ClaimableByEsCEC = await bc.staking.queryClaimableByEsCEC() + cecInfoData.value.esCecConversion = BigInt(await bc.vester.queryVested()).toString() + // 锁定的cec 等于 转换中的esCec数量 + cecInfoData.value.CecDisarm = cecInfoData.value.esCecConversion; + try { + cecInfoData.value.CecCollection = await bc.vester.queryClaimable() + const stakeCecCollection = await bc.staking.queryClaimableByCEC() + const stakeEsCecCollection = await bc.staking.queryClaimableByEsCEC() + cecInfoData.value.esCecCollection = (BigInt(stakeCecCollection) + BigInt(stakeEsCecCollection)).toString() + } catch (e) { + console.log('query claimable error', e) + } clearInterval(timer); }, 2000); // let cec = await bc.staking.queryCECStaked()