update

ThalaLabs · Jul 15, 2024 · b295c7a · b295c7a
1 parent 84e308c
commit b295c7a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/packages/thalaswap-router/README.md b/packages/thalaswap-router/README.md
@@ -13,7 +13,8 @@ $ npm i @thalalabs/router-sdk
 ```
 const router = new ThalaswapRouter(
   Network.MAINNET,
-  "https://fullnode.mainnet.aptoslabs.com/v1"
+  "https://fullnode.mainnet.aptoslabs.com/v1",
+  "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af"
 );
 const fromToken = "0x1::aptos_coin::AptosCoin";
 const toToken = "0xec84c05cc40950c86d8a8bed19552f1e8ebb783196bb021c916161d22dc179f7::asset::USDC";

diff --git a/packages/thalaswap-router/examples/examples.ts b/packages/thalaswap-router/examples/examples.ts
@@ -24,6 +24,7 @@ const account = Account.fromPrivateKey({
 const router = new ThalaswapRouter(
   Network.MAINNET,
   "https://fullnode.mainnet.aptoslabs.com/v1",
+  "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af",
 );
 
 // Example 1: Exact input. 1 hop

diff --git a/packages/thalaswap-router/src/PoolDataClient.ts b/packages/thalaswap-router/src/PoolDataClient.ts
@@ -2,7 +2,6 @@ import { Coin, Pool, PoolData } from "./types";
 import { Aptos, AptosConfig, Network } from "@aptos-labs/ts-sdk";
 import { uniq } from "lodash";
 import { fp64ToFloat, parsePoolMetadata, scaleDown } from "./utils";
-import { THALASWAP_RESOURCE_ACCOUNT_ADDRESS } from "./constants";
 
 class PoolDataClient {
   private poolData: PoolData | null = null;
@@ -13,9 +12,8 @@ class PoolDataClient {
   private coins: Coin[] = [];
   private resourceAddress: string;
 
-  constructor(network: Network, fullnode: string, resourceAddress?: string) {
-    this.resourceAddress =
-      resourceAddress || THALASWAP_RESOURCE_ACCOUNT_ADDRESS;
+  constructor(network: Network, fullnode: string, resourceAddress: string) {
+    this.resourceAddress = resourceAddress;
 
     this.client = new Aptos(
       new AptosConfig({

diff --git a/packages/thalaswap-router/src/ThalaswapRouter.ts b/packages/thalaswap-router/src/ThalaswapRouter.ts
@@ -14,7 +14,6 @@ import { STABLE_POOL_SCRIPTS_ABI } from "./abi/stable_pool_scripts";
 import { WEIGHTED_POOL_SCRIPTS_ABI } from "./abi/weighted_pool_scripts";
 import { MULTIHOP_ROUTER_ABI } from "./abi/multihop_router";
 import { Network } from "@aptos-labs/ts-sdk";
-import { THALASWAP_RESOURCE_ACCOUNT_ADDRESS } from "./constants";
 
 const NULL_TYPE = `${STABLE_POOL_SCRIPTS_ABI.address}::base_pool::Null`;
 const NULL_4 = Array(4).fill(NULL_TYPE);
@@ -63,12 +62,9 @@ class ThalaswapRouter {
   private client: PoolDataClient;
   private graph: Graph | null = null;
   private coins: Coin[] | null = null;
-  private resourceAddress: string;
 
-  constructor(network: Network, fullnode: string, resourceAddress?: string) {
-    this.resourceAddress =
-      resourceAddress || THALASWAP_RESOURCE_ACCOUNT_ADDRESS;
-    this.client = new PoolDataClient(network, fullnode);
+  constructor(network: Network, fullnode: string, resourceAddress: string) {
+    this.client = new PoolDataClient(network, fullnode, resourceAddress);
   }
 
   setPoolDataClient(client: PoolDataClient) {

diff --git a/packages/thalaswap-router/src/constants.ts b/packages/thalaswap-router/src/constants.ts
diff --git a/packages/thalaswap-router/test/router.test.ts b/packages/thalaswap-router/test/router.test.ts
@@ -24,7 +24,7 @@ const mockPoolDataClient = {
   }),
 };
 
-const router = new ThalaswapRouter(Network.MAINNET, "test");
+const router = new ThalaswapRouter(Network.MAINNET, "test", "0x123");
 router.setPoolDataClient(mockPoolDataClient as any);
 
 test("Exact input 1 hop", async () => {