Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Relay] Separate routes by task #165

Merged
merged 1 commit into from
Oct 30, 2023
Merged

[Relay] Separate routes by task #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/relay/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"start": "NODE_ENV=production hardhat run src/main.ts --network production_net",
"formatting:check": "prettier '**/*.{json,sol,ts,js,md}' -c",
"formatting:write": "prettier '**/*.{json,sol,ts,js,md}' --write",
"debug:Endpoints": "NODE_ENV=test hardhat test test/Endpoints.test.ts",
"debug:Config": "NODE_ENV=test hardhat test test/Config.test.ts",
"debug:Shop": "NODE_ENV=test hardhat test test/Shop.test.ts",
"debug:ShopWithdraw": "NODE_ENV=test hardhat test test/ShopWithdraw.test.ts",
"debug:UserInfo": "NODE_ENV=test hardhat test test/UserInfo.test.ts"
"test:Endpoints": "NODE_ENV=test hardhat test test/Endpoints.test.ts",
"test:Config": "NODE_ENV=test hardhat test test/Config.test.ts",
"test:Shop": "NODE_ENV=test hardhat test test/Shop.test.ts",
"test:ShopWithdraw": "NODE_ENV=test hardhat test test/ShopWithdraw.test.ts",
"test:Payment": "NODE_ENV=test hardhat test test/Payment.test.ts"
},
"repository": {
"type": "git",
Expand Down
14 changes: 11 additions & 3 deletions packages/relay/src/DefaultServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@ import { cors_options } from "./option/cors";
import { DefaultRouter } from "./routers/DefaultRouter";
import { WebService } from "./service/WebService";

import { RelaySigners } from "./contract/Signers";
import { PaymentRouter } from "./routers/PaymentRouter";

export class DefaultServer extends WebService {
/**
* The configuration of the database
* @private
*/
private readonly config: Config;

public readonly wallet_router: DefaultRouter;
public readonly defaultRouter: DefaultRouter;
public readonly paymentRouter: PaymentRouter;
public readonly relaySigners: RelaySigners;

/**
* Constructor
Expand All @@ -22,7 +27,9 @@ export class DefaultServer extends WebService {
super(config.server.port, config.server.address);

this.config = config;
this.wallet_router = new DefaultRouter(this, this.config);
this.relaySigners = new RelaySigners(this.config);
this.defaultRouter = new DefaultRouter(this, this.config, this.relaySigners);
this.paymentRouter = new PaymentRouter(this, this.config, this.relaySigners);
}

/**
Expand All @@ -35,7 +42,8 @@ export class DefaultServer extends WebService {
this.app.use(bodyParser.json({ limit: "1mb" }));
this.app.use(cors(cors_options));

this.wallet_router.registerRoutes();
this.defaultRouter.registerRoutes();
this.paymentRouter.registerRoutes();

return super.start();
}
Expand Down
78 changes: 78 additions & 0 deletions packages/relay/src/contract/Signers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import "@nomiclabs/hardhat-ethers";

import { Signer, Wallet } from "ethers";
import { Config } from "../common/Config";

import { NonceManager } from "@ethersproject/experimental";
import { ContractUtils } from "../utils/ContractUtils";
import { GasPriceManager } from "./GasPriceManager";

import * as hre from "hardhat";

export interface ISignerItem {
index: number;
signer: Signer;
using: boolean;
}

export class RelaySigners {
private readonly _config: Config;
private readonly _signers: ISignerItem[];
constructor(config: Config) {
this._config = config;

let idx = 0;
this._signers = this._config.relay.managerKeys.map((m) => {
return {
index: idx++,
signer: new Wallet(m, hre.ethers.provider) as Signer,
using: false,
};
});
}

/***
* 트팬잭션을 중계할 때 사용될 서명자
* @private
*/
public async getSigner(): Promise<ISignerItem> {
let signerItem: ISignerItem | undefined;
let done = false;

const startTime = ContractUtils.getTimeStamp();
while (done) {
for (signerItem of this._signers) {
if (!signerItem.using) {
signerItem.using = true;
done = true;
break;
}
}
if (ContractUtils.getTimeStamp() - startTime > 10) break;
await ContractUtils.delay(1000);
}

if (signerItem !== undefined) {
signerItem.using = true;
signerItem.signer = new NonceManager(
new GasPriceManager(new Wallet(this._config.relay.managerKeys[signerItem.index], hre.ethers.provider))
);
} else {
signerItem = this._signers[0];
signerItem.using = true;
signerItem.signer = new NonceManager(
new GasPriceManager(new Wallet(this._config.relay.managerKeys[signerItem.index], hre.ethers.provider))
);
}

return signerItem;
}

/***
* 트팬잭션을 중계할 때 사용될 서명자
* @private
*/
public releaseSigner(signer: ISignerItem) {
signer.using = false;
}
}
193 changes: 7 additions & 186 deletions packages/relay/src/routers/DefaultRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
import { CurrencyRate, Ledger, PhoneLinkCollection, ShopCollection, Token } from "../../typechain-types";
import { Config } from "../common/Config";
import { logger } from "../common/Logger";
import { GasPriceManager } from "../contract/GasPriceManager";
import { WebService } from "../service/WebService";
import { LoyaltyType } from "../types";
import { ContractUtils } from "../utils/ContractUtils";
import { Validation } from "../validation";

import { NonceManager } from "@ethersproject/experimental";
import { BigNumber, Signer, Wallet } from "ethers";
import { BigNumber } from "ethers";
import { body, query, validationResult } from "express-validator";
import * as hre from "hardhat";

import express from "express";
import { LoyaltyType } from "../types";

interface ISignerItem {
index: number;
signer: Signer;
using: boolean;
}
import { ISignerItem, RelaySigners } from "../contract/Signers";

export class DefaultRouter {
/**
Expand All @@ -33,7 +26,7 @@ export class DefaultRouter {
*/
private readonly _config: Config;

private readonly _signers: ISignerItem[];
private readonly _relaySigners: RelaySigners;

/**
* ERC20 토큰 컨트랙트
Expand Down Expand Up @@ -70,18 +63,11 @@ export class DefaultRouter {
* @param service WebService
* @param config Configuration
*/
constructor(service: WebService, config: Config) {
constructor(service: WebService, config: Config, relaySigners: RelaySigners) {
this._web_service = service;
this._config = config;

let idx = 0;
this._signers = this._config.relay.managerKeys.map((m) => {
return {
index: idx++,
signer: new Wallet(m, hre.ethers.provider) as Signer,
using: false,
};
});
this._relaySigners = relaySigners;
}

private get app(): express.Application {
Expand All @@ -93,36 +79,7 @@ export class DefaultRouter {
* @private
*/
private async getRelaySigner(): Promise<ISignerItem> {
let signerItem: ISignerItem | undefined;
let done = false;

const startTime = ContractUtils.getTimeStamp();
while (done) {
for (signerItem of this._signers) {
if (!signerItem.using) {
signerItem.using = true;
done = true;
break;
}
}
if (ContractUtils.getTimeStamp() - startTime > 10) break;
await ContractUtils.delay(1000);
}

if (signerItem !== undefined) {
signerItem.using = true;
signerItem.signer = new NonceManager(
new GasPriceManager(new Wallet(this._config.relay.managerKeys[signerItem.index], hre.ethers.provider))
);
} else {
signerItem = this._signers[0];
signerItem.using = true;
signerItem.signer = new NonceManager(
new GasPriceManager(new Wallet(this._config.relay.managerKeys[signerItem.index], hre.ethers.provider))
);
}

return signerItem;
return this._relaySigners.getSigner();
}

/***
Expand Down Expand Up @@ -362,21 +319,6 @@ export class DefaultRouter {
],
this.shop_closeWithdrawal.bind(this)
);

this.app.get(
"/user/balance",
[query("account").exists().trim().isEthereumAddress()],
this.user_balance.bind(this)
);

this.app.post(
"/payment/info",
[body("accessKey").exists()],
[body("account").exists().trim().isEthereumAddress()],
[body("amount").exists().custom(Validation.isAmount)],
[body("currency").exists()],
this.payment_info.bind(this)
);
}

private async getHealthStatus(req: express.Request, res: express.Response) {
Expand Down Expand Up @@ -874,125 +816,4 @@ export class DefaultRouter {
this.releaseRelaySigner(signerItem);
}
}

/**
* 사용자 정보 / 로열티 종류와 잔고를 제공하는 엔드포인트
* GET /user/balance
* @private
*/
private async user_balance(req: express.Request, res: express.Response) {
logger.http(`GET /user/balance`);

const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(200).json(
this.makeResponseData(501, undefined, {
message: "Failed to check the validity of parameters.",
validation: errors.array(),
})
);
}

try {
const account: string = String(req.query.account).trim();
const loyaltyType = await (await this.getLedgerContract()).loyaltyTypeOf(account);
const balance =
loyaltyType === LoyaltyType.POINT
? await (await this.getLedgerContract()).pointBalanceOf(account)
: await (await this.getLedgerContract()).tokenBalanceOf(account);
return res
.status(200)
.json(this.makeResponseData(200, { account, loyaltyType, balance: balance.toString() }));
} catch (error: any) {
let message = ContractUtils.cacheEVMError(error as any);
if (message === "") message = "Failed /user/balance";
logger.error(`GET /user/balance :`, message);
return res.status(200).json(
this.makeResponseData(500, undefined, {
message,
})
);
}
}

/**
* 결제 / 결제정보를 제공한다
* GET /payment/info
* @private
*/
private async payment_info(req: express.Request, res: express.Response) {
logger.http(`GET /payment/info`);

const errors = validationResult(req);
if (!errors.isEmpty()) {
return res.status(200).json(
this.makeResponseData(501, undefined, {
message: "Failed to check the validity of parameters.",
validation: errors.array(),
})
);
}

try {
const accessKey: string = String(req.body.accessKey).trim();
if (accessKey !== this._config.relay.accessKey) {
return res.json(
this.makeResponseData(400, undefined, {
message: "The access key entered is not valid.",
})
);
}

const account: string = String(req.body.account).trim();
const amount: BigNumber = BigNumber.from(req.body.amount);
const currency: string = String(req.body.currency).trim();
const loyaltyType = await (await this.getLedgerContract()).loyaltyTypeOf(account);

const feeRate = await (await this.getLedgerContract()).fee();
const rate = await (await this.getCurrencyRateContract()).get(currency.toLowerCase());
const multiple = await (await this.getCurrencyRateContract()).MULTIPLE();

let balance: BigNumber;
let purchaseAmount: BigNumber;
let feeAmount: BigNumber;
let totalAmount: BigNumber;

if (loyaltyType === LoyaltyType.POINT) {
balance = await (await this.getLedgerContract()).pointBalanceOf(account);
purchaseAmount = amount.mul(rate).div(multiple);
feeAmount = purchaseAmount.mul(feeRate).div(100);
totalAmount = purchaseAmount.add(feeAmount);
} else {
balance = await (await this.getLedgerContract()).tokenBalanceOf(account);
const symbol = await (await this.getTokenContract()).symbol();
const tokenRate = await (await this.getCurrencyRateContract()).get(symbol);
purchaseAmount = amount.mul(rate).div(tokenRate);
feeAmount = purchaseAmount.mul(feeRate).div(100);
totalAmount = purchaseAmount.add(feeAmount);
}

return res.status(200).json(
this.makeResponseData(200, {
account,
loyaltyType,
balance: balance.toString(),
purchaseAmount: purchaseAmount.toString(),
feeAmount: feeAmount.toString(),
totalAmount: totalAmount.toString(),
amount: amount.toString(),
currency,
feeRate: feeRate / 100,
})
);
} catch (error: any) {
let message = ContractUtils.cacheEVMError(error as any);
if (message === "") message = "Failed /payment/info";
logger.error(`GET /payment/info :`, message);
return res.status(200).json(
this.makeResponseData(500, undefined, {
message,
})
);
}
}
}
Loading
Loading