Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Rate limit workaround ts retry #35

Merged
merged 6 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@actions/github": "^6.0.0",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@keyrxng/rpc-handler": "^1.0.3",
"@octokit/rest": "^20.0.2",
"@openzeppelin/contracts": "^5.0.0",
"@sinclair/typebox": "^0.31.20",
Expand Down Expand Up @@ -45,6 +46,7 @@
"openai": "^4.14.0",
"prettier": "^3.1.0",
"probot": "^12.3.3",
"ts-retry": "^4.2.5",
"tsx": "^4.7.1",
"typescript": "^5.2.2",
"yaml": "^2.3.3",
Expand Down
39 changes: 23 additions & 16 deletions src/handlers/issue/generate-erc20-permit-signature.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { MaxUint256, PERMIT2_ADDRESS, PermitTransferFrom, SignatureTransfer } from "@uniswap/permit2-sdk";
import Decimal from "decimal.js";
import { BigNumber, ethers } from "ethers";
import { BigNumber, Wallet, ethers } from "ethers";
import { keccak256, toUtf8Bytes } from "ethers/lib/utils";
import { getPayoutConfigByNetworkId } from "../../helpers/payout";
import { useHandler } from "../../helpers/rpc-handler";
import { BotConfig } from "../../types/configuration-types";
import { decryptKeys } from "../../utils/private";
import { retryAsync, retryAsyncUntilDefined } from "ts-retry";
import { JsonRpcProvider } from "@ethersproject/providers";

export async function generateErc20PermitSignature({
beneficiary,
Expand All @@ -20,25 +23,25 @@ export async function generateErc20PermitSignature({

if (!evmPrivateEncrypted) throw console.warn("No bot wallet private key defined");
const { rpc, paymentToken } = getPayoutConfigByNetworkId(evmNetworkId);
const rpcHandler = useHandler(evmNetworkId);
const { privateKey } = await decryptKeys(evmPrivateEncrypted);

if (!rpc) throw console.error("RPC is not defined");
if (!privateKey) throw console.error("Private key is not defined");
if (!paymentToken) throw console.error("Payment token is not defined");

let provider;
let adminWallet;
try {
provider = new ethers.providers.JsonRpcProvider(rpc);
} catch (error) {
throw console.debug("Failed to instantiate provider", error);
}
let provider = await retryAsyncUntilDefined<JsonRpcProvider>(
async () => new ethers.providers.JsonRpcProvider(rpc),
{ maxTry: 5 }
);

try {
adminWallet = new ethers.Wallet(privateKey, provider);
} catch (error) {
throw console.debug("Failed to instantiate wallet", error);
}
const adminWallet = await retryAsync<Wallet>(
async () => new ethers.Wallet(privateKey, provider),
{
maxTry: 5,
onError: async () => provider = await rpcHandler.getFastestRpcProvider()
}
);

const permitTransferFromData: PermitTransferFrom = {
permitted: {
Expand All @@ -56,9 +59,13 @@ export async function generateErc20PermitSignature({
evmNetworkId
);

const signature = await adminWallet._signTypedData(domain, types, values).catch((error) => {
throw console.debug("Failed to sign typed data", error);
});
const signature = await retryAsync<string>(
async () => await adminWallet._signTypedData(domain, types, values),
{
maxTry: 5,
onError: async () => provider = await rpcHandler.getFastestRpcProvider()
}
);

const transactionData: Erc20PermitTransactionData = {
permit: {
Expand Down
57 changes: 31 additions & 26 deletions src/handlers/issue/generate-erc721-permit-signature.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { BigNumber, ethers, utils } from "ethers";
import { BigNumber, ethers, Wallet, utils } from "ethers";
import { getPayoutConfigByNetworkId } from "../../helpers/payout";
import { useHandler } from "../../helpers/rpc-handler";
import { MaxUint256 } from "@uniswap/permit2-sdk";
import { keccak256, toUtf8Bytes } from "ethers/lib/utils";
import { retryAsync, retryAsyncUntilDefined } from "ts-retry";
import { JsonRpcProvider } from "@ethersproject/providers";

const NFT_MINTER_PRIVATE_KEY = process.env.NFT_MINTER_PRIVATE_KEY as string;
const NFT_CONTRACT_ADDRESS = "0x6a87f05a74AB2EC25D1Eea0a3Cd24C3A2eCfF3E0";
Expand Down Expand Up @@ -72,20 +75,20 @@ export async function generateErc721PermitSignature({
contributionType,
}: GenerateErc721PermitSignatureParams) {
const { rpc } = getPayoutConfigByNetworkId(networkId);
const rpcHandler = useHandler(networkId);

let provider;
let adminWallet;
try {
provider = new ethers.providers.JsonRpcProvider(rpc);
} catch (error) {
throw console.error("Failed to instantiate provider", error);
}
let provider = await retryAsyncUntilDefined<JsonRpcProvider>(
async () => new ethers.providers.JsonRpcProvider(rpc),
{ maxTry: 5 }
);

try {
adminWallet = new ethers.Wallet(NFT_MINTER_PRIVATE_KEY, provider);
} catch (error) {
throw console.error("Failed to instantiate wallet", error);
}
const adminWallet = await retryAsync<Wallet>(
async () => new ethers.Wallet(NFT_MINTER_PRIVATE_KEY, provider),
{
maxTry: 5,
onError: async () => provider = await rpcHandler.getFastestRpcProvider()
}
);

const erc721SignatureData: Erc721PermitSignatureData = {
beneficiary: beneficiary,
Expand All @@ -95,20 +98,22 @@ export async function generateErc721PermitSignature({
values: [organizationName, repositoryName, issueNumber, username, contributionType],
};

const signature = await adminWallet
._signTypedData(
const signature = await retryAsync<string>(
async () => await adminWallet._signTypedData(
{
name: SIGNING_DOMAIN_NAME,
version: SIGNING_DOMAIN_VERSION,
verifyingContract: NFT_CONTRACT_ADDRESS,
chainId: networkId,
},
types,
erc721SignatureData
),
{
name: SIGNING_DOMAIN_NAME,
version: SIGNING_DOMAIN_VERSION,
verifyingContract: NFT_CONTRACT_ADDRESS,
chainId: networkId,
},
types,
erc721SignatureData
)
.catch((error) => {
throw console.error("Failed to sign typed data", error);
});
maxTry: 5,
onError: async () => provider = await rpcHandler.getFastestRpcProvider()
}
);

const nftMetadata: Record<string, string> = {};

Expand Down
23 changes: 20 additions & 3 deletions src/helpers/contracts.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
import { ethers } from "ethers";
import { abi as ERC20ABI } from "@openzeppelin/contracts/build/contracts/ERC20.json";
import { retryAsync, retryAsyncUntilDefined } from "ts-retry";
import { JsonRpcProvider } from "@ethersproject/providers";


export async function getTokenSymbol(tokenAddress: string, rpcUrl: string): Promise<string>;
export async function getTokenSymbol(tokenAddress: string, provider: JsonRpcProvider): Promise<string>;
export async function getTokenSymbol(tokenAddress: string, rpc: string|JsonRpcProvider): Promise<string> {
let provider: JsonRpcProvider;

if (typeof rpc === "string") {
provider = await retryAsyncUntilDefined<JsonRpcProvider>(
async () => new ethers.providers.JsonRpcProvider(rpc),
{ maxTry: 5 }
);
} else provider = rpc;

export async function getTokenSymbol(tokenAddress: string, rpcUrl: string): Promise<string> {
const provider = new ethers.providers.JsonRpcProvider(rpcUrl);
const contractInstance = new ethers.Contract(tokenAddress, ERC20ABI, provider);
const symbol = await contractInstance.symbol();
const symbol = await retryAsync<string>(
async () => await contractInstance.symbol(),
{ maxTry: 5 }
);
return symbol;
}

10 changes: 10 additions & 0 deletions src/helpers/rpc-handler.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { RPCHandler, HandlerConstructorConfig } from "@keyrxng/rpc-handler";

export function useHandler(networkId: number) {
const config: HandlerConstructorConfig = {
networkId,
autoStorage: false,
cacheRefreshCycles: 5,
};
return new RPCHandler(config);
}
27 changes: 27 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2279,6 +2279,14 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"

"@keyrxng/rpc-handler@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@keyrxng/rpc-handler/-/rpc-handler-1.0.3.tgz#d73f9a1e5c777224fea5f928971851a8145c998a"
integrity sha512-3E2GM4EtEBey5MPeck5g0nryx/TI8O520T+Z3PNWBW29nYuSZNEsDaMc9KTX5h9Yqzsg21q6jRpcGXi2/pzE/Q==
dependencies:
"@ethersproject/providers" "5.7.2"
axios "^1.6.8"

"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
Expand Down Expand Up @@ -3481,6 +3489,15 @@ axios@^1.6.2:
form-data "^4.0.0"
proxy-from-env "^1.1.0"

axios@^1.6.8:
version "1.6.8"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
dependencies:
follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

babel-jest@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
Expand Down Expand Up @@ -4971,6 +4988,11 @@ follow-redirects@^1.15.0:
resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"
integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==

follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

for-each@^0.3.3:
version "0.3.3"
resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"
Expand Down Expand Up @@ -8155,6 +8177,11 @@ ts-api-utils@^1.0.1:
resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz"
integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==

ts-retry@^4.2.5:
version "4.2.5"
resolved "https://registry.yarnpkg.com/ts-retry/-/ts-retry-4.2.5.tgz#ee4638e66c68bb49da975aa4994d5f16bfb61bc2"
integrity sha512-dFBa4pxMBkt/bjzdBio8EwYfbAdycEAwe0KZgzlUKKwU9Wr1WErK7Hg9QLqJuDDYJXTW4KYZyXAyqYKOdO/ehA==

tslib@^1.9.3:
version "1.14.1"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
Expand Down