Merge pull request #33 from safeblock-dev/feat/units

Update the default entry point contract address on the units network …

Author: knownout

package-lock.json

@@ -60,8 +60,8 @@
     "url": "https://github.com/safeblock-dev/exchange-sdk/issues"
   },
   "homepage": "https://github.com/safeblock-dev/exchange-sdk#readme",
-  "dependencies": {
-    "@safeblock/blockchain-utils": "^1.0.0",
+  "peerDependencies": {
+    "@safeblock/blockchain-utils": "^1.0.2",
     "ethers": "^6.15.0"
   }
 }

package.json

@@ -1,11 +1,11 @@
 import { Address, Amount } from "@safeblock/blockchain-utils"
+import { describe, expect, it } from "vitest"
 import runSingleChainTests from "~/__specs__/utils/run-single-chain-tests"
 import { PriceStorageExtension } from "~/extensions"
 import { SdkException } from "~/index"
-import { bnbDAI, bnbUSDT, sdkConfig } from "./utils/sdk-test-config"
 import SafeBlockSDK from "~/sdk"
 import { ExchangeRequest } from "~/types"
-import { describe, expect, it } from "vitest"
+import { bnbDAI, bnbUSDT, sdkConfig } from "./utils/sdk-test-config"
 
 describe("Single chain exchanges in Ethereum networks", async () => {
   const sdk = new SafeBlockSDK(sdkConfig)

src/__specs__/single-chain-ethereum.spec.ts

@@ -6,7 +6,7 @@ import { SdkConfig } from "~/sdk"
 const contractAddresses = {
   entryPoint: (network: Network, config?: SdkConfig) => selectAddress(network, config?.contractAddresses?.entryPoint ?? {
     default: "0xA5487594bD2303AF225f8c15E80CED0Da883A0E8",
-    [units.name]: "0xA26c8aC451d9EBbd4B40e8D2Ed91f5c55b989001"
+    [units.name]: "0x65DfbA5338137e0De3c7e9C11D9BFEd0B02c33b8"
   }),
 
   quoter: (network: Network, config?: SdkConfig) => selectAddress(network, config?.contractAddresses?.quoter ?? {
@@ -16,7 +16,7 @@ const contractAddresses = {
 
   offchainOracle: (network: Network) => selectAddress(network, {
     [scroll.name]: "0xA2a3F952427c22e208a8298fd2346B8e664964b1",
-    [units.name]: "0x16a35020a2D45f80cc156649D57E4Cc9d4fC74D2",
+    [units.name]: "0xdd4ec4bFecAb02CbE60CdBA8De49821a1105c24f",
     default: "0x00000000000D6FFc74A8feb35aF5827bf57f6786"
   }),
 

src/config.ts

@@ -1,4 +1,4 @@
-import { Address, Amount, arrayUtils, multicall, MultiCallRequest, units } from "@safeblock/blockchain-utils"
+import { Address, Amount, arrayUtils, multicall, MultiCallRequest } from "@safeblock/blockchain-utils"
 import { Network } from "ethers"
 import { OffchainOracle__factory } from "~/abis/types"
 import { contractAddresses } from "~/config"
@@ -242,13 +242,7 @@ export default class PriceStorageExtension extends SdkExtension {
     if (task !== this.#currentFetchingTask) return
 
     const usdcRate = rates.find((r) => Address.equal(r.token.address, usdc.address))?.rate
-    if (!usdcRate) {
-      if (network.name === units.name) {
-        this._prices.get(network.name)?.set(usdc.address.toString().toLowerCase(), BigInt(1e6))
-      }
-
-      return
-    }
+    if (!usdcRate) return
 
     rates.forEach((rate) => {
       if (Address.equal(rate.token.address, usdc.address)) {

src/extensions/price-storage-extension.ts

@@ -221,8 +221,7 @@ export default class EvmConverter extends ExchangeConverter {
           headers: this.sdkConfig.backend?.headers,
           bannedDexIds: this.sdkInstance.dexBlacklist.toArray(),
           fromToken: request.tokenIn,
-          toToken: tokenOut,
-          amountInRaw: smartRoutingAvailable ? request.amountIn.toString() : undefined
+          toToken: tokenOut
         })
       ))
     ))

src/sdk/evm-converter/evm-converter.ts

@@ -34,6 +34,9 @@ export default class EvmCrossChainExtension {
 
     if (_request instanceof SdkException) return _request
 
+    if (request.tokenIn.network.name === units.name || request.tokensOut.some(token => token.network.name === units.name))
+      return new SdkException("Cross-chain swaps with units network not supported", SdkExceptionCode.InvalidRequest)
+
     if (_request.exactInput) return this.createMultiChainExchangeTransactionLTR(from, _request, taskId)
 
     return this.createMultiChainExchangeTransactionRTL(from, _request, taskId)
@@ -460,7 +463,7 @@ export default class EvmCrossChainExtension {
       )),
       smartRoutingEstimatedGasUsage: smGasUsage.gt(0) ? smGasUsage.toFixed(0) : undefined
     }
-    
+
     return mixin.applyMixin("quotaComputationFinalized", {
       ...rawQuota,
       estimatedGasUsage: ExchangeUtils.computeQuotaExecutionGasUsage(rawQuota, this.mixins)

src/sdk/evm-converter/evm-cross-chain-extension.ts

@@ -2,7 +2,6 @@ import { Address, arrayUtils } from "@safeblock/blockchain-utils"
 import { BackendResponse, BasicToken, RouteStep } from "~/types"
 import LimitedMap from "~/utils/limited-map"
 import request from "~/utils/request"
-import IBackendRouteStep = BackendResponse.IBackendRouteStep
 import IRoutesResponse = BackendResponse.IRoutesResponse
 import IRoutesResponseNext = BackendResponse.IRoutesResponseNext
 
@@ -14,7 +13,6 @@ interface Options {
   headers?: Record<string, string>
   routeCacheTime?: number
 
-  amountInRaw?: string
   epsilon?: number
   maxPairsCount?: number
 
@@ -29,7 +27,7 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
   const routeKey = options.fromToken.address.toString() + options.toToken.address.toString()
     + options.fromToken.network.name + options.toToken.network.name
     + options.bannedDexIds?.join(",")
-    + options.amountInRaw + options.epsilon + options.maxPairsCount
+    + options.epsilon + options.maxPairsCount
 
   const cachedRoute = routesCache.get(routeKey)
 
@@ -47,7 +45,6 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
         limit: 30,
         network: fromToken.network.chainId.toString(),
         banned_dex_ids: bannedDexIds?.length ? bannedDexIds.join(",") : null,
-        amount: options.amountInRaw,
         epsilon: options.epsilon || null,
         max_pairs_count: options.maxPairsCount || null
       }
@@ -58,18 +55,9 @@ export default async function getExchangeRoutes(options: Options): Promise<{ rou
 
   if (!rawRoutes) return { routes: [], percents: [] }
 
-  let plainRoutesList: IBackendRouteStep[][]
+  const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponse
 
-  if (options.amountInRaw) {
-    const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponseNext
-
-    plainRoutesList = _rawRoutes.route
-  }
-  else {
-    const _rawRoutes = rawRoutes as BackendResponse.IRoutesResponse
-
-    plainRoutesList = [..._rawRoutes.items.swap.map(route => [route]), ..._rawRoutes.items.multiswap]
-  }
+  const plainRoutesList = [..._rawRoutes.items.swap.map(route => [route]), ..._rawRoutes.items.multiswap]
 
   if (!plainRoutesList || plainRoutesList.length === 0) return { routes: [], percents: [] }
 

src/utils/get-exchange-routes.ts

@@ -1,4 +1,4 @@
-import { arbitrum, avalanche, base, bnb, gnosis, mainnet, matic, optimism, scroll } from "@safeblock/blockchain-utils"
+import { arbitrum, avalanche, base, bnb, gnosis, mainnet, matic, optimism, scroll, units } from "@safeblock/blockchain-utils"
 import { Network } from "ethers"
 import { SdkConfig } from "~/sdk"
 
@@ -11,7 +11,8 @@ const SafeblockNetworksMap: Record<string, Network> = {
   "optimism": optimism,
   "base": base,
   "gnosis": gnosis,
-  "scroll": scroll
+  "scroll": scroll,
+  "units": units
 }
 
 /** Function for converting internal `SafeBlock` network names to `ethers`-compatible names */

src/utils/safeblock-mappings.ts

@@ -2,6 +2,9 @@ import * as path from "node:path"
 import { defineConfig } from "vitest/config"
 
 export default defineConfig({
+  test: {
+    testTimeout: 30_000
+  },
   resolve: {
     alias: [
       { find: "~", replacement: path.resolve(__dirname, "./src/") }