hotfix: merge the hotfix branch to main (#1453)

* feat: added ETH rebate banner (#1445)

* feat: added rebate banner

* fix: remove banner

* feat: updated banner

* ACS link (#1447)

* ACS link

* Tooltip fix

* Fix for breaking change in runtime (#1449)

* Move stake implementtion (#1446)

* Logic implemented

* Loosing bonus warning

* EVM move and improved messages

* Min stake check fix

* Amount component bug fix

* Remaining tokens bug fix

* Styling updates

* Min amount check fix

* Min stake move warning

* Enable staking tokens locked in democracy (#1451)

* Locked in democracy to useBalance

* Treat tokens locked in democracy as available for staking

* fix: updated RPC (#1452)

* Temporary disable unstake from unregistered call (#1454)

---------

Co-authored-by: Bobo <[email protected]>

Author: impelcrypto

src/assets/img/banner/banner-eth-rebate.png

@@ -341,7 +341,8 @@ export default defineComponent({
     const store = useStore();
     const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
     const selectedAddress = computed(() => store.getters['general/selectedAddress']);
-    const { balance, accountData, isLoadingBalance } = useBalance(selectedAddress);
+    const { balance, accountData, isLoadingBalance, lockedInDemocracy } =
+      useBalance(selectedAddress);
     const { numEvmDeposit } = useEvmDeposit();
     const { currentNetworkName, nativeTokenSymbol, isSupportAuTransfer } = useNetworkInfo();
     const { faucetBalRequirement } = useFaucet();
@@ -404,7 +405,6 @@ export default defineComponent({
       // Memo: `vesting ` -> there has been inputted 1 space here
       const vesting = accountDataRef.locks.find((it) => u8aToString(it.id) === 'vesting ');
       const dappStake = accountDataRef.locks.find((it) => u8aToString(it.id) === 'dapstake');
-      const democracy = accountDataRef.locks.find((it) => u8aToString(it.id) === 'democrac');
       const reserved = accountDataRef.reserved;
 
       if (vesting) {
@@ -424,8 +424,10 @@ export default defineComponent({
         reservedTtl.value = Number(ethers.utils.formatEther(amount));
       }
 
-      if (democracy) {
-        lockInDemocracy.value = Number(ethers.utils.formatEther(democracy.amount.toString()));
+      if (lockedInDemocracy.value) {
+        lockInDemocracy.value = Number(
+          ethers.utils.formatEther(lockedInDemocracy.value.toString())
+        );
       }
     });
 

src/components/assets/NativeAssetList.vue

@@ -26,11 +26,16 @@
           :load-is-approved="loadIsApproved"
           @update:isApproveMaxAmount="(value: boolean) => (isApproveMaxAmount = value)"
         />
-        <information
-          v-if="rightUi === 'information'"
-          :transfer-type="HistoryTxType.CCIP_BRIDGE"
-          :is-history="false"
-        />
+        <div v-if="rightUi === 'information'">
+          <information :transfer-type="HistoryTxType.CCIP_BRIDGE" :is-history="false" />
+          <div v-if="isGasRebate" class="row--banner">
+            <img
+              class="banner--eth-rebates"
+              src="~assets/img/banner/banner-eth-rebate.png"
+              alt="eth-rebate"
+            />
+          </div>
+        </div>
         <select-chain
           v-if="rightUi === 'select-chain'"
           v-click-away="cancelHighlight"
@@ -59,7 +64,7 @@ import { computed, defineComponent, ref } from 'vue';
 import { useCcipBridge } from '../../../hooks/bridge/useCcipBridge';
 import { wait } from '@astar-network/astar-sdk-core';
 import { reverseObject } from 'src/modules/common';
-import { CcipNetworkName, ccipNetworkParam, CcipNetworkParam } from 'src/modules/ccip-bridge';
+import { CcipNetworkName, ccipNetworkParam } from 'src/modules/ccip-bridge';
 
 type RightUi = 'information' | 'select-chain';
 
@@ -106,6 +111,13 @@ export default defineComponent({
     const { currentAccount } = useAccount();
     const { screenSize, width } = useBreakpoints();
 
+    const isGasRebate = computed<boolean>(() => {
+      return (
+        toChainName.value === CcipNetworkName.Soneium &&
+        fromChainName.value === CcipNetworkName.AstarEvm
+      );
+    });
+
     const handleSetChain = async (chain: CcipNetworkName): Promise<void> => {
       let query = { from: '', to: '' };
       const selectedChain = reverseObject(ccipNetworkParam)[chain];
@@ -189,6 +201,7 @@ export default defineComponent({
       isHighlightRightUi,
       isModalSelectChain,
       loadIsApproved,
+      isGasRebate,
       setRightUi,
       getSelectableChains,
       cancelHighlight,

src/components/bridge/ccip/Ccip.vue

@@ -132,6 +132,9 @@
               })
             }}
           </li>
+          <li v-if="toChainName === CcipNetworkName.Soneium">
+            {{ $t('bridge.rebate') }}
+          </li>
           <li>
             {{ $t('bridge.warningCcipTime', { time: bridgeTime }) }}
           </li>
@@ -368,6 +371,7 @@ export default defineComponent({
       isApproveButtonDisabled,
       isBridgeButtonDisabled,
       isH160,
+      CcipNetworkName,
       truncate,
       bridge,
       approve,

src/components/bridge/ccip/CcipBridge.vue

@@ -34,6 +34,24 @@
   }
 }
 
+.row--banner {
+  margin-top: 16px;
+}
+
+.banner--eth-rebates {
+  width: 348px;
+  border-radius: 6px;
+  @media (min-width: $sm) {
+    width: 412px;
+  }
+  @media (min-width: $md) {
+    width: 320px;
+  }
+  @media (min-width: $xl) {
+    width: 420px;
+  }
+}
+
 .half-opacity {
   opacity: 0.4;
   transition: all 0.3s ease 0s;

src/components/bridge/ccip/styles/ccip.scss

@@ -56,7 +56,7 @@
           }}</a>
         </nav>
         <a class="surge-mobile" :href="surgeUrl" target="_blank">
-          <img :src="require('src/assets/img/surge_token.webp')" alt="Surge" />
+          <img :src="require('src/assets/img/surge_token.webp')" alt="Go to ACS" />
         </a>
 
         <div class="gradient-bg">

src/components/header/mobile/MobileNav.vue

@@ -90,7 +90,7 @@
       </div>
       <div>
         <a class="surge" :href="surgeUrl" target="_blank">
-          <img :src="require('src/assets/img/surge_token.webp')" alt="Surge" />
+          <img :src="require('src/assets/img/surge_token.webp')" alt="Go to ACS" />
         </a>
         <q-tooltip>
           <span class="text--tooltip">{{ $t('joinSurge') }}</span>

src/components/sidenav/SidebarDesktop.vue

@@ -2,7 +2,7 @@ import { ETHEREUM_EXTENSION } from 'src/modules/account';
 import { VoidFn } from '@polkadot/api/types';
 import { BalanceLockTo212 } from '@polkadot/types/interfaces';
 import { PalletBalancesBalanceLock, PalletVestingVestingInfo } from 'src/v2/models';
-import { BN } from '@polkadot/util';
+import { BN, u8aToString } from '@polkadot/util';
 import { $api, $web3 } from 'boot/api';
 import { SystemAccount } from 'src/modules/account';
 import { useStore } from 'src/store';
@@ -167,6 +167,12 @@ export function useBalance(addressRef: Ref<string>) {
   const useableBalance = computed(() => {
     return accountData.value?.getUsableFeeBalance().toString() || '0';
   });
+  const lockedInDemocracy = computed(() => {
+    const lock = accountData.value?.locks.find((it) => u8aToString(it.id) === 'democrac');
+
+    return lock ? lock.amount.toBigInt() : BigInt(0);
+  });
+
   const isLoadingBalance = ref<boolean>(true);
 
   const { balanceRef, accountDataRef, isLoadingAccount } = useCall(addressRef);
@@ -196,7 +202,7 @@ export function useBalance(addressRef: Ref<string>) {
     { immediate: true }
   );
 
-  return { balance, accountData, useableBalance, isLoadingBalance };
+  return { balance, accountData, useableBalance, isLoadingBalance, lockedInDemocracy };
 }
 
 export class AccountData {

src/hooks/useBalance.ts

@@ -44,7 +44,7 @@ export default {
   help: 'Help',
   share: 'Share',
   multisig: 'Multisig',
-  joinSurge: 'Join Astar Surge',
+  joinSurge: 'Go to ACS',
   sort: {
     sortBy: 'Sort by',
     amountHightToLow: 'Amount: High to Low',
@@ -941,6 +941,10 @@ export default {
     unregisteredDappInfo:
       'This project has been unregistered but If you are currently entitled to Bonus you will be entitled to it as well as basic rewards as long as you do not move/unstake the fund during this Period. Unstake if you still want to (it has {days} days unlocking period).',
     voteSuccess: 'You successfully voted on {number} dApp(s). All pending rewards are claimed.',
+    moveSuccess: 'You successfully moved your stake to {number} dApp(s).',
+    looseBonusWarning:
+      'You will partially loose your bonus rewards if you move your stake to more than {number} dApp(s).',
+    looseAllBonusWarning: 'You will loose your bonus rewards if you move your stake.',
     unbondSuccess: 'You successfully unbonded from {dapp}.',
     unbondFromUnregisteredSuccess: 'You successfully unbonded from unregistered dApp {dapp}.',
     claimRewardSuccess: 'You successfully claimed your rewards.',
@@ -959,6 +963,8 @@ export default {
     registerNow: 'Register now',
     willUnstakeAll:
       'The operation will unstake all of your staked tokens because the minimum staking amount is {amount} tokens.',
+    willMoveAll:
+      'The operation will move all of your staked tokens because the minimum staking amount is {amount} tokens.',
     onboarding: {
       introducing: 'Introducing',
       innovativeWayOfStaking: 'Innovative way of staking',
@@ -1011,10 +1017,14 @@ export default {
       addAmounts: 'Please add the amount to each card.',
       review: 'Check everything is ok before confirming.',
       availableAfterStaking: 'Available amount after staking',
+      remainingAmountAfterMoving: 'Remaining amount on origin dApp after moving',
       beSureToVote:
         'Be sure you vote on dapps otherwise those tokens are not eligible for any rewards.',
       yourAvailableBalance: 'Your available balance',
+      availableToMove: 'Available to move',
       moveFunds: 'Move funds',
+      safeMoveInfo:
+        'You can move your stake to up to {number} dApp(s) without loosing your bonus rewards.',
     },
     registration: {
       success: 'You successfully registered dApp {name} to the store.',
@@ -1137,6 +1147,7 @@ export default {
     slippage: 'Slippage: {percent}%',
     feeOnTransaction: 'Transaction fee: {amount} {symbol}',
     feeOnBridge: 'Bridge fee: {amount} {symbol}',
+    rebate: 'You will receive 0.00008 ETH for gas on Soneium',
     gelatoApiError: 'Bridge UI is not available, please try again later',
     warningHighTraffic:
       'High bridge traffic may delay withdrawal transactions up to 5 hours. We appreciate your patience.',

src/i18n/en-US/index.ts

@@ -53,7 +53,7 @@ export const polkadotJsUrl = {
   },
 };
 
-export const surgeUrl = 'https://surge.sakefinance.com/';
+export const surgeUrl = 'https://acs.astar.network/';
 
 export const ccipExplorerUrl = 'https://ccip.chain.link';
 

src/links/index.ts

@@ -37,6 +37,7 @@
           {{ $t('stakingV3.unregisteredDappInfo', { days: constants?.unlockingPeriod ?? '--' }) }}
         </span>
         <astar-button
+          :disabled="true"
           class="btn--unregistered-dapp"
           @click="unstakeFromUnregistered(key, getDappName(key))"
         >

src/staking-v3/components/my-staking/MyDapps.vue

@@ -88,9 +88,9 @@ export default defineComponent({
 }
 
 .note-container {
-  background-color: $white;
   padding: 16px;
   border-radius: 16px;
+  border: 1px solid $navy-1;
 }
 
 .note--title {

src/staking-v3/components/vote/VotingNote.vue

@@ -5,7 +5,11 @@
         {{ title }}
       </div>
       <div class="balance-container">
-        {{ $t('stakingV3.voting.yourAvailableBalance') }}
+        {{
+          isBonusEntitledMove
+            ? $t('stakingV3.voting.availableToMove')
+            : $t('stakingV3.voting.yourAvailableBalance')
+        }}
         <token-balance-native :balance="availableToVoteDisplay.toString()" />
       </div>
     </div>
@@ -27,8 +31,16 @@
           />
         </div>
       </div>
+      <div v-if="isBonusEntitledMove">
+        {{
+          allowedNumberOfMoves == 0
+            ? $t('stakingV3.looseAllBonusWarning')
+            : $t('stakingV3.voting.safeMoveInfo', { number: allowedNumberOfMoves })
+        }}
+      </div>
     </div>
     <wizard-steps
+      v-if="!isMove"
       :steps="wizardSteps"
       :selected-step-index="selectedStepIndex"
       :completed-steps="completedSteps"
@@ -39,7 +51,10 @@
       <choose-dapps-panel
         v-if="selectedStepIndex === Steps.ChooseDapps"
         :on-dapps-selected="handleDappsSelected"
+        :on-dapps-selection-changed="handleDappsSelectionChanged"
         :scroll-to-top="scrollToWizardTop"
+        :move-from-address="moveFromAddress"
+        :error-message="looseBonusWarningMessage"
       />
       <choose-amounts-panel
         v-if="selectedStepIndex === Steps.AddAmount"
@@ -50,6 +65,7 @@
         :on-amounts-entered="handleAmountsEntered"
         :on-remove-dapp="handleRemoveDapp"
         :on-go-back="handleGoBackToDapps"
+        :is-move="isMove"
       />
       <review-panel
         v-if="selectedStepIndex === Steps.Review"
@@ -128,6 +144,7 @@ export default defineComponent({
     const stakesEntered = ref<boolean>(false);
     const isConfirmed = ref<boolean>(false);
     const showRestakeModal = ref<boolean>(false);
+    const isLoosingBonus = ref<boolean>(false);
     const wizard = ref();
     const {
       totalStakeAmount,
@@ -139,7 +156,13 @@ export default defineComponent({
       availableToMoveFrom,
       canVote,
       vote,
+      isBonusEntitledMove,
+      isMove,
+      stakeToMove,
+      isPartiallyLosingBonus,
+      allowedNumberOfMoves,
     } = useVote(selectedDapps, props.moveFromAddress);
+
     const completedSteps = computed<Map<number, boolean>>(
       () =>
         new Map([
@@ -149,6 +172,18 @@ export default defineComponent({
         ])
     );
 
+    const looseBonusWarningMessage = computed<string>(() =>{
+      if (isLoosingBonus.value && allowedNumberOfMoves.value > 0) {
+        return t('stakingV3.looseBonusWarning', { number: allowedNumberOfMoves.value });
+      }
+
+      if (isLoosingBonus.value && allowedNumberOfMoves.value == 0) {
+        return t('stakingV3.looseAllBonusWarning');
+      }
+
+      return '';
+  });
+
     const { totalStakerRewards, stakerInfo } = useDappStaking();
 
     const stakeInfo = computed<StakeInfo>(() => ({
@@ -197,6 +232,10 @@ export default defineComponent({
       scrollToWizardTop();
     };
 
+    const handleDappsSelectionChanged = (_: DappVote[], after: DappVote[]): void => {
+      isLoosingBonus.value = isBonusEntitledMove.value && isPartiallyLosingBonus(after.length);
+    };
+
     const handleAmountsEntered = (): void => {
       selectedComponentIndex.value = Steps.Review;
       stakesEntered.value = true;
@@ -211,7 +250,7 @@ export default defineComponent({
     };
 
     const handleConfirmAndRestake = async (): Promise<void> => {
-      if (totalStakerRewards.value > BigInt(0) && stakerInfo.value.size > 0) {
+      if (totalStakerRewards.value > BigInt(0) && stakerInfo.value.size > 0 && !isMove.value) {
         setShowRestakeModal(true);
       } else {
         await handleConfirm(false);
@@ -281,6 +320,10 @@ export default defineComponent({
       showRestakeModal,
       totalStakerRewards,
       canVote,
+      isBonusEntitledMove,
+      isMove,
+      isLoosingBonus,
+      stakeToMove,
       vote,
       handleStepSelected: handleSelectComponent,
       handleDappsSelected,
@@ -293,6 +336,9 @@ export default defineComponent({
       scrollToWizardTop,
       setShowRestakeModal,
       handleRestakeConfirm,
+      handleDappsSelectionChanged,
+      allowedNumberOfMoves,
+      looseBonusWarningMessage,
     };
   },
 });