@aspan/sdk 0.4.7 → 0.4.8

package/dist/index.d.mts

@@ -702,7 +702,9 @@ declare class AspanRouterReadClient {
     protected readonly publicClient: PublicClient;
     protected readonly routerAddress: Address;
     protected readonly chain: Chain;
+    private readonly _addressCache;
     constructor(config: AspanRouterClientConfig);
+    protected _getCachedAddress(key: string, fetcher: () => Promise<Address>): Promise<Address>;
     /**
      * Get the default LST address
      */

package/dist/index.d.ts

@@ -702,7 +702,9 @@ declare class AspanRouterReadClient {
     protected readonly publicClient: PublicClient;
     protected readonly routerAddress: Address;
     protected readonly chain: Chain;
+    private readonly _addressCache;
     constructor(config: AspanRouterClientConfig);
+    protected _getCachedAddress(key: string, fetcher: () => Promise<Address>): Promise<Address>;
     /**
      * Get the default LST address
      */

package/dist/index.js

@@ -892,7 +892,8 @@ var AspanReadClient = class _AspanReadClient {
     this.chain = config.chain ?? import_chains.bsc;
     this.publicClient = (0, import_viem.createPublicClient)({
       chain: this.chain,
-      transport: (0, import_viem.http)(config.rpcUrl)
+      transport: (0, import_viem.http)(config.rpcUrl),
+      batch: { multicall: true }
     });
   }
   /**
@@ -2383,14 +2384,23 @@ var AspanRouterReadClient = class {
   publicClient;
   routerAddress;
   chain;
+  _addressCache = /* @__PURE__ */ new Map();
   constructor(config) {
     this.routerAddress = config.routerAddress;
     this.chain = config.chain ?? import_chains2.bsc;
     this.publicClient = (0, import_viem2.createPublicClient)({
       chain: this.chain,
-      transport: (0, import_viem2.http)(config.rpcUrl)
+      transport: (0, import_viem2.http)(config.rpcUrl),
+      batch: { multicall: true }
     });
   }
+  async _getCachedAddress(key, fetcher) {
+    const cached = this._addressCache.get(key);
+    if (cached) return cached;
+    const addr = await fetcher();
+    this._addressCache.set(key, addr);
+    return addr;
+  }
   // ============ View Functions ============
   /**
    * Get the default LST address
@@ -2451,11 +2461,14 @@ var AspanRouterReadClient = class {
    * Get the Diamond contract address
    */
   async getDiamond() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "diamond"
-    });
+    return this._getCachedAddress(
+      "diamond",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "diamond"
+      })
+    );
   }
   /**
    * Preview mint output for a given LST amount
@@ -2491,39 +2504,41 @@ var AspanRouterReadClient = class {
    */
   async previewMintByInput(inputToken, inputAmount, targetLST, mintXBNB) {
     if (inputAmount === 0n) return { lstAmount: 0n, mintedAmount: 0n };
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC()
-    ]);
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD"
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [targetLST]
-      })
-    ]);
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
     let lstAmount = 0n;
     const inNorm = inputToken.toLowerCase();
     if (inNorm === targetLST.toLowerCase()) {
       lstAmount = inputAmount;
-    } else if (inNorm === import_viem2.zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
-      const usdValue = inputAmount * bnbPrice18 / one;
-      lstAmount = lstPrice18 === 0n ? 0n : usdValue * one / lstPrice18;
-    } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
-      lstAmount = lstPrice18 === 0n ? 0n : inputAmount * one / lstPrice18;
     } else {
-      throw new Error("Unsupported input token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC()
+      ]);
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD"
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [targetLST]
+        })
+      ]);
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+      if (inNorm === import_viem2.zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
+        const usdValue = inputAmount * bnbPrice18 / one;
+        lstAmount = lstPrice18 === 0n ? 0n : usdValue * one / lstPrice18;
+      } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
+        lstAmount = lstPrice18 === 0n ? 0n : inputAmount * one / lstPrice18;
+      } else {
+        throw new Error("Unsupported input token for SDK preview");
+      }
     }
     const mintedAmount = await this.previewMint(targetLST, lstAmount, mintXBNB);
     return { lstAmount, mintedAmount };
@@ -2535,39 +2550,41 @@ var AspanRouterReadClient = class {
   async previewRedeemToOutput(lst, redeemXBNB, amount, outputToken) {
     const lstAmount = await this.previewRedeem(lst, redeemXBNB, amount);
     if (lstAmount === 0n) return { lstAmount: 0n, outputAmount: 0n };
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC()
-    ]);
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD"
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [lst]
-      })
-    ]);
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
-    const usdValue = lstAmount * lstPrice18 / one;
     let outputAmount = 0n;
     const outNorm = outputToken.toLowerCase();
     if (outNorm === lst.toLowerCase()) {
       outputAmount = lstAmount;
-    } else if (outNorm === import_viem2.zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
-      outputAmount = bnbPrice18 === 0n ? 0n : usdValue * one / bnbPrice18;
-    } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
-      outputAmount = usdValue;
     } else {
-      throw new Error("Unsupported output token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC()
+      ]);
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD"
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [lst]
+        })
+      ]);
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+      const usdValue = lstAmount * lstPrice18 / one;
+      if (outNorm === import_viem2.zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
+        outputAmount = bnbPrice18 === 0n ? 0n : usdValue * one / bnbPrice18;
+      } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
+        outputAmount = usdValue;
+      } else {
+        throw new Error("Unsupported output token for SDK preview");
+      }
     }
     return { lstAmount, outputAmount };
   }
@@ -2600,60 +2617,84 @@ var AspanRouterReadClient = class {
   }
   // ============ Token Address Getters ============
   async getWBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wbnb"
-    });
+    return this._getCachedAddress(
+      "wbnb",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wbnb"
+      })
+    );
   }
   async getUSDT() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdt"
-    });
+    return this._getCachedAddress(
+      "usdt",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdt"
+      })
+    );
   }
   async getUSDC() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdc"
-    });
+    return this._getCachedAddress(
+      "usdc",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdc"
+      })
+    );
   }
   async getSlisBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "slisBNB"
-    });
+    return this._getCachedAddress(
+      "slisBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "slisBNB"
+      })
+    );
   }
   async getAsBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "asBNB"
-    });
+    return this._getCachedAddress(
+      "asBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "asBNB"
+      })
+    );
   }
   async getWclisBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wclisBNB"
-    });
+    return this._getCachedAddress(
+      "wclisBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wclisBNB"
+      })
+    );
   }
   async getApUSD() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "apUSD"
-    });
+    return this._getCachedAddress(
+      "apUSD",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "apUSD"
+      })
+    );
   }
   async getXBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "xBNB"
-    });
+    return this._getCachedAddress(
+      "xBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "xBNB"
+      })
+    );
   }
 };
 var AspanRouterClient = class extends AspanRouterReadClient {

package/dist/index.mjs

@@ -834,7 +834,8 @@ var AspanReadClient = class _AspanReadClient {
     this.chain = config.chain ?? bsc;
     this.publicClient = createPublicClient({
       chain: this.chain,
-      transport: http(config.rpcUrl)
+      transport: http(config.rpcUrl),
+      batch: { multicall: true }
     });
   }
   /**
@@ -2330,14 +2331,23 @@ var AspanRouterReadClient = class {
   publicClient;
   routerAddress;
   chain;
+  _addressCache = /* @__PURE__ */ new Map();
   constructor(config) {
     this.routerAddress = config.routerAddress;
     this.chain = config.chain ?? bsc2;
     this.publicClient = createPublicClient2({
       chain: this.chain,
-      transport: http2(config.rpcUrl)
+      transport: http2(config.rpcUrl),
+      batch: { multicall: true }
     });
   }
+  async _getCachedAddress(key, fetcher) {
+    const cached = this._addressCache.get(key);
+    if (cached) return cached;
+    const addr = await fetcher();
+    this._addressCache.set(key, addr);
+    return addr;
+  }
   // ============ View Functions ============
   /**
    * Get the default LST address
@@ -2398,11 +2408,14 @@ var AspanRouterReadClient = class {
    * Get the Diamond contract address
    */
   async getDiamond() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "diamond"
-    });
+    return this._getCachedAddress(
+      "diamond",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "diamond"
+      })
+    );
   }
   /**
    * Preview mint output for a given LST amount
@@ -2438,39 +2451,41 @@ var AspanRouterReadClient = class {
    */
   async previewMintByInput(inputToken, inputAmount, targetLST, mintXBNB) {
     if (inputAmount === 0n) return { lstAmount: 0n, mintedAmount: 0n };
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC()
-    ]);
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD"
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [targetLST]
-      })
-    ]);
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
     let lstAmount = 0n;
     const inNorm = inputToken.toLowerCase();
     if (inNorm === targetLST.toLowerCase()) {
       lstAmount = inputAmount;
-    } else if (inNorm === zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
-      const usdValue = inputAmount * bnbPrice18 / one;
-      lstAmount = lstPrice18 === 0n ? 0n : usdValue * one / lstPrice18;
-    } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
-      lstAmount = lstPrice18 === 0n ? 0n : inputAmount * one / lstPrice18;
     } else {
-      throw new Error("Unsupported input token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC()
+      ]);
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD"
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [targetLST]
+        })
+      ]);
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+      if (inNorm === zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
+        const usdValue = inputAmount * bnbPrice18 / one;
+        lstAmount = lstPrice18 === 0n ? 0n : usdValue * one / lstPrice18;
+      } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
+        lstAmount = lstPrice18 === 0n ? 0n : inputAmount * one / lstPrice18;
+      } else {
+        throw new Error("Unsupported input token for SDK preview");
+      }
     }
     const mintedAmount = await this.previewMint(targetLST, lstAmount, mintXBNB);
     return { lstAmount, mintedAmount };
@@ -2482,39 +2497,41 @@ var AspanRouterReadClient = class {
   async previewRedeemToOutput(lst, redeemXBNB, amount, outputToken) {
     const lstAmount = await this.previewRedeem(lst, redeemXBNB, amount);
     if (lstAmount === 0n) return { lstAmount: 0n, outputAmount: 0n };
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC()
-    ]);
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD"
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [lst]
-      })
-    ]);
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
-    const usdValue = lstAmount * lstPrice18 / one;
     let outputAmount = 0n;
     const outNorm = outputToken.toLowerCase();
     if (outNorm === lst.toLowerCase()) {
       outputAmount = lstAmount;
-    } else if (outNorm === zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
-      outputAmount = bnbPrice18 === 0n ? 0n : usdValue * one / bnbPrice18;
-    } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
-      outputAmount = usdValue;
     } else {
-      throw new Error("Unsupported output token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC()
+      ]);
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD"
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [lst]
+        })
+      ]);
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+      const usdValue = lstAmount * lstPrice18 / one;
+      if (outNorm === zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
+        outputAmount = bnbPrice18 === 0n ? 0n : usdValue * one / bnbPrice18;
+      } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
+        outputAmount = usdValue;
+      } else {
+        throw new Error("Unsupported output token for SDK preview");
+      }
     }
     return { lstAmount, outputAmount };
   }
@@ -2547,60 +2564,84 @@ var AspanRouterReadClient = class {
   }
   // ============ Token Address Getters ============
   async getWBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wbnb"
-    });
+    return this._getCachedAddress(
+      "wbnb",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wbnb"
+      })
+    );
   }
   async getUSDT() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdt"
-    });
+    return this._getCachedAddress(
+      "usdt",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdt"
+      })
+    );
   }
   async getUSDC() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdc"
-    });
+    return this._getCachedAddress(
+      "usdc",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdc"
+      })
+    );
   }
   async getSlisBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "slisBNB"
-    });
+    return this._getCachedAddress(
+      "slisBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "slisBNB"
+      })
+    );
   }
   async getAsBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "asBNB"
-    });
+    return this._getCachedAddress(
+      "asBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "asBNB"
+      })
+    );
   }
   async getWclisBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wclisBNB"
-    });
+    return this._getCachedAddress(
+      "wclisBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wclisBNB"
+      })
+    );
   }
   async getApUSD() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "apUSD"
-    });
+    return this._getCachedAddress(
+      "apUSD",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "apUSD"
+      })
+    );
   }
   async getXBNB() {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "xBNB"
-    });
+    return this._getCachedAddress(
+      "xBNB",
+      async () => this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "xBNB"
+      })
+    );
   }
 };
 var AspanRouterClient = class extends AspanRouterReadClient {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspan/sdk",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "TypeScript SDK for Aspan Protocol - LST-backed stablecoin on BNB Chain",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/client.ts

@@ -117,6 +117,7 @@ export class AspanReadClient {
     this.publicClient = createPublicClient({
       chain: this.chain,
       transport: http(config.rpcUrl),
+      batch: { multicall: true },
     });
   }
 

package/src/router.ts

@@ -59,6 +59,7 @@ export class AspanRouterReadClient {
   protected readonly publicClient: PublicClient;
   protected readonly routerAddress: Address;
   protected readonly chain: Chain;
+  private readonly _addressCache = new Map<string, Address>();
 
   constructor(config: AspanRouterClientConfig) {
     this.routerAddress = config.routerAddress;
@@ -67,9 +68,18 @@ export class AspanRouterReadClient {
     this.publicClient = createPublicClient({
       chain: this.chain,
       transport: http(config.rpcUrl),
+      batch: { multicall: true },
     });
   }
 
+  protected async _getCachedAddress(key: string, fetcher: () => Promise<Address>): Promise<Address> {
+    const cached = this._addressCache.get(key);
+    if (cached) return cached;
+    const addr = await fetcher();
+    this._addressCache.set(key, addr);
+    return addr;
+  }
+
   // ============ View Functions ============
 
   /**
@@ -136,11 +146,13 @@ export class AspanRouterReadClient {
    * Get the Diamond contract address
    */
   async getDiamond(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "diamond",
-    });
+    return this._getCachedAddress("diamond", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "diamond",
+      })
+    );
   }
 
   /**
@@ -185,44 +197,47 @@ export class AspanRouterReadClient {
   ): Promise<{ lstAmount: bigint; mintedAmount: bigint }> {
     if (inputAmount === 0n) return { lstAmount: 0n, mintedAmount: 0n };
 
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC(),
-    ]);
-
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD",
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [targetLST],
-      }),
-    ]);
-
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
-
     let lstAmount = 0n;
     const inNorm = inputToken.toLowerCase();
+    
     if (inNorm === targetLST.toLowerCase()) {
       lstAmount = inputAmount;
-    } else if (inNorm === zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
-      // BNB/WBNB -> USD -> LST
-      const usdValue = (inputAmount * bnbPrice18) / one;
-      lstAmount = lstPrice18 === 0n ? 0n : (usdValue * one) / lstPrice18;
-    } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
-      // stablecoin (18-decimal normalized in this SDK path) -> LST
-      lstAmount = lstPrice18 === 0n ? 0n : (inputAmount * one) / lstPrice18;
     } else {
-      throw new Error("Unsupported input token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC(),
+      ]);
+
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD",
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [targetLST],
+        }),
+      ]);
+
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+
+      if (inNorm === zeroAddress.toLowerCase() || inNorm === wbnb.toLowerCase()) {
+        // BNB/WBNB -> USD -> LST
+        const usdValue = (inputAmount * bnbPrice18) / one;
+        lstAmount = lstPrice18 === 0n ? 0n : (usdValue * one) / lstPrice18;
+      } else if (inNorm === usdt.toLowerCase() || inNorm === usdc.toLowerCase()) {
+        // stablecoin (18-decimal normalized in this SDK path) -> LST
+        lstAmount = lstPrice18 === 0n ? 0n : (inputAmount * one) / lstPrice18;
+      } else {
+        throw new Error("Unsupported input token for SDK preview");
+      }
     }
 
     const mintedAmount = await this.previewMint(targetLST, lstAmount, mintXBNB);
@@ -242,42 +257,45 @@ export class AspanRouterReadClient {
     const lstAmount = await this.previewRedeem(lst, redeemXBNB, amount);
     if (lstAmount === 0n) return { lstAmount: 0n, outputAmount: 0n };
 
-    const [diamond, wbnb, usdt, usdc] = await Promise.all([
-      this.getDiamond(),
-      this.getWBNB(),
-      this.getUSDT(),
-      this.getUSDC(),
-    ]);
-
-    const [bnbPrice8, lstPrice] = await Promise.all([
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getBNBPriceUSD",
-      }),
-      this.publicClient.readContract({
-        address: diamond,
-        abi: DiamondABI,
-        functionName: "getLSTPriceUSD",
-        args: [lst],
-      }),
-    ]);
-
-    const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
-    const lstPrice18 = BigInt(lstPrice);
-    const one = 10n ** 18n;
-    const usdValue = (lstAmount * lstPrice18) / one;
-
     let outputAmount = 0n;
     const outNorm = outputToken.toLowerCase();
+
     if (outNorm === lst.toLowerCase()) {
       outputAmount = lstAmount;
-    } else if (outNorm === zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
-      outputAmount = bnbPrice18 === 0n ? 0n : (usdValue * one) / bnbPrice18;
-    } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
-      outputAmount = usdValue;
     } else {
-      throw new Error("Unsupported output token for SDK preview");
+      const [diamond, wbnb, usdt, usdc] = await Promise.all([
+        this.getDiamond(),
+        this.getWBNB(),
+        this.getUSDT(),
+        this.getUSDC(),
+      ]);
+
+      const [bnbPrice8, lstPrice] = await Promise.all([
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getBNBPriceUSD",
+        }),
+        this.publicClient.readContract({
+          address: diamond,
+          abi: DiamondABI,
+          functionName: "getLSTPriceUSD",
+          args: [lst],
+        }),
+      ]);
+
+      const bnbPrice18 = BigInt(bnbPrice8) * 10n ** 10n;
+      const lstPrice18 = BigInt(lstPrice);
+      const one = 10n ** 18n;
+      const usdValue = (lstAmount * lstPrice18) / one;
+
+      if (outNorm === zeroAddress.toLowerCase() || outNorm === wbnb.toLowerCase()) {
+        outputAmount = bnbPrice18 === 0n ? 0n : (usdValue * one) / bnbPrice18;
+      } else if (outNorm === usdt.toLowerCase() || outNorm === usdc.toLowerCase()) {
+        outputAmount = usdValue;
+      } else {
+        throw new Error("Unsupported output token for SDK preview");
+      }
     }
 
     return { lstAmount, outputAmount };
@@ -318,67 +336,83 @@ export class AspanRouterReadClient {
   // ============ Token Address Getters ============
 
   async getWBNB(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wbnb",
-    });
+    return this._getCachedAddress("wbnb", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wbnb",
+      })
+    );
   }
 
   async getUSDT(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdt",
-    });
+    return this._getCachedAddress("usdt", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdt",
+      })
+    );
   }
 
   async getUSDC(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "usdc",
-    });
+    return this._getCachedAddress("usdc", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "usdc",
+      })
+    );
   }
 
   async getSlisBNB(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "slisBNB",
-    });
+    return this._getCachedAddress("slisBNB", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "slisBNB",
+      })
+    );
   }
 
   async getAsBNB(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "asBNB",
-    });
+    return this._getCachedAddress("asBNB", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "asBNB",
+      })
+    );
   }
 
   async getWclisBNB(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "wclisBNB",
-    });
+    return this._getCachedAddress("wclisBNB", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "wclisBNB",
+      })
+    );
   }
 
   async getApUSD(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "apUSD",
-    });
+    return this._getCachedAddress("apUSD", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "apUSD",
+      })
+    );
   }
 
   async getXBNB(): Promise<Address> {
-    return this.publicClient.readContract({
-      address: this.routerAddress,
-      abi: RouterABI,
-      functionName: "xBNB",
-    });
+    return this._getCachedAddress("xBNB", async () =>
+      this.publicClient.readContract({
+        address: this.routerAddress,
+        abi: RouterABI,
+        functionName: "xBNB",
+      })
+    );
   }
 }