Skip to content

Commit

Permalink
Revert "update"
Browse files Browse the repository at this point in the history
This reverts commit 3140624.
  • Loading branch information
rouzwelt committed Feb 14, 2025
1 parent 3140624 commit 147f56a
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 196 deletions.
99 changes: 0 additions & 99 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,102 +411,3 @@ export const fallbackRpcs: Record<number, readonly string[]> = {
"https://base.meowrpc.com",
],
} as const;

import { readFileSync } from "fs";
import { DeployerAbi } from "./abis";
import { BigNumber, utils } from "ethers";
import { Dispair } from "./types";
import { stringToHex } from "viem";
import { MetaStore, RainDocument } from "@rainlanguage/dotrain";

const metaStore = new MetaStore(false);
export const TaskEntryPoint = ["main"] as const;
export const EnsureBountyDotrain = readFileSync("./tasks/ensure-bounty.rain", {
encoding: "utf8",
});
export const WithdrawEnsureBountyDotrain = readFileSync("./tasks/withdraw-ensure-bounty.rain", {
encoding: "utf8",
});

/**
* Get the bounty check ensure task rainlang
* @param inputToEthPrice - Input token to Eth price
* @param outputToEthPrice - Output token to Eth price
* @param minimumExpected - Minimum expected amount
* @param sender - The msg sender
*/
export async function getBountyEnsureRainlang(
inputToEthPrice: BigNumber,
outputToEthPrice: BigNumber,
minimumExpected: BigNumber,
sender: string,
): Promise<string> {
return await RainDocument.composeText(
EnsureBountyDotrain,
TaskEntryPoint as any as string[],
metaStore,
[
["sender", sender],
["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
["minimum-expected", utils.formatUnits(minimumExpected)],
],
);
}

/**
* Get the bounty check ensure task rainlang for clear2 withdraw
* @param botAddress - Bot wallet address
* @param inputToken - Input token address
* @param outputToken - Output token address
* @param orgInputBalance - Input token original balance
* @param orgOutputBalance - Output token original balance
* @param inputToEthPrice - Input token to Eth price
* @param outputToEthPrice - Output token to Eth price
* @param minimumExpected - Minimum expected amount
* @param sender - The msg sender
*/
export async function getWithdrawEnsureRainlang(
botAddress: string,
inputToken: string,
outputToken: string,
orgInputBalance: BigNumber,
orgOutputBalance: BigNumber,
inputToEthPrice: BigNumber,
outputToEthPrice: BigNumber,
minimumExpected: BigNumber,
sender: string,
): Promise<string> {
return await RainDocument.composeText(
WithdrawEnsureBountyDotrain,
TaskEntryPoint as any as string[],
metaStore,
[
["sender", sender],
["bot-address", botAddress],
["input-token", inputToken],
["output-token", outputToken],
["minimum-expected", utils.formatUnits(minimumExpected)],
["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
["org-input-balance", utils.formatUnits(orgInputBalance)],
["org-output-balance", utils.formatUnits(orgOutputBalance)],
],
);
}

/**
* Calls parse2 on a given deployer to parse the given rainlang text
*/
export async function parseRainlang(
rainlang: string,
viemClient: ViemClient | PublicClient,
dispair: Dispair,
): Promise<string> {
return await viemClient.readContract({
address: dispair.deployer as `0x${string}`,
abi: DeployerAbi,
functionName: "parse2",
args: [stringToHex(rainlang)],
});
}
2 changes: 1 addition & 1 deletion src/modes/interOrderbook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { orderbookAbi } from "../abis";
import { estimateGasCost } from "../gas";
import { BigNumber, Contract, ethers } from "ethers";
import { containsNodeError, errorSnapshot } from "../error";
import { getBountyEnsureRainlang, parseRainlang } from "../config";
import { getBountyEnsureRainlang, parseRainlang } from "../task";
import { BaseError, ExecutionRevertedError, PublicClient } from "viem";
import { ONE18, scale18To, estimateProfit, withBigintSerializer } from "../utils";
import { BotConfig, BundledOrders, ViemClient, DryrunResult, SpanAttrs } from "../types";
Expand Down
2 changes: 1 addition & 1 deletion src/modes/intraOrderbook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { orderbookAbi } from "../abis";
import { estimateGasCost } from "../gas";
import { BigNumber, ethers } from "ethers";
import { containsNodeError, errorSnapshot } from "../error";
import { getWithdrawEnsureRainlang, parseRainlang } from "../config";
import { getWithdrawEnsureRainlang, parseRainlang } from "../task";
import { estimateProfit, scale18, withBigintSerializer } from "../utils";
import { BaseError, erc20Abi, ExecutionRevertedError, PublicClient } from "viem";
import {
Expand Down
2 changes: 1 addition & 1 deletion src/modes/routeProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { estimateGasCost } from "../gas";
import { ChainId, DataFetcher, Router } from "sushi";
import { BigNumber, Contract, ethers } from "ethers";
import { containsNodeError, errorSnapshot } from "../error";
import { getBountyEnsureRainlang, parseRainlang } from "../config";
import { getBountyEnsureRainlang, parseRainlang } from "../task";
import { BaseError, ExecutionRevertedError, PublicClient } from "viem";
import { SpanAttrs, BotConfig, ViemClient, DryrunResult, BundledOrders } from "../types";
import {
Expand Down
188 changes: 94 additions & 94 deletions src/task.ts
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
// import fs from "fs";
// import { DeployerAbi } from "./abis";
// import { BigNumber, utils } from "ethers";
// import { Dispair, ViemClient } from "./types";
// import { PublicClient, stringToHex } from "viem";
// import { MetaStore, RainDocument } from "@rainlanguage/dotrain";
import fs from "fs";
import { DeployerAbi } from "./abis";
import { BigNumber, utils } from "ethers";
import { Dispair, ViemClient } from "./types";
import { PublicClient, stringToHex } from "viem";
import { MetaStore, RainDocument } from "@rainlanguage/dotrain";

// const metaStore = new MetaStore(false);
// export const TaskEntryPoint = ["main"] as const;
// export const EnsureBountyDotrain = fs.readFileSync("./tasks/ensure-bounty.rain", {
// encoding: "utf8",
// });
// export const WithdrawEnsureBountyDotrain = fs.readFileSync("./tasks/withdraw-ensure-bounty.rain", {
// encoding: "utf8",
// });
const metaStore = new MetaStore(false);
export const TaskEntryPoint = ["main"] as const;
export const EnsureBountyDotrain = fs.readFileSync("./tasks/ensure-bounty.rain", {
encoding: "utf8",
});
export const WithdrawEnsureBountyDotrain = fs.readFileSync("./tasks/withdraw-ensure-bounty.rain", {
encoding: "utf8",
});

// /**
// * Get the bounty check ensure task rainlang
// * @param inputToEthPrice - Input token to Eth price
// * @param outputToEthPrice - Output token to Eth price
// * @param minimumExpected - Minimum expected amount
// * @param sender - The msg sender
// */
// export async function getBountyEnsureRainlang(
// inputToEthPrice: BigNumber,
// outputToEthPrice: BigNumber,
// minimumExpected: BigNumber,
// sender: string,
// ): Promise<string> {
// return await RainDocument.composeText(
// EnsureBountyDotrain,
// TaskEntryPoint as any as string[],
// metaStore,
// [
// ["sender", sender],
// ["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
// ["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
// ["minimum-expected", utils.formatUnits(minimumExpected)],
// ],
// );
// }
/**
* Get the bounty check ensure task rainlang
* @param inputToEthPrice - Input token to Eth price
* @param outputToEthPrice - Output token to Eth price
* @param minimumExpected - Minimum expected amount
* @param sender - The msg sender
*/
export async function getBountyEnsureRainlang(
inputToEthPrice: BigNumber,
outputToEthPrice: BigNumber,
minimumExpected: BigNumber,
sender: string,
): Promise<string> {
return await RainDocument.composeText(
EnsureBountyDotrain,
TaskEntryPoint as any as string[],
metaStore,
[
["sender", sender],
["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
["minimum-expected", utils.formatUnits(minimumExpected)],
],
);
}

// /**
// * Get the bounty check ensure task rainlang for clear2 withdraw
// * @param botAddress - Bot wallet address
// * @param inputToken - Input token address
// * @param outputToken - Output token address
// * @param orgInputBalance - Input token original balance
// * @param orgOutputBalance - Output token original balance
// * @param inputToEthPrice - Input token to Eth price
// * @param outputToEthPrice - Output token to Eth price
// * @param minimumExpected - Minimum expected amount
// * @param sender - The msg sender
// */
// export async function getWithdrawEnsureRainlang(
// botAddress: string,
// inputToken: string,
// outputToken: string,
// orgInputBalance: BigNumber,
// orgOutputBalance: BigNumber,
// inputToEthPrice: BigNumber,
// outputToEthPrice: BigNumber,
// minimumExpected: BigNumber,
// sender: string,
// ): Promise<string> {
// return await RainDocument.composeText(
// WithdrawEnsureBountyDotrain,
// TaskEntryPoint as any as string[],
// metaStore,
// [
// ["sender", sender],
// ["bot-address", botAddress],
// ["input-token", inputToken],
// ["output-token", outputToken],
// ["minimum-expected", utils.formatUnits(minimumExpected)],
// ["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
// ["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
// ["org-input-balance", utils.formatUnits(orgInputBalance)],
// ["org-output-balance", utils.formatUnits(orgOutputBalance)],
// ],
// );
// }
/**
* Get the bounty check ensure task rainlang for clear2 withdraw
* @param botAddress - Bot wallet address
* @param inputToken - Input token address
* @param outputToken - Output token address
* @param orgInputBalance - Input token original balance
* @param orgOutputBalance - Output token original balance
* @param inputToEthPrice - Input token to Eth price
* @param outputToEthPrice - Output token to Eth price
* @param minimumExpected - Minimum expected amount
* @param sender - The msg sender
*/
export async function getWithdrawEnsureRainlang(
botAddress: string,
inputToken: string,
outputToken: string,
orgInputBalance: BigNumber,
orgOutputBalance: BigNumber,
inputToEthPrice: BigNumber,
outputToEthPrice: BigNumber,
minimumExpected: BigNumber,
sender: string,
): Promise<string> {
return await RainDocument.composeText(
WithdrawEnsureBountyDotrain,
TaskEntryPoint as any as string[],
metaStore,
[
["sender", sender],
["bot-address", botAddress],
["input-token", inputToken],
["output-token", outputToken],
["minimum-expected", utils.formatUnits(minimumExpected)],
["input-to-eth-price", utils.formatUnits(inputToEthPrice)],
["output-to-eth-price", utils.formatUnits(outputToEthPrice)],
["org-input-balance", utils.formatUnits(orgInputBalance)],
["org-output-balance", utils.formatUnits(orgOutputBalance)],
],
);
}

// /**
// * Calls parse2 on a given deployer to parse the given rainlang text
// */
// export async function parseRainlang(
// rainlang: string,
// viemClient: ViemClient | PublicClient,
// dispair: Dispair,
// ): Promise<string> {
// return await viemClient.readContract({
// address: dispair.deployer as `0x${string}`,
// abi: DeployerAbi,
// functionName: "parse2",
// args: [stringToHex(rainlang)],
// });
// }
/**
* Calls parse2 on a given deployer to parse the given rainlang text
*/
export async function parseRainlang(
rainlang: string,
viemClient: ViemClient | PublicClient,
dispair: Dispair,
): Promise<string> {
return await viemClient.readContract({
address: dispair.deployer as `0x${string}`,
abi: DeployerAbi,
functionName: "parse2",
args: [stringToHex(rainlang)],
});
}

0 comments on commit 147f56a

Please sign in to comment.