@optimex-xyz/market-maker-sdk 0.8.0-staging-d94762b → 0.8.0

package/dist/index.d.mts

@@ -5,7 +5,6 @@ type Environment = 'dev' | 'prelive' | 'production' | 'staging';
 interface EnvironmentConfig {
     backendUrl: string;
     rpcUrl: string;
-    routerAddress: string;
     paymentAddressMap: Record<string, string>;
     protocolFetcherProxyAddress: string;
 }
@@ -37,7 +36,6 @@ declare class Config {
     get(): AppConfig;
     getBackendUrl(): string;
     getRpcUrl(): string;
-    getRouterAddress(): string;
     getPaymentAddress(networkId: string): string | undefined;
     getProtocolFetcherAddress(): string;
 }
@@ -5569,11 +5567,13 @@ declare class RouterService implements ConfigObserver {
     private provider;
     private contract;
     constructor();
+    onConfigUpdate(newConfig: AppConfig): void;
     /**
-     * Implementation of ConfigObserver interface
-     * Updates service when config changes
+     * Force refresh the contract instance
+     * Useful when router address might have changed
      */
-    onConfigUpdate(newConfig: AppConfig): void;
+    refreshContract(): void;
+    private getContract;
     getSigner(): Promise<string>;
     getHandler(fromChain: BytesLike, toChain: BytesLike): Promise<[string, string]>;
     getPMMSelection(tradeId: BytesLike): Promise<ITypes.PMMSelectionStructOutput>;

package/dist/index.d.ts

@@ -5,7 +5,6 @@ type Environment = 'dev' | 'prelive' | 'production' | 'staging';
 interface EnvironmentConfig {
     backendUrl: string;
     rpcUrl: string;
-    routerAddress: string;
     paymentAddressMap: Record<string, string>;
     protocolFetcherProxyAddress: string;
 }
@@ -37,7 +36,6 @@ declare class Config {
     get(): AppConfig;
     getBackendUrl(): string;
     getRpcUrl(): string;
-    getRouterAddress(): string;
     getPaymentAddress(networkId: string): string | undefined;
     getProtocolFetcherAddress(): string;
 }
@@ -5569,11 +5567,13 @@ declare class RouterService implements ConfigObserver {
     private provider;
     private contract;
     constructor();
+    onConfigUpdate(newConfig: AppConfig): void;
     /**
-     * Implementation of ConfigObserver interface
-     * Updates service when config changes
+     * Force refresh the contract instance
+     * Useful when router address might have changed
      */
-    onConfigUpdate(newConfig: AppConfig): void;
+    refreshContract(): void;
+    private getContract;
     getSigner(): Promise<string>;
     getHandler(fromChain: BytesLike, toChain: BytesLike): Promise<[string, string]>;
     getPMMSelection(tradeId: BytesLike): Promise<ITypes.PMMSelectionStructOutput>;

package/dist/index.js

@@ -75,7 +75,6 @@ var environments = {
   dev: {
     backendUrl: "https://api-dev.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
-    routerAddress: "0xe6DCDc525051F773EaC3e58B9b5f902D4E03fD55",
     protocolFetcherProxyAddress: "0x0267Fc04eE866b31907dEe123aBdCdB67d03B297",
     paymentAddressMap: {
       ethereum_sepolia: "0x1d8b58438D5Ccc8Fcb4b738C89078f7b4168C9c0"
@@ -84,7 +83,6 @@ var environments = {
   staging: {
     backendUrl: "https://api-stg.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
-    routerAddress: "0x31C88ebd9E430455487b6a5c8971e8eF63e97ED4",
     protocolFetcherProxyAddress: "0x7c07151ca4DFd93F352Ab9B132A95866697c38c2",
     paymentAddressMap: {
       ethereum_sepolia: "0x7387DcCfE2f1D5F80b4ECDF91eF58541517e90D2"
@@ -93,7 +91,6 @@ var environments = {
   prelive: {
     backendUrl: "https://pre-api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
-    routerAddress: "0xF7fedF4A250157010807E6eA60258E3B768149Ff",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
     paymentAddressMap: {
       ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
@@ -102,7 +99,6 @@ var environments = {
   production: {
     backendUrl: "https://api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
-    routerAddress: "0xF7fedF4A250157010807E6eA60258E3B768149Ff",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
     paymentAddressMap: {
       ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
@@ -158,9 +154,6 @@ var Config = class {
   getRpcUrl() {
     return this.config.rpcUrl;
   }
-  getRouterAddress() {
-    return this.config.routerAddress;
-  }
   getPaymentAddress(networkId) {
     return this.config.paymentAddressMap[networkId];
   }
@@ -4225,11 +4218,14 @@ var Signer__factory = class {
 Signer__factory.abi = _abi5;
 
 // src/services/router.service.ts
+var import_ethers7 = require("ethers");
+
+// src/services/protocol.service.ts
 var import_ethers6 = require("ethers");
-var RouterService = class {
+var ProtocolService = class {
   constructor() {
     this.provider = new import_ethers6.JsonRpcProvider(config.getRpcUrl());
-    this.contract = Router__factory.connect(config.getRouterAddress(), this.provider);
+    this.contract = ProtocolFetcherProxy__factory.connect(config.getProtocolFetcherAddress(), this.provider);
     config.registerObserver(this);
   }
   /**
@@ -4238,38 +4234,93 @@ var RouterService = class {
    */
   onConfigUpdate(newConfig) {
     this.provider = new import_ethers6.JsonRpcProvider(newConfig.rpcUrl);
-    this.contract = Router__factory.connect(newConfig.routerAddress, this.provider);
+    this.contract = ProtocolFetcherProxy__factory.connect(newConfig.protocolFetcherProxyAddress, this.provider);
+  }
+  async getCurrentPubkey(network) {
+    return this.contract.getLatestMPCInfo(import_ethers6.ethers.toUtf8Bytes(network));
+  }
+  async getPFeeRate({
+    fromNetworkId,
+    fromTokenId,
+    toNetworkId,
+    toTokenId
+  }) {
+    const feeRate = await this.contract.getPFeeRate([
+      import_ethers6.ethers.toUtf8Bytes(fromNetworkId),
+      import_ethers6.ethers.toUtf8Bytes(fromTokenId),
+      import_ethers6.ethers.toUtf8Bytes(toNetworkId),
+      import_ethers6.ethers.toUtf8Bytes(toTokenId)
+    ]);
+    return Number(feeRate.toString());
+  }
+  async getRouter() {
+    return this.contract.router();
+  }
+};
+var protocolService = new ProtocolService();
+
+// src/services/router.service.ts
+var RouterService = class {
+  constructor() {
+    this.contract = null;
+    this.provider = new import_ethers7.JsonRpcProvider(config.getRpcUrl());
+    config.registerObserver(this);
+  }
+  onConfigUpdate(newConfig) {
+    this.provider = new import_ethers7.JsonRpcProvider(newConfig.rpcUrl);
+    this.contract = null;
+  }
+  /**
+   * Force refresh the contract instance
+   * Useful when router address might have changed
+   */
+  refreshContract() {
+    this.contract = null;
+  }
+  async getContract() {
+    if (!this.contract) {
+      const routerAddress = await protocolService.getRouter();
+      this.contract = Router__factory.connect(routerAddress, this.provider);
+    }
+    return this.contract;
   }
   async getSigner() {
-    return await this.contract.SIGNER();
+    const contract = await this.getContract();
+    return await contract.SIGNER();
   }
   async getHandler(fromChain, toChain) {
-    return await this.contract.getHandler(fromChain, toChain);
+    const contract = await this.getContract();
+    return await contract.getHandler(fromChain, toChain);
   }
   async getPMMSelection(tradeId) {
-    return await this.contract.getPMMSelection(tradeId);
+    const contract = await this.getContract();
+    return await contract.getPMMSelection(tradeId);
   }
   async getSettlementPresigns(tradeId) {
-    return await this.contract.getSettlementPresigns(tradeId);
+    const contract = await this.getContract();
+    return await contract.getSettlementPresigns(tradeId);
   }
   async getFeeDetails(tradeId) {
-    return await this.contract.getFeeDetails(tradeId);
+    const contract = await this.getContract();
+    return await contract.getFeeDetails(tradeId);
   }
   async getTradeData(tradeId) {
-    return await this.contract.getTradeData(tradeId);
+    const contract = await this.getContract();
+    return await contract.getTradeData(tradeId);
   }
   async getManagement() {
-    return await this.contract.management();
+    const contract = await this.getContract();
+    return await contract.management();
   }
 };
 var routerService = new RouterService();
 
 // src/services/signer.service.ts
-var import_ethers7 = require("ethers");
+var import_ethers8 = require("ethers");
 var SignerService = class {
   constructor() {
     this.routerService = routerService;
-    this.provider = new import_ethers7.JsonRpcProvider(config.getRpcUrl());
+    this.provider = new import_ethers8.JsonRpcProvider(config.getRpcUrl());
     config.registerObserver(this);
   }
   /**
@@ -4277,7 +4328,7 @@ var SignerService = class {
    * Updates service when config changes
    */
   onConfigUpdate(newConfig) {
-    this.provider = new import_ethers7.JsonRpcProvider(newConfig.rpcUrl);
+    this.provider = new import_ethers8.JsonRpcProvider(newConfig.rpcUrl);
   }
   async getDomain() {
     const signerAddress = await this.routerService.getSigner();
@@ -4621,20 +4672,20 @@ async function defaultDomain(signerHelper, provider) {
 }
 
 // src/signatures/getInfoHash.ts
-var import_ethers8 = require("ethers");
-var abiCoder = import_ethers8.AbiCoder.defaultAbiCoder();
+var import_ethers9 = require("ethers");
+var abiCoder = import_ethers9.AbiCoder.defaultAbiCoder();
 function getTradeIdsHash(tradeIds) {
-  return (0, import_ethers8.keccak256)(abiCoder.encode(["bytes32[]"], [tradeIds]));
+  return (0, import_ethers9.keccak256)(abiCoder.encode(["bytes32[]"], [tradeIds]));
 }
 function getMakePaymentHash(tradeIds, signedAt, startIdx, paymentTxId) {
-  const bundlerHash = (0, import_ethers8.keccak256)(abiCoder.encode(["bytes32[]"], [tradeIds]));
-  const infoHash = (0, import_ethers8.keccak256)(
+  const bundlerHash = (0, import_ethers9.keccak256)(abiCoder.encode(["bytes32[]"], [tradeIds]));
+  const infoHash = (0, import_ethers9.keccak256)(
     abiCoder.encode(["uint64", "uint256", "bytes32", "bytes"], [signedAt, startIdx, bundlerHash, paymentTxId])
   );
   return infoHash;
 }
 function getCommitInfoHash(pmmId, pmmRecvAddr, toChain, toToken, amountOut, expiry) {
-  const infoHash = (0, import_ethers8.keccak256)(
+  const infoHash = (0, import_ethers9.keccak256)(
     abiCoder.encode(
       ["bytes32", "bytes", "bytes", "bytes", "uint256", "uint64"],
       [pmmId, pmmRecvAddr, toChain, toToken, amountOut, expiry]
@@ -4644,7 +4695,7 @@ function getCommitInfoHash(pmmId, pmmRecvAddr, toChain, toToken, amountOut, expi
 }
 
 // src/signatures/getSignature.ts
-var import_ethers9 = require("ethers");
+var import_ethers10 = require("ethers");
 
 // src/signatures/types.ts
 var presignType = {
@@ -4711,7 +4762,7 @@ function getSignatureType(type) {
 async function getSigner(provider, signerHelper, tradeId, infoHash, type, signature) {
   const values = { tradeId, infoHash };
   const contractDomain = await defaultDomain(signerHelper, provider);
-  return (0, import_ethers9.verifyTypedData)(contractDomain, getSignatureType(type), values, signature);
+  return (0, import_ethers10.verifyTypedData)(contractDomain, getSignatureType(type), values, signature);
 }
 async function getSignature(Signer2, provider, signerHelper, tradeId, infoHash, type, domain) {
   const contractDomain = await defaultDomain(signerHelper, provider);

package/dist/index.mjs

@@ -9,7 +9,6 @@ var environments = {
   dev: {
     backendUrl: "https://api-dev.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
-    routerAddress: "0xe6DCDc525051F773EaC3e58B9b5f902D4E03fD55",
     protocolFetcherProxyAddress: "0x0267Fc04eE866b31907dEe123aBdCdB67d03B297",
     paymentAddressMap: {
       ethereum_sepolia: "0x1d8b58438D5Ccc8Fcb4b738C89078f7b4168C9c0"
@@ -18,7 +17,6 @@ var environments = {
   staging: {
     backendUrl: "https://api-stg.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
-    routerAddress: "0x31C88ebd9E430455487b6a5c8971e8eF63e97ED4",
     protocolFetcherProxyAddress: "0x7c07151ca4DFd93F352Ab9B132A95866697c38c2",
     paymentAddressMap: {
       ethereum_sepolia: "0x7387DcCfE2f1D5F80b4ECDF91eF58541517e90D2"
@@ -27,7 +25,6 @@ var environments = {
   prelive: {
     backendUrl: "https://pre-api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
-    routerAddress: "0xF7fedF4A250157010807E6eA60258E3B768149Ff",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
     paymentAddressMap: {
       ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
@@ -36,7 +33,6 @@ var environments = {
   production: {
     backendUrl: "https://api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
-    routerAddress: "0xF7fedF4A250157010807E6eA60258E3B768149Ff",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
     paymentAddressMap: {
       ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
@@ -92,9 +88,6 @@ var Config = class {
   getRpcUrl() {
     return this.config.rpcUrl;
   }
-  getRouterAddress() {
-    return this.config.routerAddress;
-  }
   getPaymentAddress(networkId) {
     return this.config.paymentAddressMap[networkId];
   }
@@ -4159,11 +4152,14 @@ var Signer__factory = class {
 Signer__factory.abi = _abi5;
 
 // src/services/router.service.ts
-import { JsonRpcProvider } from "ethers";
-var RouterService = class {
+import { JsonRpcProvider as JsonRpcProvider2 } from "ethers";
+
+// src/services/protocol.service.ts
+import { ethers, JsonRpcProvider } from "ethers";
+var ProtocolService = class {
   constructor() {
     this.provider = new JsonRpcProvider(config.getRpcUrl());
-    this.contract = Router__factory.connect(config.getRouterAddress(), this.provider);
+    this.contract = ProtocolFetcherProxy__factory.connect(config.getProtocolFetcherAddress(), this.provider);
     config.registerObserver(this);
   }
   /**
@@ -4172,38 +4168,93 @@ var RouterService = class {
    */
   onConfigUpdate(newConfig) {
     this.provider = new JsonRpcProvider(newConfig.rpcUrl);
-    this.contract = Router__factory.connect(newConfig.routerAddress, this.provider);
+    this.contract = ProtocolFetcherProxy__factory.connect(newConfig.protocolFetcherProxyAddress, this.provider);
+  }
+  async getCurrentPubkey(network) {
+    return this.contract.getLatestMPCInfo(ethers.toUtf8Bytes(network));
+  }
+  async getPFeeRate({
+    fromNetworkId,
+    fromTokenId,
+    toNetworkId,
+    toTokenId
+  }) {
+    const feeRate = await this.contract.getPFeeRate([
+      ethers.toUtf8Bytes(fromNetworkId),
+      ethers.toUtf8Bytes(fromTokenId),
+      ethers.toUtf8Bytes(toNetworkId),
+      ethers.toUtf8Bytes(toTokenId)
+    ]);
+    return Number(feeRate.toString());
+  }
+  async getRouter() {
+    return this.contract.router();
+  }
+};
+var protocolService = new ProtocolService();
+
+// src/services/router.service.ts
+var RouterService = class {
+  constructor() {
+    this.contract = null;
+    this.provider = new JsonRpcProvider2(config.getRpcUrl());
+    config.registerObserver(this);
+  }
+  onConfigUpdate(newConfig) {
+    this.provider = new JsonRpcProvider2(newConfig.rpcUrl);
+    this.contract = null;
+  }
+  /**
+   * Force refresh the contract instance
+   * Useful when router address might have changed
+   */
+  refreshContract() {
+    this.contract = null;
+  }
+  async getContract() {
+    if (!this.contract) {
+      const routerAddress = await protocolService.getRouter();
+      this.contract = Router__factory.connect(routerAddress, this.provider);
+    }
+    return this.contract;
   }
   async getSigner() {
-    return await this.contract.SIGNER();
+    const contract = await this.getContract();
+    return await contract.SIGNER();
   }
   async getHandler(fromChain, toChain) {
-    return await this.contract.getHandler(fromChain, toChain);
+    const contract = await this.getContract();
+    return await contract.getHandler(fromChain, toChain);
   }
   async getPMMSelection(tradeId) {
-    return await this.contract.getPMMSelection(tradeId);
+    const contract = await this.getContract();
+    return await contract.getPMMSelection(tradeId);
   }
   async getSettlementPresigns(tradeId) {
-    return await this.contract.getSettlementPresigns(tradeId);
+    const contract = await this.getContract();
+    return await contract.getSettlementPresigns(tradeId);
   }
   async getFeeDetails(tradeId) {
-    return await this.contract.getFeeDetails(tradeId);
+    const contract = await this.getContract();
+    return await contract.getFeeDetails(tradeId);
   }
   async getTradeData(tradeId) {
-    return await this.contract.getTradeData(tradeId);
+    const contract = await this.getContract();
+    return await contract.getTradeData(tradeId);
   }
   async getManagement() {
-    return await this.contract.management();
+    const contract = await this.getContract();
+    return await contract.management();
   }
 };
 var routerService = new RouterService();
 
 // src/services/signer.service.ts
-import { JsonRpcProvider as JsonRpcProvider2 } from "ethers";
+import { JsonRpcProvider as JsonRpcProvider3 } from "ethers";
 var SignerService = class {
   constructor() {
     this.routerService = routerService;
-    this.provider = new JsonRpcProvider2(config.getRpcUrl());
+    this.provider = new JsonRpcProvider3(config.getRpcUrl());
     config.registerObserver(this);
   }
   /**
@@ -4211,7 +4262,7 @@ var SignerService = class {
    * Updates service when config changes
    */
   onConfigUpdate(newConfig) {
-    this.provider = new JsonRpcProvider2(newConfig.rpcUrl);
+    this.provider = new JsonRpcProvider3(newConfig.rpcUrl);
   }
   async getDomain() {
     const signerAddress = await this.routerService.getSigner();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimex-xyz/market-maker-sdk",
-  "version": "0.8.0-staging-d94762b",
+  "version": "0.8.0",
   "private": false,
   "publishConfig": {
     "access": "public"