Make relayer print exception details
This commit is contained in:
parent
8c70f88306
commit
1e1684f4cc
|
@ -590,11 +590,23 @@ async function relayVaa(vaaBytes: string, t3Payload: Type3Payload) {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (t3Payload.contractAddress === ethContractData.contractAddress) {
|
if (t3Payload.contractAddress === ethContractData.contractAddress) {
|
||||||
await relayVaaToChain(ethContractData, signedVaaArray, exactIn, native);
|
await relayVaaToChain(
|
||||||
|
t3Payload,
|
||||||
|
ethContractData,
|
||||||
|
signedVaaArray,
|
||||||
|
exactIn,
|
||||||
|
native
|
||||||
|
);
|
||||||
} else if (
|
} else if (
|
||||||
t3Payload.contractAddress === polygonContractData.contractAddress
|
t3Payload.contractAddress === polygonContractData.contractAddress
|
||||||
) {
|
) {
|
||||||
await relayVaaToChain(polygonContractData, signedVaaArray, exactIn, native);
|
await relayVaaToChain(
|
||||||
|
t3Payload,
|
||||||
|
polygonContractData,
|
||||||
|
signedVaaArray,
|
||||||
|
exactIn,
|
||||||
|
native
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
logger.error(
|
logger.error(
|
||||||
"relayVaa: unexpected contract: [" +
|
"relayVaa: unexpected contract: [" +
|
||||||
|
@ -605,6 +617,7 @@ async function relayVaa(vaaBytes: string, t3Payload: Type3Payload) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function relayVaaToChain(
|
async function relayVaaToChain(
|
||||||
|
t3Payload: Type3Payload,
|
||||||
tcd: TargetContractData,
|
tcd: TargetContractData,
|
||||||
signedVaaArray: Uint8Array,
|
signedVaaArray: Uint8Array,
|
||||||
exactIn: boolean,
|
exactIn: boolean,
|
||||||
|
@ -631,7 +644,9 @@ async function relayVaaToChain(
|
||||||
logger.info(
|
logger.info(
|
||||||
"relayVaaTo" +
|
"relayVaaTo" +
|
||||||
tcd.name +
|
tcd.name +
|
||||||
": exactIn: " +
|
": contract: [" +
|
||||||
|
t3Payload.contractAddress +
|
||||||
|
"], exactIn: " +
|
||||||
exactIn +
|
exactIn +
|
||||||
", native: " +
|
", native: " +
|
||||||
native +
|
native +
|
||||||
|
@ -650,72 +665,69 @@ async function relayVaaToChain(
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"relayVaaTo" + tcd.name + ": exactIn: " + exactIn + ", native: " + native
|
"relayVaaTo" +
|
||||||
|
tcd.name +
|
||||||
|
": contract: [" +
|
||||||
|
t3Payload.contractAddress +
|
||||||
|
"], exactIn: " +
|
||||||
|
exactIn +
|
||||||
|
", native: " +
|
||||||
|
native
|
||||||
);
|
);
|
||||||
if (exactIn) {
|
|
||||||
if (native) {
|
try {
|
||||||
await swap
|
let receipt: any = null;
|
||||||
.swapExactInFromVaaNative(tcd.contractWithSigner, signedVaaArray)
|
if (exactIn) {
|
||||||
.then((receipt) => {
|
if (native) {
|
||||||
logger.info(
|
receipt = await swap.swapExactInFromVaaNative(
|
||||||
"relayVaaTo" + tcd.name + ": %o",
|
tcd.contractWithSigner,
|
||||||
receipt.transactionHash
|
signedVaaArray
|
||||||
);
|
);
|
||||||
})
|
} else {
|
||||||
.catch((error) => {
|
receipt = await swap.swapExactInFromVaaToken(
|
||||||
logger.error(
|
tcd.contractWithSigner,
|
||||||
"relayVaaTo" + tcd.name + ": transaction failed: %o",
|
signedVaaArray
|
||||||
error.transactionHash
|
);
|
||||||
);
|
}
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
await swap
|
if (native) {
|
||||||
.swapExactInFromVaaToken(tcd.contractWithSigner, signedVaaArray)
|
receipt = await swap.swapExactOutFromVaaNative(
|
||||||
.then((receipt) => {
|
tcd.contractWithSigner,
|
||||||
logger.info(
|
signedVaaArray
|
||||||
"relayVaaTo" + tcd.name + ": %o",
|
);
|
||||||
receipt.transactionHash
|
} else {
|
||||||
);
|
receipt = await swap.swapExactOutFromVaaToken(
|
||||||
})
|
tcd.contractWithSigner,
|
||||||
.catch((error) => {
|
signedVaaArray
|
||||||
logger.error(
|
);
|
||||||
"relayVaaTo" + tcd.name + ": transaction failed: %o",
|
}
|
||||||
error.transactionHash
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (native) {
|
|
||||||
await swap
|
|
||||||
.swapExactOutFromVaaNative(tcd.contractWithSigner, signedVaaArray)
|
|
||||||
.then((receipt) => {
|
|
||||||
logger.info(
|
|
||||||
"relayVaaTo" + tcd.name + ": %o",
|
|
||||||
receipt.transactionHash
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
logger.error(
|
|
||||||
"relayVaaTo" + tcd.name + ": transaction failed: %o",
|
|
||||||
error.transactionHash
|
|
||||||
);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
await swap
|
|
||||||
.swapExactOutFromVaaToken(tcd.contractWithSigner, signedVaaArray)
|
|
||||||
.then((receipt) => {
|
|
||||||
logger.info(
|
|
||||||
"relayVaaTo" + tcd.name + ": %o",
|
|
||||||
receipt.transactionHash
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
logger.error(
|
|
||||||
"relayVaaTo" + tcd.name + ": transaction failed: %o",
|
|
||||||
error.transactionHash
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"relayVaaTo" +
|
||||||
|
tcd.name +
|
||||||
|
": contract: [" +
|
||||||
|
t3Payload.contractAddress +
|
||||||
|
"], exactIn: " +
|
||||||
|
exactIn +
|
||||||
|
", native: " +
|
||||||
|
native +
|
||||||
|
" succeeded, txHash: " +
|
||||||
|
receipt.transactionHash
|
||||||
|
);
|
||||||
|
} catch (e: any) {
|
||||||
|
logger.error(
|
||||||
|
"relayVaaTo" +
|
||||||
|
tcd.name +
|
||||||
|
": contract: [" +
|
||||||
|
t3Payload.contractAddress +
|
||||||
|
"], exactIn: " +
|
||||||
|
exactIn +
|
||||||
|
", native: " +
|
||||||
|
native +
|
||||||
|
": transaction failed: %o",
|
||||||
|
e
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -737,7 +749,9 @@ async function relayVaaToChain(
|
||||||
logger.info(
|
logger.info(
|
||||||
"relayVaaTo" +
|
"relayVaaTo" +
|
||||||
tcd.name +
|
tcd.name +
|
||||||
": exactIn: " +
|
": contract: [" +
|
||||||
|
t3Payload.contractAddress +
|
||||||
|
"], exactIn: " +
|
||||||
exactIn +
|
exactIn +
|
||||||
", native: " +
|
", native: " +
|
||||||
native +
|
native +
|
||||||
|
|
Loading…
Reference in New Issue