diff --git a/package-lock.json b/package-lock.json index db0ddfb4..067e7ca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@opentelemetry/sdk-trace-base": "^1.22.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@rainlanguage/dotrain": "^6.0.1-alpha.21", - "@rainlanguage/orderbook": "^0.0.1-alpha.1", + "@rainlanguage/orderbook": "^0.0.1-alpha.6", "axios": "^1.3.4", "commander": "^11.0.0", "dotenv": "^16.0.3", @@ -3475,9 +3475,9 @@ } }, "node_modules/@rainlanguage/orderbook": { - "version": "0.0.1-alpha.1", - "resolved": "https://registry.npmjs.org/@rainlanguage/orderbook/-/orderbook-0.0.1-alpha.1.tgz", - "integrity": "sha512-t7SYpjASwZEyowXH1rVs6LQPwJGUe5rTHWuHQZJq6eJfjZeDwZi5plxtIAwnMeqKrVSMdbAvPZMn0MpfdpctAQ==", + "version": "0.0.1-alpha.6", + "resolved": "https://registry.npmjs.org/@rainlanguage/orderbook/-/orderbook-0.0.1-alpha.6.tgz", + "integrity": "sha512-qGPzlDh0ZMlkPeHS048k0VlhhVIhrB7Ea/UIAZENBai3AYA394Cl6MWu66JNdia9RhVTCApSqRQwmmwLFxb2DA==", "dependencies": { "buffer": "^6.0.3" }, diff --git a/package.json b/package.json index 5c68b11a..c89e558f 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@opentelemetry/sdk-trace-base": "^1.22.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@rainlanguage/dotrain": "^6.0.1-alpha.21", - "@rainlanguage/orderbook": "^0.0.1-alpha.1", + "@rainlanguage/orderbook": "^0.0.1-alpha.6", "axios": "^1.3.4", "commander": "^11.0.0", "dotenv": "^16.0.3", diff --git a/src/task.ts b/src/task.ts index f11ce7ad..ccc0f7aa 100644 --- a/src/task.ts +++ b/src/task.ts @@ -5,7 +5,6 @@ import { Dispair, ViemClient } from "./types"; import { parseAbi, PublicClient, stringToHex } from "viem"; import { MetaStore, RainDocument } from "@rainlanguage/dotrain"; -export const metaStore = new MetaStore(); export const TaskEntryPoint = ["main"] as const; export const EnsureBountyDotrain = fs.readFileSync("./tasks/ensure-bounty.rain", { encoding: "utf8", @@ -30,7 +29,7 @@ export async function getBountyEnsureRainlang( return await RainDocument.composeText( EnsureBountyDotrain, TaskEntryPoint as any as string[], - metaStore, + new MetaStore(), [ ["sender", sender], ["input-to-eth-price", utils.formatUnits(inputToEthPrice)], @@ -66,7 +65,7 @@ export async function getWithdrawEnsureRainlang( return await RainDocument.composeText( WithdrawEnsureBountyDotrain, TaskEntryPoint as any as string[], - metaStore, + new MetaStore(), [ ["sender", sender], ["bot-address", botAddress], diff --git a/src/utils.ts b/src/utils.ts index 50c89445..87329b82 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -754,7 +754,6 @@ export async function quoteOrders( gas?: bigint, multicallAddressOverride?: string, ): Promise { - gas; let quoteResults: any[] = []; const targets = orderDetails.flatMap((v) => v.flatMap((list) => @@ -771,7 +770,7 @@ export async function quoteOrders( targets, rpc, blockNumber, - // gas, + gas, multicallAddressOverride, ); break; @@ -832,7 +831,6 @@ export async function quoteSingleOrder( gas?: bigint, multicallAddressOverride?: string, ) { - gas; for (let i = 0; i < rpcs.length; i++) { const rpc = rpcs[i]; try { @@ -846,7 +844,7 @@ export async function quoteSingleOrder( ] as any as QuoteTarget[], rpc, blockNumber, - // gas, + gas, multicallAddressOverride, ) )[0];