Relayer support for more EVMs
This commit is contained in:
Bruce Riley
parent
f9870b03de
commit
ea822b5fb2
|
|
@ -1,12 +1,29 @@
|
|||
# TestNet
|
||||
SPY_SERVICE_HOST=localhost:7073
|
||||
SPY_SERVICE_FILTERS=[{"chain_id":2,"emitter_address":"0x000000000000000000000000f890982f9310df57d00f659cf4fd87e65aded8d7"},{"chain_id":3,"emitter_address":"terra1pseddrv0yfsn76u4zxrjmtf45kdlmalswdv39a"},{"chain_id":5,"emitter_address":"0x000000000000000000000000377d55a7928c046e18eebb61977e714d2a76472a"}]
|
||||
# You can omit the following to get signed VAAs from every emitter.
|
||||
#SPY_SERVICE_FILTERS=[{"chain_id":2,"emitter_address":"0x000000000000000000000000f890982f9310df57d00f659cf4fd87e65aded8d7"},{"chain_id":3,"emitter_address":"terra1pseddrv0yfsn76u4zxrjmtf45kdlmalswdv39a"},{"chain_id":4,"emitter_address":"0x0000000000000000000000009dcF9D205C9De35334D646BeE44b2D2859712A09"},{"chain_id":5,"emitter_address":"0x000000000000000000000000377d55a7928c046e18eebb61977e714d2a76472a"},{"chain_id":6,"emitter_address":"0x0000000000000000000000007bbcE28e64B3F8b84d876Ab298393c38ad7aac4C"}]
|
||||
|
||||
EVM_CHAINS=ETH,BSC,POLYGON,AVAX
|
||||
|
||||
ETH_PROVIDER=https://goerli.infura.io/v3/your_project_id
|
||||
ETH_TOKEN_BRIDGE_ADDRESS=0xF890982f9310df57d00f659cf4fd87e65adEd8d7
|
||||
ETH_CHAIN_ID=2
|
||||
ETH_ABI=V3
|
||||
|
||||
BSC_PROVIDER=
|
||||
BSC_TOKEN_BRIDGE_ADDRESS=0x9dcF9D205C9De35334D646BeE44b2D2859712A09
|
||||
BSC_CHAIN_ID=4
|
||||
BSC_ABI=V2
|
||||
|
||||
POLYGON_PROVIDER=https://polygon-mumbai.infura.io/v3/your_project_id
|
||||
POLYGON_TOKEN_BRIDGE_ADDRESS=0x377D55a7928c046E18eEbb61977e714d2a76472a
|
||||
POLYGON_CHAIN_ID=5
|
||||
POLYGON_ABI=V2
|
||||
|
||||
AVAX_PROVIDER=
|
||||
AVAX_TOKEN_BRIDGE_ADDRESS=0x61E44E506Ca5659E6c0bba9b678586fA2d729756
|
||||
AVAX_CHAIN_ID=6
|
||||
AVAX_ABI=V2
|
||||
|
||||
WALLET_PRIVATE_KEY=your_key_here
|
||||
|
||||
|
|
@ -20,6 +37,8 @@ TERRA_TOKEN_BRIDGE_ADDRESS=terra1pseddrv0yfsn76u4zxrjmtf45kdlmalswdv39a
|
|||
#LOG_DIR=/var/logs
|
||||
LOG_LEVEL=debug
|
||||
|
||||
ETH_CONTRACT_ADDRESS=0x61D26732B190bdc5771e2a2b3ADB295e1b5A88BF
|
||||
POLYGON_CONTRACT_ADDRESS=0xc5Ba16A974a0c0E7935285d99F496Ee65eDFB8BA
|
||||
TERRA_CONTRACT_ADDRESS=terra_contract_address
|
||||
ETH_CONTRACT_ADDRESS=0x9e7Cae3a46ED297b0a05FCEeb41160fC5218E14f
|
||||
BSC_CONTRACT_ADDRESS=0x0DC183c2eFAA5e1749B85f13621F5cC6aCcDa786
|
||||
POLYGON_CONTRACT_ADDRESS=0x72F2F646dC979a9fA8aA685B8a47b7afe2fE0516
|
||||
TERRA_CONTRACT_ADDRESS=terra163shc8unyqrndgcldaj2q9kgnqs82v0kgkhynf
|
||||
AVAX_CONTRACT_ADDRESS=0x52D8A50AF35b0760335F29a4D6aaF0604B7D7484
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
"cors": "^2.8.5",
|
||||
"dotenv": "^10.0.0",
|
||||
"ethers": "^5.5.3",
|
||||
"@terra-money/terra.js": "^2.0.14",
|
||||
"@terra-money/terra.js": "^3.0.4",
|
||||
"winston": "^3.3.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,29 @@
|
|||
import { Mutex } from "async-mutex";
|
||||
let CondVar = require("condition-variable");
|
||||
|
||||
import { getIsTransferCompletedEth } from "@certusone/wormhole-sdk";
|
||||
|
||||
import {
|
||||
importCoreWasm,
|
||||
setDefaultWasm,
|
||||
} from "@certusone/wormhole-sdk/lib/cjs/solana/wasm";
|
||||
getIsTransferCompletedEth,
|
||||
hexToUint8Array,
|
||||
} from "@certusone/wormhole-sdk";
|
||||
|
||||
import { ethers } from "ethers";
|
||||
|
||||
import { abi as SWAP_CONTRACT_V2_ABI } from "../../react/src/abi/contracts/CrossChainSwapV2.json";
|
||||
import { abi as SWAP_CONTRACT_V3_ABI } from "../../react/src/abi/contracts/CrossChainSwapV3.json";
|
||||
|
||||
import * as swap from "../../react/src/swapper/util";
|
||||
import * as swap from "../../react/src/swapper/helpers";
|
||||
|
||||
import { logger, OurEnvironment, Type3Payload } from "./index";
|
||||
|
||||
export type EvmEnvironment = {
|
||||
name: string;
|
||||
chain_id: number;
|
||||
provider_url: string;
|
||||
contract_address: string;
|
||||
token_bridge_address: string;
|
||||
wallet_private_key: string;
|
||||
abi_version: string;
|
||||
};
|
||||
|
||||
type EvmContractData = {
|
||||
chain_id: number;
|
||||
name: string;
|
||||
contractAddress: string;
|
||||
tokenBridgeAddress: string;
|
||||
|
|
@ -27,48 +33,136 @@ type EvmContractData = {
|
|||
contractWithSigner: ethers.Contract;
|
||||
};
|
||||
|
||||
let ethContractData: EvmContractData = null;
|
||||
let polygonContractData: EvmContractData = null;
|
||||
let evmContractData = new Map<number, EvmContractData>();
|
||||
|
||||
export function makeEvmContractData(env: OurEnvironment) {
|
||||
ethContractData = makeEthContractData(env);
|
||||
polygonContractData = makePolygonContractData(env);
|
||||
export function loadEvmConfig(): EvmEnvironment[] {
|
||||
let evm_configs: EvmEnvironment[] = [];
|
||||
let evms = process.env.EVM_CHAINS.split(",");
|
||||
for (const evm of evms) {
|
||||
let key_chain_id: string = evm + "_CHAIN_ID";
|
||||
let val_chain_id: string = eval("process.env." + key_chain_id);
|
||||
if (!val_chain_id) {
|
||||
logger.error("Missing environment variable " + key_chain_id);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let key_provider: string = evm + "_PROVIDER";
|
||||
let val_provider: string = eval("process.env." + key_provider);
|
||||
if (!val_provider) {
|
||||
logger.error("Missing environment variable " + key_provider);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let key_contract_address: string = evm + "_CONTRACT_ADDRESS";
|
||||
let val_contract_address: string = eval(
|
||||
"process.env." + key_contract_address
|
||||
);
|
||||
if (!val_contract_address) {
|
||||
logger.error("Missing environment variable " + key_contract_address);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let key_token_bridge_address: string = evm + "_TOKEN_BRIDGE_ADDRESS";
|
||||
let val_token_bridge_address: string = eval(
|
||||
"process.env." + key_token_bridge_address
|
||||
);
|
||||
if (!val_token_bridge_address) {
|
||||
logger.error("Missing environment variable " + key_token_bridge_address);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let key_wallet_private_key: string = evm + "_WALLET_PRIVATE_KEY";
|
||||
let val_wallet_private_key: string = eval(
|
||||
"process.env." + key_wallet_private_key
|
||||
);
|
||||
if (!val_wallet_private_key)
|
||||
val_wallet_private_key = process.env.WALLET_PRIVATE_KEY;
|
||||
if (!val_wallet_private_key) {
|
||||
logger.error(
|
||||
"Missing environment variable " +
|
||||
key_wallet_private_key +
|
||||
" or WALLET_PRIVATE_KEY"
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let key_abi_version: string = evm + "_ABI";
|
||||
let val_abi_version: string = eval("process.env." + key_abi_version);
|
||||
if (!val_abi_version) {
|
||||
logger.error("Missing environment variable " + key_abi_version);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (val_abi_version !== "V2" && val_abi_version !== "V3") {
|
||||
logger.error(
|
||||
"Invalid value of environment variable " +
|
||||
key_abi_version +
|
||||
", is [" +
|
||||
val_abi_version +
|
||||
"], must be either V2 or V3"
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
evm_configs.push({
|
||||
name: evm,
|
||||
chain_id: parseInt(val_chain_id),
|
||||
provider_url: val_provider,
|
||||
contract_address: val_contract_address,
|
||||
token_bridge_address: val_token_bridge_address,
|
||||
wallet_private_key: val_wallet_private_key,
|
||||
abi_version: val_abi_version,
|
||||
});
|
||||
}
|
||||
|
||||
return evm_configs;
|
||||
}
|
||||
|
||||
// Ethereum (Goerli) set up
|
||||
function makeEthContractData(env: OurEnvironment): EvmContractData {
|
||||
let contractAddress: string = env.eth_contract_address.toLowerCase();
|
||||
if (contractAddress.search("0x") == 0) {
|
||||
export function makeEvmContractData(envs: EvmEnvironment[]) {
|
||||
if (!envs) return;
|
||||
for (const evm of envs) {
|
||||
evmContractData.set(evm.chain_id, makeContractDataForEvm(evm));
|
||||
}
|
||||
}
|
||||
|
||||
function makeContractDataForEvm(env: EvmEnvironment): EvmContractData {
|
||||
let contractAddress: string = env.contract_address.toLowerCase();
|
||||
if (contractAddress.search("0x") === 0) {
|
||||
contractAddress = contractAddress.substring(2);
|
||||
}
|
||||
|
||||
logger.info(
|
||||
"Connecting to Ethereum: contract address: [" +
|
||||
"Connecting to " +
|
||||
env.name +
|
||||
": chain_id: " +
|
||||
env.chain_id +
|
||||
", contract address: [" +
|
||||
contractAddress +
|
||||
"], node: [" +
|
||||
env.eth_provider_url +
|
||||
env.provider_url +
|
||||
"], token bridge address: [" +
|
||||
env.eth_token_bridge_address +
|
||||
env.token_bridge_address +
|
||||
"], abi version: [" +
|
||||
env.abi_version +
|
||||
"]"
|
||||
);
|
||||
|
||||
const provider = new ethers.providers.StaticJsonRpcProvider(
|
||||
env.eth_provider_url
|
||||
);
|
||||
const provider = new ethers.providers.StaticJsonRpcProvider(env.provider_url);
|
||||
|
||||
const contract = new ethers.Contract(
|
||||
contractAddress,
|
||||
SWAP_CONTRACT_V3_ABI,
|
||||
env.abi_version == "V2" ? SWAP_CONTRACT_V2_ABI : SWAP_CONTRACT_V3_ABI,
|
||||
provider
|
||||
);
|
||||
|
||||
const wallet = new ethers.Wallet(env.evm_wallet_private_key, provider);
|
||||
const wallet = new ethers.Wallet(env.wallet_private_key, provider);
|
||||
const contractWithSigner = contract.connect(wallet);
|
||||
|
||||
return {
|
||||
name: "Ethereum",
|
||||
chain_id: env.chain_id,
|
||||
name: env.name,
|
||||
contractAddress: contractAddress,
|
||||
tokenBridgeAddress: env.eth_token_bridge_address,
|
||||
tokenBridgeAddress: env.token_bridge_address,
|
||||
contract: contract,
|
||||
provider: provider,
|
||||
wallet: wallet,
|
||||
|
|
@ -76,53 +170,12 @@ function makeEthContractData(env: OurEnvironment): EvmContractData {
|
|||
};
|
||||
}
|
||||
|
||||
// Polygon (Mumbai) set up
|
||||
function makePolygonContractData(env: OurEnvironment): EvmContractData {
|
||||
let contractAddress: string = env.polygon_contract_address.toLowerCase();
|
||||
if (contractAddress.search("0x") == 0) {
|
||||
contractAddress = contractAddress.substring(2);
|
||||
}
|
||||
|
||||
logger.info(
|
||||
"Connecting to Polygon: contract address: [" +
|
||||
contractAddress +
|
||||
"], node: [" +
|
||||
env.polygon_provider_url +
|
||||
"], token bridge address: [" +
|
||||
env.polygon_token_bridge_address +
|
||||
"]"
|
||||
);
|
||||
|
||||
const provider = new ethers.providers.StaticJsonRpcProvider(
|
||||
env.polygon_provider_url
|
||||
);
|
||||
|
||||
const contract = new ethers.Contract(
|
||||
contractAddress,
|
||||
SWAP_CONTRACT_V2_ABI,
|
||||
provider
|
||||
);
|
||||
|
||||
const wallet = new ethers.Wallet(env.evm_wallet_private_key, provider);
|
||||
const contractWithSigner = contract.connect(wallet);
|
||||
|
||||
return {
|
||||
name: "Polygon",
|
||||
contractAddress: contractAddress,
|
||||
tokenBridgeAddress: env.polygon_token_bridge_address,
|
||||
contract: contract,
|
||||
provider: provider,
|
||||
wallet: wallet,
|
||||
contractWithSigner: contractWithSigner,
|
||||
};
|
||||
}
|
||||
|
||||
export function isEvmContract(contractAddress: string): boolean {
|
||||
return (
|
||||
(ethContractData && contractAddress === ethContractData.contractAddress) ||
|
||||
(polygonContractData &&
|
||||
contractAddress === polygonContractData.contractAddress)
|
||||
);
|
||||
export function isEvmContract(
|
||||
contractAddress: string,
|
||||
chain_id: number
|
||||
): boolean {
|
||||
let ecd = evmContractData.get(chain_id);
|
||||
return ecd && ecd.contractAddress === contractAddress;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -177,16 +230,24 @@ export function isEvmContract(contractAddress: string): boolean {
|
|||
}
|
||||
*/
|
||||
|
||||
export async function relayVaaToEvm(
|
||||
signedVaaArray: Uint8Array,
|
||||
t3Payload: Type3Payload
|
||||
) {
|
||||
export async function relayVaaToEvm(vaaBytes: string, t3Payload: Type3Payload) {
|
||||
let ecd = evmContractData.get(t3Payload.targetChainId);
|
||||
if (!ecd) {
|
||||
logger.error(
|
||||
"relayVaaToEvm: chain id " + t3Payload.targetChainId + " does not exist!"
|
||||
);
|
||||
}
|
||||
|
||||
let exactIn: boolean = false;
|
||||
let error: boolean = false;
|
||||
if (t3Payload.swapFunctionType === 1) {
|
||||
exactIn = true;
|
||||
} else if (t3Payload.swapFunctionType !== 2) {
|
||||
error = true;
|
||||
logger.error(
|
||||
"relayVaa: unsupported swapFunctionType: [" +
|
||||
"relayVaaTo" +
|
||||
ecd.name +
|
||||
": unsupported swapFunctionType: [" +
|
||||
t3Payload.swapFunctionType +
|
||||
"]"
|
||||
);
|
||||
|
|
@ -196,48 +257,30 @@ export async function relayVaaToEvm(
|
|||
if (t3Payload.swapCurrencyType === 1) {
|
||||
native = true;
|
||||
} else if (t3Payload.swapCurrencyType !== 2) {
|
||||
error = true;
|
||||
logger.error(
|
||||
"relayVaa: unsupported swapCurrencyType: [" +
|
||||
"relayVaaTo" +
|
||||
ecd.name +
|
||||
": unsupported swapCurrencyType: [" +
|
||||
t3Payload.swapCurrencyType +
|
||||
"]"
|
||||
);
|
||||
}
|
||||
|
||||
if (error) return;
|
||||
|
||||
logger.debug(
|
||||
"relayVaa: contractAddress: [" +
|
||||
"relayVaaTo" +
|
||||
ecd.name +
|
||||
": chain_id: " +
|
||||
ecd.chain_id +
|
||||
", contractAddress: [" +
|
||||
t3Payload.contractAddress +
|
||||
"], ethContract: [" +
|
||||
ethContractData.contractAddress +
|
||||
"], polygonContract[" +
|
||||
polygonContractData.contractAddress +
|
||||
"]"
|
||||
);
|
||||
|
||||
if (t3Payload.contractAddress === ethContractData.contractAddress) {
|
||||
await relayVaaToEvmChain(
|
||||
t3Payload,
|
||||
ethContractData,
|
||||
signedVaaArray,
|
||||
exactIn,
|
||||
native
|
||||
);
|
||||
} else if (
|
||||
t3Payload.contractAddress === polygonContractData.contractAddress
|
||||
) {
|
||||
await relayVaaToEvmChain(
|
||||
t3Payload,
|
||||
polygonContractData,
|
||||
signedVaaArray,
|
||||
exactIn,
|
||||
native
|
||||
);
|
||||
} else {
|
||||
logger.error(
|
||||
"relayVaa: unexpected contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"], this should not happen!"
|
||||
);
|
||||
}
|
||||
const signedVaaArray = hexToUint8Array(vaaBytes);
|
||||
await relayVaaToEvmChain(t3Payload, ecd, signedVaaArray, exactIn, native);
|
||||
}
|
||||
|
||||
async function relayVaaToEvmChain(
|
||||
|
|
@ -289,24 +332,28 @@ async function relayVaaToEvmChain(
|
|||
let receipt: any = null;
|
||||
if (exactIn) {
|
||||
if (native) {
|
||||
receipt = await swap.swapExactInFromVaaNative(
|
||||
logger.debug("relayVaaTo: calling evmSwapExactInFromVaaNative()");
|
||||
receipt = await swap.evmSwapExactInFromVaaNative(
|
||||
tcd.contractWithSigner,
|
||||
signedVaaArray
|
||||
);
|
||||
} else {
|
||||
receipt = await swap.swapExactInFromVaaToken(
|
||||
logger.debug("relayVaaTo: calling evmSwapExactInFromVaaToken()");
|
||||
receipt = await swap.evmSwapExactInFromVaaToken(
|
||||
tcd.contractWithSigner,
|
||||
signedVaaArray
|
||||
);
|
||||
}
|
||||
} else {
|
||||
if (native) {
|
||||
receipt = await swap.swapExactOutFromVaaNative(
|
||||
logger.debug("relayVaaTo: calling evmSwapExactOutFromVaaNative()");
|
||||
receipt = await swap.evmSwapExactOutFromVaaNative(
|
||||
tcd.contractWithSigner,
|
||||
signedVaaArray
|
||||
);
|
||||
} else {
|
||||
receipt = await swap.swapExactOutFromVaaToken(
|
||||
logger.debug("relayVaaTo: calling evmSwapExactOutFromVaaToken()");
|
||||
receipt = await swap.evmSwapExactOutFromVaaToken(
|
||||
tcd.contractWithSigner,
|
||||
signedVaaArray
|
||||
);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import {
|
|||
getEmitterAddressEth,
|
||||
getEmitterAddressSolana,
|
||||
getEmitterAddressTerra,
|
||||
getIsTransferCompletedEth,
|
||||
} from "@certusone/wormhole-sdk";
|
||||
|
||||
import {
|
||||
|
|
@ -25,17 +24,20 @@ import {
|
|||
|
||||
import { ethers } from "ethers";
|
||||
|
||||
import { abi as SWAP_CONTRACT_V2_ABI } from "../../react/src/abi/contracts/CrossChainSwapV2.json";
|
||||
import { abi as SWAP_CONTRACT_V3_ABI } from "../../react/src/abi/contracts/CrossChainSwapV3.json";
|
||||
|
||||
import * as swap from "../../react/src/swapper/util";
|
||||
|
||||
import { isEvmContract, makeEvmContractData, relayVaaToEvm } from "./evm";
|
||||
import {
|
||||
EvmEnvironment,
|
||||
isEvmContract,
|
||||
loadEvmConfig,
|
||||
makeEvmContractData,
|
||||
relayVaaToEvm,
|
||||
} from "./evm";
|
||||
|
||||
import {
|
||||
isTerraContract,
|
||||
loadTerraConfig,
|
||||
makeTerraContractData,
|
||||
relayVaaToTerra,
|
||||
TerraEnvironment,
|
||||
} from "./terra";
|
||||
|
||||
export let logger: any;
|
||||
|
|
@ -54,34 +56,8 @@ export type OurEnvironment = {
|
|||
spy_host: string;
|
||||
spy_filters: string;
|
||||
|
||||
eth_provider_url: string;
|
||||
eth_contract_address: string;
|
||||
eth_token_bridge_address: string;
|
||||
|
||||
polygon_provider_url: string;
|
||||
polygon_contract_address: string;
|
||||
polygon_token_bridge_address: string;
|
||||
|
||||
evm_wallet_private_key: string;
|
||||
|
||||
terraEnabled: boolean;
|
||||
terra_provider_url: string;
|
||||
terra_chain_id: string;
|
||||
terra_name: string;
|
||||
terra_contract_address: string;
|
||||
terra_token_bridge_address: string;
|
||||
terra_wallet_private_key: string;
|
||||
terra_gas_price_url: string;
|
||||
};
|
||||
|
||||
type EvmContractData = {
|
||||
name: string;
|
||||
contractAddress: string;
|
||||
tokenBridgeAddress: string;
|
||||
contract: ethers.Contract;
|
||||
provider: ethers.providers.StaticJsonRpcProvider;
|
||||
wallet: ethers.Wallet;
|
||||
contractWithSigner: ethers.Contract;
|
||||
evm_configs: EvmEnvironment[];
|
||||
terra_config: TerraEnvironment;
|
||||
};
|
||||
|
||||
export type Type3Payload = {
|
||||
|
|
@ -112,16 +88,14 @@ let pendingQueue = new Array<PendingEvent>();
|
|||
|
||||
if (success) {
|
||||
logger.info(
|
||||
"swap_relay starting up, will listen for signed VAAs from [" +
|
||||
"swap_relayer starting up, will listen for signed VAAs from [" +
|
||||
env.spy_host +
|
||||
"]"
|
||||
);
|
||||
|
||||
try {
|
||||
makeEvmContractData(env);
|
||||
if (env.terraEnabled) {
|
||||
makeTerraContractData(env);
|
||||
}
|
||||
makeEvmContractData(env.evm_configs);
|
||||
makeTerraContractData(env.terra_config);
|
||||
} catch (e: any) {
|
||||
logger.error("failed to connect to target contracts: %o", e);
|
||||
success = false;
|
||||
|
|
@ -139,98 +113,22 @@ function loadConfig(): [boolean, OurEnvironment] {
|
|||
return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.ETH_PROVIDER) {
|
||||
logger.error("Missing environment variable ETH_PROVIDER");
|
||||
return [false, undefined];
|
||||
}
|
||||
if (!process.env.ETH_CONTRACT_ADDRESS) {
|
||||
logger.error("Missing environment variable ETH_CONTRACT_ADDRESS");
|
||||
return [false, undefined];
|
||||
}
|
||||
if (!process.env.ETH_TOKEN_BRIDGE_ADDRESS) {
|
||||
logger.error("Missing environment variable ETH_TOKEN_BRIDGE_ADDRESS");
|
||||
return [false, undefined];
|
||||
let evm_configs: EvmEnvironment[] = null;
|
||||
if (process.env.EVM_CHAINS) {
|
||||
evm_configs = loadEvmConfig();
|
||||
if (!evm_configs) return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.POLYGON_PROVIDER) {
|
||||
logger.error("Missing environment variable POLYGON_PROVIDER");
|
||||
return [false, undefined];
|
||||
}
|
||||
if (!process.env.POLYGON_CONTRACT_ADDRESS) {
|
||||
logger.error("Missing environment variable POLYGON_CONTRACT_ADDRESS");
|
||||
return [false, undefined];
|
||||
}
|
||||
if (!process.env.POLYGON_TOKEN_BRIDGE_ADDRESS) {
|
||||
logger.error("Missing environment variable POLYGON_TOKEN_BRIDGE_ADDRESS");
|
||||
return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.WALLET_PRIVATE_KEY) {
|
||||
logger.error("Missing environment variable WALLET_PRIVATE_KEY");
|
||||
return [false, undefined];
|
||||
}
|
||||
|
||||
let terraEnabled: boolean = false;
|
||||
if (process.env.TERRA_PROVIDER) {
|
||||
terraEnabled = true;
|
||||
|
||||
if (!process.env.TERRA_CHAIN_ID) {
|
||||
logger.error("Missing environment variable WALLET_PRIVATE_KEY");
|
||||
return [false, undefined];
|
||||
throw "Missing environment variable TERRA_CHAIN_ID";
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_NAME) {
|
||||
logger.error("Missing environment variable WALLET_PRIVATE_KEY");
|
||||
return [false, undefined];
|
||||
throw "Missing environment variable TERRA_NAME";
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_WALLET_PRIVATE_KEY) {
|
||||
logger.error("Missing environment variable TERRA_WALLET_PRIVATE_KEY");
|
||||
return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_GAS_PRICE_URL) {
|
||||
logger.error("Missing environment variable TERRA_GAS_PRICE_URL");
|
||||
return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_CONTRACT_ADDRESS) {
|
||||
logger.error("Missing environment variable TERRA_CONTRACT_ADDRESS");
|
||||
return [false, undefined];
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_TOKEN_BRIDGE_ADDRESS) {
|
||||
logger.error("Missing environment variable TERRA_TOKEN_BRIDGE_ADDRESS");
|
||||
return [false, undefined];
|
||||
}
|
||||
}
|
||||
let terra_config = loadTerraConfig();
|
||||
if (!terra_config) return [false, undefined];
|
||||
|
||||
return [
|
||||
true,
|
||||
{
|
||||
spy_host: process.env.SPY_SERVICE_HOST,
|
||||
spy_filters: process.env.SPY_SERVICE_FILTERS,
|
||||
|
||||
eth_provider_url: process.env.ETH_PROVIDER,
|
||||
eth_contract_address: process.env.ETH_CONTRACT_ADDRESS,
|
||||
eth_token_bridge_address: process.env.ETH_TOKEN_BRIDGE_ADDRESS,
|
||||
|
||||
polygon_provider_url: process.env.POLYGON_PROVIDER,
|
||||
polygon_contract_address: process.env.POLYGON_CONTRACT_ADDRESS,
|
||||
polygon_token_bridge_address: process.env.POLYGON_TOKEN_BRIDGE_ADDRESS,
|
||||
|
||||
evm_wallet_private_key: process.env.WALLET_PRIVATE_KEY,
|
||||
|
||||
terraEnabled: terraEnabled,
|
||||
terra_provider_url: process.env.TERRA_PROVIDER,
|
||||
terra_chain_id: process.env.TERRA_CHAIN_ID,
|
||||
terra_name: process.env.TERRA_NAME,
|
||||
terra_contract_address: process.env.TERRA_CONTRACT_ADDRESS,
|
||||
terra_token_bridge_address: process.env.TERRA_TOKEN_BRIDGE_ADDRESS,
|
||||
terra_wallet_private_key: process.env.TERRA_WALLET_PRIVATE_KEY,
|
||||
terra_gas_price_url: process.env.TERRA_GAS_PRICE_URL,
|
||||
evm_configs: evm_configs,
|
||||
terra_config: terra_config,
|
||||
},
|
||||
];
|
||||
}
|
||||
|
|
@ -279,7 +177,7 @@ async function spy_listen() {
|
|||
processVaa(vaaBytes);
|
||||
});
|
||||
|
||||
logger.info("swap_relay waiting for transfer signed VAAs");
|
||||
logger.info("swap_relayer waiting for transfer signed VAAs");
|
||||
})();
|
||||
}
|
||||
|
||||
|
|
@ -300,10 +198,10 @@ async function encodeEmitterAddress(
|
|||
|
||||
async function processVaa(vaaBytes: string) {
|
||||
let receiveTime = new Date();
|
||||
logger.debug("processVaa");
|
||||
// logger.debug("processVaa");
|
||||
const { parse_vaa } = await importCoreWasm();
|
||||
const parsedVAA = parse_vaa(hexToUint8Array(vaaBytes));
|
||||
logger.debug("processVaa: parsedVAA: %o", parsedVAA);
|
||||
// logger.debug("processVaa: parsedVAA: %o", parsedVAA);
|
||||
|
||||
let emitter_address: string = uint8ArrayToHex(parsedVAA.emitter_address);
|
||||
|
||||
|
|
@ -333,7 +231,7 @@ async function processVaa(vaaBytes: string) {
|
|||
}
|
||||
|
||||
if (t3Payload) {
|
||||
if (isOurContract(t3Payload.contractAddress)) {
|
||||
if (isOurContract(t3Payload.contractAddress, t3Payload.targetChainId)) {
|
||||
logger.info(
|
||||
"enqueuing type 3 vaa: emitter: [" +
|
||||
parsedVAA.emitter_chain +
|
||||
|
|
@ -372,17 +270,17 @@ async function processVaa(vaaBytes: string) {
|
|||
"]"
|
||||
);
|
||||
}
|
||||
} else {
|
||||
logger.debug(
|
||||
"dropping vaa: emitter: [" +
|
||||
parsedVAA.emitter_chain +
|
||||
":" +
|
||||
emitter_address +
|
||||
"], seqNum: " +
|
||||
parsedVAA.sequence +
|
||||
" payloadType: " +
|
||||
parsedVAA.payload[0]
|
||||
);
|
||||
// } else {
|
||||
// logger.debug(
|
||||
// "dropping vaa: emitter: [" +
|
||||
// parsedVAA.emitter_chain +
|
||||
// ":" +
|
||||
// emitter_address +
|
||||
// "], seqNum: " +
|
||||
// parsedVAA.sequence +
|
||||
// " payloadType: " +
|
||||
// parsedVAA.payload[0]
|
||||
// );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -412,11 +310,6 @@ function decodeSignedVAAPayloadType3(parsedVAA: any): Type3Payload {
|
|||
payload.slice(67, 67 + 32).toString("hex") +
|
||||
"]"
|
||||
);
|
||||
logger.info(
|
||||
"decodeSignedVAAPayloadType3: terraContractAddr: [" +
|
||||
payload.slice(67, 67 + 32).toString() +
|
||||
"]"
|
||||
);
|
||||
|
||||
contractAddress = payload.slice(67, 67 + 32).toString("hex");
|
||||
} else {
|
||||
|
|
@ -431,21 +324,24 @@ function decodeSignedVAAPayloadType3(parsedVAA: any): Type3Payload {
|
|||
}
|
||||
|
||||
contractAddress = payload.slice(79, 79 + 20).toString("hex");
|
||||
swapFunctionType = payload.readUInt8(260);
|
||||
swapCurrencyType = payload.readUInt8(261);
|
||||
swapFunctionType = payload.readUInt8(272);
|
||||
swapCurrencyType = payload.readUInt8(273);
|
||||
}
|
||||
|
||||
return {
|
||||
targetChainId: targetChainId,
|
||||
contractAddress: payload.slice(79, 79 + 20).toString("hex"),
|
||||
contractAddress: contractAddress,
|
||||
relayerFee: ethers.BigNumber.from(payload.slice(101, 101 + 32)),
|
||||
swapFunctionType: swapFunctionType,
|
||||
swapCurrencyType: swapCurrencyType,
|
||||
};
|
||||
}
|
||||
|
||||
function isOurContract(contractAddress: string): boolean {
|
||||
return isEvmContract(contractAddress) || isTerraContract(contractAddress);
|
||||
function isOurContract(contractAddress: string, chainId: number): boolean {
|
||||
return (
|
||||
isEvmContract(contractAddress, chainId) ||
|
||||
isTerraContract(contractAddress, chainId)
|
||||
);
|
||||
}
|
||||
|
||||
async function postVaa(
|
||||
|
|
@ -533,14 +429,12 @@ async function callBack(err: any, result: any) {
|
|||
}
|
||||
|
||||
async function relayVaa(vaaBytes: string, t3Payload: Type3Payload) {
|
||||
const signedVaaArray = hexToUint8Array(vaaBytes);
|
||||
|
||||
if (t3Payload.targetChainId === 3) {
|
||||
relayVaaToTerra(t3Payload, signedVaaArray);
|
||||
await relayVaaToTerra(t3Payload, vaaBytes);
|
||||
return;
|
||||
}
|
||||
|
||||
relayVaaToEvm(signedVaaArray, t3Payload);
|
||||
await relayVaaToEvm(vaaBytes, t3Payload);
|
||||
}
|
||||
|
||||
///////////////////////////////// Start of logger stuff ///////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -1,20 +1,34 @@
|
|||
import {
|
||||
CHAIN_ID_TERRA,
|
||||
getIsTransferCompletedTerra,
|
||||
redeemOnTerra,
|
||||
uint8ArrayToHex,
|
||||
} from "@certusone/wormhole-sdk";
|
||||
|
||||
import {
|
||||
importCoreWasm,
|
||||
setDefaultWasm,
|
||||
} from "@certusone/wormhole-sdk/lib/cjs/solana/wasm";
|
||||
import axios from "axios";
|
||||
import { bech32 } from "bech32";
|
||||
import { zeroPad } from "ethers/lib/utils";
|
||||
import { fromUint8Array } from "js-base64";
|
||||
|
||||
import * as Terra from "@terra-money/terra.js";
|
||||
|
||||
import { logger, OurEnvironment, Type3Payload } from "./index";
|
||||
|
||||
export type TerraEnvironment = {
|
||||
terra_enabled: boolean;
|
||||
terra_provider_url: string;
|
||||
terra_chain_id: string;
|
||||
terra_name: string;
|
||||
terra_contract_address: string;
|
||||
terra_token_bridge_address: string;
|
||||
terra_wallet_private_key: string;
|
||||
terra_gas_price_url: string;
|
||||
};
|
||||
|
||||
type TerraContractData = {
|
||||
name: string;
|
||||
contractAddress: string;
|
||||
encodedContractAddress: string;
|
||||
tokenBridgeAddress: string;
|
||||
lcdConfig: Terra.LCDClientConfig;
|
||||
lcdClient: Terra.LCDClient;
|
||||
|
|
@ -24,15 +38,70 @@ type TerraContractData = {
|
|||
|
||||
let terraContractData: TerraContractData = null;
|
||||
|
||||
export function makeTerraContractData(env: OurEnvironment) {
|
||||
export function loadTerraConfig(): TerraEnvironment {
|
||||
let terra_enabled: boolean = false;
|
||||
if (process.env.TERRA_PROVIDER) {
|
||||
terra_enabled = true;
|
||||
|
||||
if (!process.env.TERRA_CHAIN_ID) {
|
||||
logger.error("Missing environment variable WALLET_PRIVATE_KEY");
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_NAME) {
|
||||
logger.error("Missing environment variable WALLET_PRIVATE_KEY");
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_WALLET_PRIVATE_KEY) {
|
||||
logger.error("Missing environment variable TERRA_WALLET_PRIVATE_KEY");
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_GAS_PRICE_URL) {
|
||||
logger.error("Missing environment variable TERRA_GAS_PRICE_URL");
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_CONTRACT_ADDRESS) {
|
||||
logger.error("Missing environment variable TERRA_CONTRACT_ADDRESS");
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!process.env.TERRA_TOKEN_BRIDGE_ADDRESS) {
|
||||
logger.error("Missing environment variable TERRA_TOKEN_BRIDGE_ADDRESS");
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
terra_enabled: terra_enabled,
|
||||
terra_provider_url: process.env.TERRA_PROVIDER,
|
||||
terra_chain_id: process.env.TERRA_CHAIN_ID,
|
||||
terra_name: process.env.TERRA_NAME,
|
||||
terra_contract_address: process.env.TERRA_CONTRACT_ADDRESS,
|
||||
terra_token_bridge_address: process.env.TERRA_TOKEN_BRIDGE_ADDRESS,
|
||||
terra_wallet_private_key: process.env.TERRA_WALLET_PRIVATE_KEY,
|
||||
terra_gas_price_url: process.env.TERRA_GAS_PRICE_URL,
|
||||
};
|
||||
}
|
||||
|
||||
export function makeTerraContractData(env: TerraEnvironment) {
|
||||
if (!env.terra_enabled) return;
|
||||
let contractAddress: string = env.terra_contract_address.toLowerCase();
|
||||
if (contractAddress.search("0x") == 0) {
|
||||
contractAddress = contractAddress.substring(2);
|
||||
}
|
||||
|
||||
let encodedContractAddress: string = Buffer.from(
|
||||
zeroPad(bech32.fromWords(bech32.decode(contractAddress).words), 32)
|
||||
).toString("hex");
|
||||
|
||||
logger.info(
|
||||
"Connecting to Terra: contract address: [" +
|
||||
contractAddress +
|
||||
"], encoded contract address: [" +
|
||||
encodedContractAddress +
|
||||
"], node: [" +
|
||||
env.terra_provider_url +
|
||||
"], token bridge address: [" +
|
||||
|
|
@ -61,6 +130,7 @@ export function makeTerraContractData(env: OurEnvironment) {
|
|||
terraContractData = {
|
||||
name: "Terra",
|
||||
contractAddress: contractAddress,
|
||||
encodedContractAddress: encodedContractAddress,
|
||||
tokenBridgeAddress: env.terra_token_bridge_address,
|
||||
lcdConfig: lcdConfig,
|
||||
lcdClient: lcdClient,
|
||||
|
|
@ -69,33 +139,49 @@ export function makeTerraContractData(env: OurEnvironment) {
|
|||
};
|
||||
}
|
||||
|
||||
export function isTerraContract(contractAddress: string): boolean {
|
||||
return (
|
||||
terraContractData && contractAddress === terraContractData.contractAddress
|
||||
export function isTerraContract(
|
||||
contractAddress: string,
|
||||
chain_id: number
|
||||
): boolean {
|
||||
if (chain_id !== CHAIN_ID_TERRA) return false;
|
||||
if (!terraContractData) return false;
|
||||
|
||||
let retVal: boolean =
|
||||
terraContractData &&
|
||||
contractAddress === terraContractData.encodedContractAddress;
|
||||
logger.debug(
|
||||
"isTerraContract: comparing [" +
|
||||
contractAddress +
|
||||
"] to [" +
|
||||
terraContractData.encodedContractAddress +
|
||||
"]: " +
|
||||
retVal
|
||||
);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
export async function relayVaaToTerra(
|
||||
t3Payload: Type3Payload,
|
||||
signedVaaArray: Uint8Array
|
||||
vaaBytes: string
|
||||
) {
|
||||
if (!terraContractData) return;
|
||||
|
||||
logger.debug(
|
||||
"relayVaaToTerra: checking if already redeemed using tokenBridgeAddress [" +
|
||||
terraContractData.tokenBridgeAddress +
|
||||
"]"
|
||||
);
|
||||
// logger.debug(
|
||||
// "relayVaaToTerra: checking if already redeemed using tokenBridgeAddress [" +
|
||||
// terraContractData.tokenBridgeAddress +
|
||||
// "]"
|
||||
// );
|
||||
|
||||
if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
logger.info(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"]: already transferred"
|
||||
);
|
||||
// if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
// logger.info(
|
||||
// "relayVaaToTerra: contract: [" +
|
||||
// t3Payload.contractAddress +
|
||||
// "]: already transferred"
|
||||
// );
|
||||
|
||||
return;
|
||||
}
|
||||
// return;
|
||||
// }
|
||||
|
||||
logger.info(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
|
|
@ -104,30 +190,79 @@ export async function relayVaaToTerra(
|
|||
);
|
||||
|
||||
try {
|
||||
const msg = await redeemOnTerra(
|
||||
terraContractData.contractAddress,
|
||||
terraContractData.wallet.key.accAddress,
|
||||
signedVaaArray
|
||||
logger.debug(
|
||||
"relayVaaToTerra: creating message using contract address [" +
|
||||
terraContractData.contractAddress +
|
||||
"]"
|
||||
);
|
||||
|
||||
let receipt: any = null;
|
||||
logger.debug("relayVaaToTerra: creating a message");
|
||||
|
||||
logger.debug(
|
||||
"relayVaaToTerra: vaa as hex: [" +
|
||||
Buffer.from(vaaBytes, "hex").toString("hex") +
|
||||
"]"
|
||||
);
|
||||
|
||||
logger.debug(
|
||||
"relayVaaToTerra: vaa as base64: [" +
|
||||
Buffer.from(vaaBytes, "hex").toString("base64") +
|
||||
"]"
|
||||
);
|
||||
const msg = new Terra.MsgExecuteContract(
|
||||
terraContractData.wallet.key.accAddress,
|
||||
terraContractData.contractAddress,
|
||||
{
|
||||
redeem_payload: {
|
||||
data: Buffer.from(vaaBytes, "hex").toString("base64"),
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
// logger.debug("relayVaaToTerra: getting gas prices");
|
||||
// const gasPrices = terraContractData.lcdClient.config.gasPrices;
|
||||
|
||||
// logger.debug("relayVaaToTerra: estimating fees");
|
||||
// const feeEstimate = await terraContractData.lcdClient.tx.estimateFee(terraContractData.wallet.key.accAddress, [msg], {
|
||||
// feeDenoms: ["uluna"],
|
||||
// gasPrices,
|
||||
// });
|
||||
|
||||
logger.debug("relayVaaToTerra: creating transaction");
|
||||
const tx = await terraContractData.wallet.createAndSignTx({
|
||||
msgs: [msg],
|
||||
memo: "swap relayer",
|
||||
feeDenoms: ["uluna"],
|
||||
// gasPrices,
|
||||
// fee: feeEstimate,
|
||||
});
|
||||
|
||||
logger.debug("relayVaaToTerra: submitting transaction");
|
||||
const receipt = await terraContractData.lcdClient.tx.broadcast(tx);
|
||||
|
||||
logger.info(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"]: success, txHash: " +
|
||||
receipt.transactionHash
|
||||
"]: success: %o",
|
||||
receipt
|
||||
);
|
||||
} catch (e: any) {
|
||||
if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
logger.info(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"]: relay failed because the vaa has already been redeemed"
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
// logger.info(
|
||||
// "relayVaaToTerra: contract: [" +
|
||||
// t3Payload.contractAddress +
|
||||
// "]: success, txHash: " +
|
||||
// receipt.transactionHash
|
||||
// );
|
||||
} catch (e: any) {
|
||||
// if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
// logger.info(
|
||||
// "relayVaaToTerra: contract: [" +
|
||||
// t3Payload.contractAddress +
|
||||
// "]: relay failed because the vaa has already been redeemed"
|
||||
// );
|
||||
|
||||
// return;
|
||||
// }
|
||||
|
||||
logger.error(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
|
|
@ -137,19 +272,19 @@ export async function relayVaaToTerra(
|
|||
);
|
||||
}
|
||||
|
||||
if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
logger.info(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"]: redeem succeeded"
|
||||
);
|
||||
} else {
|
||||
logger.error(
|
||||
"relayVaaToTerra: contract: [" +
|
||||
t3Payload.contractAddress +
|
||||
"]: redeem failed!"
|
||||
);
|
||||
}
|
||||
// if (await isRedeemedOnTerra(t3Payload, terraContractData, signedVaaArray)) {
|
||||
// logger.info(
|
||||
// "relayVaaToTerra: contract: [" +
|
||||
// t3Payload.contractAddress +
|
||||
// "]: redeem succeeded"
|
||||
// );
|
||||
// } else {
|
||||
// logger.error(
|
||||
// "relayVaaToTerra: contract: [" +
|
||||
// t3Payload.contractAddress +
|
||||
// "]: redeem failed!"
|
||||
// );
|
||||
// }
|
||||
}
|
||||
|
||||
async function isRedeemedOnTerra(
|
||||
|
|
@ -157,23 +292,46 @@ async function isRedeemedOnTerra(
|
|||
terraContractData: TerraContractData,
|
||||
signedVaaArray: Uint8Array
|
||||
): Promise<boolean> {
|
||||
let redeemed: boolean = false;
|
||||
let msg: Terra.MsgExecuteContract = null;
|
||||
let sequenceNumber: number = 0;
|
||||
try {
|
||||
redeemed = await await getIsTransferCompletedTerra(
|
||||
terraContractData.tokenBridgeAddress,
|
||||
signedVaaArray,
|
||||
msg = new Terra.MsgExecuteContract(
|
||||
terraContractData.wallet.key.accAddress,
|
||||
terraContractData.lcdClient,
|
||||
terraContractData.gasPriceUrl
|
||||
terraContractData.tokenBridgeAddress,
|
||||
{
|
||||
submit_vaa: {
|
||||
data: fromUint8Array(signedVaaArray),
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
sequenceNumber = await terraContractData.wallet.sequence();
|
||||
} catch (e) {
|
||||
logger.error(
|
||||
"relayVaaTo" +
|
||||
terraContractData.name +
|
||||
": failed to check if transfer is already complete, will attempt the transfer, e: %o",
|
||||
"isRedeemedOnTerra: failed to create message or look up sequence number, e: %o",
|
||||
e
|
||||
);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
await terraContractData.lcdClient.tx.estimateFee(
|
||||
[{ sequenceNumber: sequenceNumber }],
|
||||
{
|
||||
msgs: [msg],
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
if (e.response.data.error.includes("VaaAlreadyExecuted")) {
|
||||
return true;
|
||||
}
|
||||
|
||||
logger.error(
|
||||
"isRedeemedOnTerra: failed to check if transfer is already complete, e: %o",
|
||||
e
|
||||
);
|
||||
}
|
||||
|
||||
return redeemed;
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue