fix: harden peer loading

package.json

@@ -44,12 +44,12 @@
     "@layerzerolabs/lz-v2-utilities": "^2.1.27",
     "@masa-finance/masa-contracts-identity": "^1.12.0",
     "@masa-finance/masa-contracts-marketplace": "^2.1.16",
-    "@masa-finance/masa-token": "^2.5.0",
+    "@masa-finance/masa-token": "^2.6.0",
     "arweave": "1.11.8",
     "axios": "^1.6.8",
     "ethers": "~5.7.2",
     "grapheme-splitter": "^1.0.4",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.4"
   },
   "devDependencies": {
     "@types/chai": "^4.3.14",

src/modules/token/swap.ts

@@ -11,7 +11,7 @@ import {
 import { SendParamStruct as SendParamStructMasaToken } from "@masa-finance/masa-token/dist/typechain/contracts/MasaToken";
 import { SendParamStruct as SendParamStructMasaTokenNativeOFT } from "@masa-finance/masa-token/dist/typechain/contracts/MasaTokenNativeOFT";
 import { SendParamStruct as SendParamStructMasaTokenOFT } from "@masa-finance/masa-token/dist/typechain/contracts/MasaTokenOFT";
-import { BigNumber, utils } from "ethers";
+import { BigNumber, constants, utils } from "ethers";
 
 import { Messages, SupportedNetworks } from "../../collections";
 import { MasaInterface, NetworkName } from "../../interface";
@@ -185,11 +185,9 @@ export const swap = async (
 
   // current wallet
   const address = await masa.config.signer.getAddress();
+  const { lzEndpointId: toEID } = SupportedNetworks[to] ?? {};
 
-  const toNetwork = SupportedNetworks[to];
-  const toEID = toNetwork?.lzEndpointId;
-
-  if (!masa.config.network?.addresses.tokens?.MASA || !toNetwork || !toEID) {
+  if (!masa.config.network?.addresses.tokens?.MASA || !toEID) {
     console.log(`Unable to swap from ${masa.config.networkName} to ${to}!`);
     return;
   }
@@ -217,14 +215,11 @@ export const swap = async (
   try {
     const { send } = oft;
 
-    const isPeer = await oft.isPeer(
-      toEID,
-      utils.zeroPad(toNetwork.addresses?.tokens?.MASA ?? "", 32),
-    );
+    const peer = await oft.peers(toEID);
 
-    if (!isPeer) {
+    if (peer === utils.hexZeroPad(constants.AddressZero, 32)) {
       console.error(
-        `'${toNetwork.addresses?.tokens?.MASA}' is not a registered peer for network ${toEID}!`,
+        `'${oft.address}' has no registered peer for network ${toEID}!`,
       );
       return;
     }

yarn.lock

@@ -503,10 +503,10 @@
   dependencies:
     ethers "~5.7.2"
 
-"@masa-finance/masa-token@^2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@masa-finance/masa-token/-/masa-token-2.5.0.tgz#3afa223c223cdf56a9d10b80480a3c4ed69c06ce"
-  integrity sha512-s+ig3d6y+Z3Xdswdbbdv+U6P3e37gWYGCoLPgsIDi01Llg3T9ghOWaiNlYF1+C18ygSM8+DuRS3IwpAS4U70mw==
+"@masa-finance/masa-token@^2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@masa-finance/masa-token/-/masa-token-2.6.0.tgz#ba17912ac544d3ede3bd99d31ba65cf48619c4da"
+  integrity sha512-8cP1+Cc7ijvg2Q1TQI/7KFZ0VjFlLeCGFWvzkrsTeSpxHVP+E26ofB2cTxZjv7VNV1pPJ1gGo0diWFE7tMsN/Q==
 
 "@noble/curves@^1.2.0":
   version "1.4.0"
@@ -3518,10 +3518,10 @@ typedoc@^0.25.9:
     minimatch "^9.0.3"
     shiki "^0.14.7"
 
-typescript@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
-  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
+typescript@^5.4.4:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.4.tgz#eb2471e7b0a5f1377523700a21669dce30c2d952"
+  integrity sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==
 
 uglify-js@^3.1.4:
   version "3.17.4"