Merge pull request #2421 from balancer/v3-canary

publish to prod

Author: franzns

CHANGELOG.md

@@ -1,5 +1,14 @@
 # backend
 
+## 1.56.1
+
+### Patch Changes
+
+-   2a2ea8a: SOR - Fix unwrapRates scaling
+-   4c84676: move pricing query to graphql
+-   f9a6468: pricing query cleanup
+-   36aa8c9: add xlayer support
+
 ## 1.56.0
 
 ### Minor Changes

apps/api/gql/generated-schema-ast.ts

@@ -115,6 +115,7 @@ export const schema = gql`
         POLYGON
         SEPOLIA
         SONIC
+        XLAYER
         ZKEVM
     }
 

apps/api/gql/generated-schema.ts

@@ -109,6 +109,7 @@ export type GqlChain =
     | 'POLYGON'
     | 'SEPOLIA'
     | 'SONIC'
+    | 'XLAYER'
     | 'ZKEVM';
 
 export interface GqlFeaturePoolGroupItemExternalLink {

apps/api/gql/schema/__mocks__/types.ts

@@ -100,6 +100,7 @@ export enum GqlChain {
     POLYGON = 'POLYGON',
     SEPOLIA = 'SEPOLIA',
     SONIC = 'SONIC',
+    XLAYER = 'XLAYER',
     ZKEVM = 'ZKEVM',
 }
 

apps/api/gql/schema/base.gql

@@ -17,4 +17,5 @@ enum GqlChain {
     FRAXTAL
     MODE
     SONIC
+    XLAYER
 }

apps/api/rest-routes.ts

@@ -4,13 +4,6 @@ import {
     beetsGetCirculatingSupplySonic,
     beetsGetTotalSupplySonic,
 } from '../../modules/beets/lib/beets';
-import { latestTokenPrice } from '../../modules/token/latest-token-price';
-import config from '../../config';
-import { Chain } from '@prisma/client';
-import * as crypto from 'crypto';
-
-const isHexAddress = (addr: any) =>
-    typeof addr === 'string' && addr.length === 42 && addr.startsWith('0x') && /^[0-9a-f]{40}$/i.test(addr.slice(2));
 
 export function loadRestRoutes(app: Express) {
     app.use('/health', (_, res) => res.sendStatus(200));
@@ -29,48 +22,4 @@ export function loadRestRoutes(app: Express) {
             res.send(result);
         });
     });
-
-    app.get('/price', async (req, res) => {
-        res.type('application/json');
-
-        const chain = req.query.chain;
-        const tokens = req.query.tokens && (req.query.tokens as string).split(',');
-
-        // Validate params
-        if (typeof chain !== 'string' || !(chain in config)) {
-            res.status(400).end();
-            return;
-        }
-
-        if (!Array.isArray(tokens) || tokens.length === 0 || !tokens.every(isHexAddress) || tokens.length > 8) {
-            res.status(400).end();
-            return;
-        }
-
-        const prices = await latestTokenPrice(chain as Chain, tokens as string[]);
-
-        // Build response body
-        const responseBody = { prices };
-        const bodyString = JSON.stringify(responseBody);
-
-        // Generate strong ETag: MD5 hash of the body (fast for small JSON)
-        const etag = crypto.createHash('md5').update(bodyString).digest('hex');
-
-        // Set ETag header
-        res.set('ETag', `"${etag}"`);
-
-        // Check for conditional request
-        const clientEtag = req.get('If-None-Match');
-        if (clientEtag === `"${etag}"` || clientEtag === etag) {
-            // Handle quoted/unquoted client headers
-            res.status(304).end(); // Not modified: No body needed
-            return;
-        }
-
-        // Set caching headers (unchanged)
-        res.set('Cache-Control', 'public, max-age=600, s-maxage=600, stale-while-revalidate=30, stale-if-error=86400');
-
-        // Send full response
-        res.send(responseBody);
-    });
 }

bun.lockb

@@ -14,6 +14,7 @@ import modeConfig from './mode';
 import sonicConfig from './sonic';
 import hyperevmConfig from './hyperevm';
 import plasmaNetworkConfig from './plasma';
+import xlayerNetworkConfig from './xlayer';
 
 export const DAYS_OF_HOURLY_PRICES = 100;
 export const BALANCES_SYNC_BLOCKS_MARGIN = 200;
@@ -34,4 +35,5 @@ export default {
     [Chain.SONIC]: sonicConfig,
     [Chain.HYPEREVM]: hyperevmConfig,
     [Chain.PLASMA]: plasmaNetworkConfig,
+    [Chain.XLAYER]: xlayerNetworkConfig,
 };

config/index.ts

@@ -50,7 +50,7 @@ export default <NetworkData>{
         v3: {
             vaultAddress: '0xba1333333333a1ba1108e8412f11850a5c319ba9',
             protocolFeeController: '0xcacc7e1efeea8bb3af6d5720d12c1876aa6ee76b',
-            routerAddress: '0xa8920455934da4d853faac1f94fe7bef72943ef1',
+            routerAddress: '0x9da18982a33fd0c7051b19f0d7c76f2d5e7e017c',
             defaultSwapFeePercentage: '0.5',
             defaultYieldFeePercentage: '0.1',
         },

config/plasma.ts

@@ -170,25 +170,6 @@ export default <NetworkData>{
                         { type: 'path', token: '0x871a101dcf22fe4fe37be7b654098c801cba1c88', path: '$.beefy-besonic' },
                     ],
                 },
-                {
-                    url: 'https://api.goldsky.com/api/public/project_cmcccb4vz1nhh01x888di8lgk/subgraphs/mainstreet/0.0.1/gn',
-                    body: JSON.stringify({
-                        query: `{
-                    smsUsdStats(id: "statsSmsUsd") {
-                      apy
-                    }
-                  }`,
-                    }),
-                    headers: { 'Content-Type': 'application/json' },
-                    scale: 100,
-                    extractors: [
-                        {
-                            type: 'path',
-                            token: '0xc7990369da608c2f4903715e3bd22f2970536c29',
-                            path: '$.data.smsUsdStats.apy',
-                        },
-                    ],
-                },
                 {
                     url: 'https://yields.llama.fi/chart/104b3467-bba3-4923-851d-aa9e6ff47611',
                     scale: 100,
@@ -201,7 +182,7 @@ export default <NetworkData>{
                     ],
                 },
                 {
-                    url: 'https://api.originprotocol.com/api/v2/os/apr/trailing/7?146',
+                    url: 'https://api.originprotocol.com/api/v2/os/apr/trailing/7',
                     scale: 100,
                     extractors: [{ type: 'path', token: '0x9f0df7799f6fdad409300080cff680f5a23df4b1', path: '$.apr' }],
                 },