Merge pull request #3683 from balancer/hotfix/manual-blocks

Use JSON RPC provider for initial block number (DM)

README.md

@@ -2,7 +2,7 @@
 
 Official frontend app for the Balancer protocol (v2)
 
-![Alt](https://repobeats.axiom.co/api/embed/9a2f4fbb502d735b6b8ec648723e686ae82f1fad.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/9a2f4fbb502d735b6b8ec648723e686ae82f1fad.svg 'Repobeats analytics image')
 
 ## Development
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balancer/frontend-v2",
-  "version": "1.112.0",
+  "version": "1.112.3",
   "engines": {
     "node": "=16",
     "npm": ">=8"

src/components/pool/PoolPageHeader.vue

@@ -6,7 +6,7 @@ import GauntletIcon from '@/components/images/icons/GauntletIcon.vue';
 import APRTooltip from '@/components/tooltips/APRTooltip/APRTooltip.vue';
 import useNumbers from '@/composables/useNumbers';
 import { usePoolWarning } from '@/composables/usePoolWarning';
-import { usePoolHelpers } from '@/composables/usePoolHelpers';
+import { isFx, usePoolHelpers } from '@/composables/usePoolHelpers';
 import { useTokens } from '@/providers/tokens.provider';
 import { EXTERNAL_LINKS } from '@/constants/links';
 import { POOLS } from '@/constants/pools';
@@ -244,7 +244,7 @@ function symbolFor(titleTokenIndex: number): string {
     block
   />
   <BalAlert
-    v-if="hasNonPrefGaugeBalance && !isAffected"
+    v-if="hasNonPrefGaugeBalance && !isAffected && !isFx(pool.poolType)"
     :title="$t('staking.restakeGauge')"
     :type="'warning'"
     class="mt-2"

src/lib/config/polygon/pools.ts

@@ -120,6 +120,7 @@ const pools: Pools = {
       '0xb49bd41ed56340674e2d2d3cfbfa9807e4e1fe27000100000000000000000bc2', // 25SUSHI-25WETH-25AAVE-25agEUR
       '0xca0f8eb1b81e1a69fac97f1c898e0938c768eb20000200000000000000000bc1', // 30WBTC-702BRL (BRZ)
       '0x2e1fd968a7185f52cfb933e51b5bb7f8f43e6105000100000000000000000bc5', // 10WBTC-10USDC-40WETH-40NEX
+      '0x3c2f277eedac899f67116ad598664f0f91bac210000100000000000000000bcd', // 20AGA-20RNDR-20MANA-20DIMO-20AGAr
     ],
   },
   Factories: {

src/services/rpc-provider/rpc-provider.service.spec.ts

@@ -1,14 +1,11 @@
-import { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from '@ethersproject/providers';
 
 import RpcProviderService from '@/services/rpc-provider/rpc-provider.service';
 import { StaticJsonRpcBatchProvider } from './static-json-rpc-batch-provider';
 
 vi.mock('@ethersproject/providers', () => {
   return {
     JsonRpcProvider: vi.fn().mockImplementation(() => {
-      return {};
-    }),
-    WebSocketProvider: vi.fn().mockImplementation(() => {
       return {
         once: vi.fn(),
       };
@@ -30,12 +27,10 @@ describe('RPC provider service', () => {
     StaticJsonRpcBatchProvider,
     true
   );
-  const MockedWebSocketProvider = vi.mocked(WebSocketProvider, true);
 
   beforeEach(() => {
     MockedJsonRpcProvider.mockClear();
     MockedStaticJsonRpcBatchProvider.mockClear();
-    MockedWebSocketProvider.mockClear();
   });
 
   it('Instantiates the provider service', () => {
@@ -50,6 +45,6 @@ describe('RPC provider service', () => {
 
   it('Calls the WebSocketProvider', () => {
     new RpcProviderService().initBlockListener(() => ({}));
-    expect(WebSocketProvider).toHaveBeenCalledTimes(1);
+    expect(MockedJsonRpcProvider).toHaveBeenCalledTimes(1);
   });
 });

src/services/rpc-provider/rpc-provider.service.ts

@@ -1,5 +1,5 @@
 import { Network } from '@/lib/config';
-import { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from '@ethersproject/providers';
 
 import { configService } from '@/services/config/config.service';
 
@@ -15,8 +15,8 @@ export default class RpcProviderService {
   ) {}
 
   public initBlockListener(newBlockHandler: NewBlockHandler): void {
-    const wsProvider = new WebSocketProvider(this.config.ws);
-    wsProvider.once('block', newBlockNumber => {
+    const blockProvider = new JsonRpcProvider(this.config.rpc);
+    blockProvider.once('block', newBlockNumber => {
       let currentBlockNumber = newBlockNumber;
       newBlockHandler(currentBlockNumber);
       setInterval(() => {