@optimex-xyz/market-maker-sdk 0.9.0-dev-f1b970c → 0.9.0-dev-b026721

package/dist/index.mjs

@@ -10,48 +10,24 @@ var environments = {
     backendUrl: "https://api-dev.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
     protocolFetcherProxyAddress: "0x0267Fc04eE866b31907dEe123aBdCdB67d03B297",
-    paymentAddressMap: {
-      ethereum_sepolia: "0x1d8b58438D5Ccc8Fcb4b738C89078f7b4168C9c0"
-    },
-    liquidationAddressMap: {
-      ethereum_sepolia: "0x1A0a58aF331Cc792Db92CFD9fE5E3124639E2a80"
-    },
     isTestnet: true
   },
   staging: {
     backendUrl: "https://api-stg.bitdex.xyz",
     rpcUrl: "https://rpc-bitfi-p00c4t1rul.t.conduit.xyz",
     protocolFetcherProxyAddress: "0x7c07151ca4DFd93F352Ab9B132A95866697c38c2",
-    paymentAddressMap: {
-      ethereum_sepolia: "0x7387DcCfE2f1D5F80b4ECDF91eF58541517e90D2"
-    },
-    liquidationAddressMap: {
-      ethereum_sepolia: "0x1CcD45Be1508E70d760b11b32ccd5Ac288756b1a"
-    },
     isTestnet: true
   },
   prelive: {
     backendUrl: "https://pre-api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
-    paymentAddressMap: {
-      ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
-    },
-    liquidationAddressMap: {
-      ethereum_sepolia: "0x1CcD45Be1508E70d760b11b32ccd5Ac288756b1a"
-    },
     isTestnet: false
   },
   production: {
     backendUrl: "https://api.optimex.xyz",
     rpcUrl: "https://rpc.optimex.xyz",
     protocolFetcherProxyAddress: "0xFDEd4CEf9aE1E03D0BeF161262a266c1c157a32b",
-    paymentAddressMap: {
-      ethereum: "0x0A497AC4261E37FA4062762C23Cf3cB642C839b8"
-    },
-    liquidationAddressMap: {
-      ethereum_sepolia: "0x1CcD45Be1508E70d760b11b32ccd5Ac288756b1a"
-    },
     isTestnet: false
   }
 };
@@ -104,12 +80,6 @@ var Config = class {
   getRpcUrl() {
     return this.config.rpcUrl;
   }
-  getPaymentAddress(networkId) {
-    return this.config.paymentAddressMap[networkId];
-  }
-  getLiquidationAddress(networkId) {
-    return this.config.liquidationAddressMap[networkId];
-  }
   getProtocolFetcherAddress() {
     return this.config.protocolFetcherProxyAddress;
   }
@@ -2406,6 +2376,27 @@ var _abi4 = [
     stateMutability: "nonpayable",
     type: "constructor"
   },
+  {
+    inputs: [],
+    name: "AccessControlBadConfirmation",
+    type: "error"
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
+      {
+        internalType: "bytes32",
+        name: "neededRole",
+        type: "bytes32"
+      }
+    ],
+    name: "AccessControlUnauthorizedAccount",
+    type: "error"
+  },
   {
     inputs: [],
     name: "AddressZero",
@@ -2416,6 +2407,94 @@ var _abi4 = [
     name: "Unauthorized",
     type: "error"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "previousAdminRole",
+        type: "bytes32"
+      },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "newAdminRole",
+        type: "bytes32"
+      }
+    ],
+    name: "RoleAdminChanged",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "sender",
+        type: "address"
+      }
+    ],
+    name: "RoleGranted",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "sender",
+        type: "address"
+      }
+    ],
+    name: "RoleRevoked",
+    type: "event"
+  },
+  {
+    inputs: [],
+    name: "DEFAULT_ADMIN_ROLE",
+    outputs: [
+      {
+        internalType: "bytes32",
+        name: "",
+        type: "bytes32"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -2577,6 +2656,87 @@ var _abi4 = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      }
+    ],
+    name: "getRoleAdmin",
+    outputs: [
+      {
+        internalType: "bytes32",
+        name: "",
+        type: "bytes32"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "uint256",
+        name: "index",
+        type: "uint256"
+      }
+    ],
+    name: "getRoleMember",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      }
+    ],
+    name: "getRoleMemberCount",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      }
+    ],
+    name: "getRoleMembers",
+    outputs: [
+      {
+        internalType: "address[]",
+        name: "",
+        type: "address[]"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -2637,6 +2797,48 @@ var _abi4 = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "grantRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "hasRole",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -2843,6 +3045,42 @@ var _abi4 = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "callerConfirmation",
+        type: "address"
+      }
+    ],
+    name: "renounceRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "revokeRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [],
     name: "router",
@@ -2920,6 +3158,25 @@ var _abi4 = [
     ],
     stateMutability: "view",
     type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes4",
+        name: "interfaceId",
+        type: "bytes4"
+      }
+    ],
+    name: "supportsInterface",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
   }
 ];
 var ProtocolFetcherProxy__factory = class {
@@ -4784,11 +5041,76 @@ var Signer__factory = class {
 Signer__factory.abi = _abi6;
 
 // src/services/protocol.service.ts
-import { ethers, JsonRpcProvider } from "ethers";
+import { ethers, JsonRpcProvider, keccak256, toUtf8Bytes } from "ethers";
+
+// src/shared/network.ts
+var OptimexEvmNetwork = /* @__PURE__ */ ((OptimexEvmNetwork3) => {
+  OptimexEvmNetwork3["EthereumSepolia"] = "ethereum_sepolia";
+  OptimexEvmNetwork3["EthereumMainnet"] = "ethereum";
+  OptimexEvmNetwork3["BaseTestnet"] = "base_sepolia";
+  OptimexEvmNetwork3["BaseMainnet"] = "base";
+  OptimexEvmNetwork3["ArbitrumSepolia"] = "arbitrum_sepolia";
+  OptimexEvmNetwork3["Arbitrum"] = "arbitrum";
+  OptimexEvmNetwork3["OptimismSepolia"] = "optimism_sepolia";
+  OptimexEvmNetwork3["Optimism"] = "optimism";
+  OptimexEvmNetwork3["BSC"] = "bsc";
+  return OptimexEvmNetwork3;
+})(OptimexEvmNetwork || {});
+var OptimexL2Network = /* @__PURE__ */ ((OptimexL2Network2) => {
+  OptimexL2Network2["Testnet"] = "optimex_testnet";
+  OptimexL2Network2["Mainnet"] = "optimex";
+  return OptimexL2Network2;
+})(OptimexL2Network || {});
+var OptimexBtcNetwork = /* @__PURE__ */ ((OptimexBtcNetwork2) => {
+  OptimexBtcNetwork2["BitcoinTestnet"] = "bitcoin_testnet";
+  OptimexBtcNetwork2["BitcoinMainnet"] = "bitcoin";
+  return OptimexBtcNetwork2;
+})(OptimexBtcNetwork || {});
+var OptimexSolanaNetwork = /* @__PURE__ */ ((OptimexSolanaNetwork2) => {
+  OptimexSolanaNetwork2["SolanaDevnet"] = "solana_devnet";
+  OptimexSolanaNetwork2["SolanaMainnet"] = "solana";
+  return OptimexSolanaNetwork2;
+})(OptimexSolanaNetwork || {});
+var OptimexLendingNetwork = /* @__PURE__ */ ((OptimexLendingNetwork2) => {
+  OptimexLendingNetwork2["Morpho"] = "MORPHO";
+  return OptimexLendingNetwork2;
+})(OptimexLendingNetwork || {});
+var isEvmNetwork = (network) => {
+  return Object.values(OptimexEvmNetwork).includes(network);
+};
+var isBtcNetwork = (network) => {
+  return Object.values(OptimexBtcNetwork).includes(network);
+};
+var isSolanaNetwork = (network) => {
+  return Object.values(OptimexSolanaNetwork).includes(network);
+};
+var isL2Network = (network) => {
+  return Object.values(OptimexL2Network).includes(network);
+};
+
+// src/shared/role.ts
+var AssetChainContractRole = /* @__PURE__ */ ((AssetChainContractRole3) => {
+  AssetChainContractRole3["AcrossTransitVault"] = "AcrossTransitVault";
+  AssetChainContractRole3["Payment"] = "OptimexSwapPayment";
+  AssetChainContractRole3["OptimexManagement"] = "OptimexManagement";
+  AssetChainContractRole3["MorphoSupplier"] = "MorphoSupplier";
+  AssetChainContractRole3["MorphoLiquidator"] = "MorphoLiquidator";
+  AssetChainContractRole3["MorphoManagement"] = "MorphoManagement";
+  return AssetChainContractRole3;
+})(AssetChainContractRole || {});
+var L2ContractRole = /* @__PURE__ */ ((L2ContractRole3) => {
+  L2ContractRole3["MorphoAdapter"] = "MorphoAdapter";
+  L2ContractRole3["MorphoMarketRegistry"] = "MorphoMarketRegistry";
+  L2ContractRole3["AcrossRefund"] = "AcrossRefund";
+  return L2ContractRole3;
+})(L2ContractRole || {});
+
+// src/services/protocol.service.ts
 var ProtocolService = class {
   constructor() {
     this.provider = new JsonRpcProvider(config.getRpcUrl());
     this.contract = ProtocolFetcherProxy__factory.connect(config.getProtocolFetcherAddress(), this.provider);
+    this.l2Network = config.isTestnet() ? "optimex_testnet" /* Testnet */ : "optimex" /* Mainnet */;
     config.registerObserver(this);
   }
   /**
@@ -4798,6 +5120,7 @@ var ProtocolService = class {
   onConfigUpdate(newConfig) {
     this.provider = new JsonRpcProvider(newConfig.rpcUrl);
     this.contract = ProtocolFetcherProxy__factory.connect(newConfig.protocolFetcherProxyAddress, this.provider);
+    this.l2Network = newConfig.isTestnet ? "optimex_testnet" /* Testnet */ : "optimex" /* Mainnet */;
   }
   async getCurrentPubkey(network) {
     return this.contract.getLatestMPCInfo(ethers.toUtf8Bytes(network));
@@ -4819,6 +5142,14 @@ var ProtocolService = class {
   async getRouter() {
     return this.contract.router();
   }
+  async getAssetChainConfig(network, role) {
+    const hashRole = keccak256(toUtf8Bytes([network, role].join(":")));
+    return this.contract.getRoleMembers(hashRole);
+  }
+  async getL2Config(role) {
+    const hashRole = keccak256(toUtf8Bytes([this.l2Network, role].join(":")));
+    return this.contract.getRoleMembers(hashRole);
+  }
 };
 var protocolService = new ProtocolService();
 
@@ -5240,20 +5571,20 @@ async function defaultDomain(signerHelper, provider) {
 }
 
 // src/signatures/getInfoHash.ts
-import { AbiCoder, keccak256 } from "ethers";
+import { AbiCoder, keccak256 as keccak2562 } from "ethers";
 var abiCoder = AbiCoder.defaultAbiCoder();
 function getTradeIdsHash(tradeIds) {
-  return keccak256(abiCoder.encode(["bytes32[]"], [tradeIds]));
+  return keccak2562(abiCoder.encode(["bytes32[]"], [tradeIds]));
 }
 function getMakePaymentHash(tradeIds, signedAt, startIdx, paymentTxId) {
-  const bundlerHash = keccak256(abiCoder.encode(["bytes32[]"], [tradeIds]));
-  const infoHash = keccak256(
+  const bundlerHash = keccak2562(abiCoder.encode(["bytes32[]"], [tradeIds]));
+  const infoHash = keccak2562(
     abiCoder.encode(["uint64", "uint256", "bytes32", "bytes"], [signedAt, startIdx, bundlerHash, paymentTxId])
   );
   return infoHash;
 }
 function getCommitInfoHash(pmmId, pmmRecvAddr, toChain, toToken, amountOut, expiry) {
-  const infoHash = keccak256(
+  const infoHash = keccak2562(
     abiCoder.encode(
       ["bytes32", "bytes", "bytes", "bytes", "uint256", "uint64"],
       [pmmId, pmmRecvAddr, toChain, toToken, amountOut, expiry]
@@ -5340,8 +5671,15 @@ async function getSignature(Signer2, provider, signerHelper, tradeId, infoHash,
   return await Signer2.signTypedData(domain ?? contractDomain, getSignatureType(type), values);
 }
 export {
+  AssetChainContractRole,
   ERC20__factory,
+  L2ContractRole,
   MorphoLiquidator__factory,
+  OptimexBtcNetwork,
+  OptimexEvmNetwork,
+  OptimexL2Network,
+  OptimexLendingNetwork,
+  OptimexSolanaNetwork,
   Payment__factory,
   ProtocolFetcherProxy__factory,
   ProtocolService,
@@ -5368,6 +5706,10 @@ export {
   getSignature,
   getSigner,
   getTradeIdsHash,
+  isBtcNetwork,
+  isEvmNetwork,
+  isL2Network,
+  isSolanaNetwork,
   makePaymentType,
   presignType,
   protocolService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimex-xyz/market-maker-sdk",
-  "version": "0.9.0-dev-f1b970c",
+  "version": "0.9.0-dev-b026721",
   "private": false,
   "publishConfig": {
     "access": "public"