From 299e94716fbd4c296c858579e52f78447db897ea Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Fri, 27 May 2022 09:47:15 +0400 Subject: [PATCH 01/10] OP-2205 --- .github/workflows/prerelease-package.yml | 2 +- package-lock.json | 18 ++--- package.json | 4 +- src/config/envs.json | 10 +++ .../OrionAggregator/ws/MessageType.ts | 1 + src/services/OrionAggregator/ws/index.ts | 70 +++++++++++++------ .../ws/schemas/assetPairsConfigSchema.ts | 1 + .../ws/schemas/baseMessageSchema.ts | 1 + .../ws/schemas/unsubscriptionDoneSchema.ts | 9 +++ 9 files changed, 82 insertions(+), 34 deletions(-) create mode 100644 src/services/OrionAggregator/ws/schemas/unsubscriptionDoneSchema.ts diff --git a/.github/workflows/prerelease-package.yml b/.github/workflows/prerelease-package.yml index df8a708..d9fb5d6 100644 --- a/.github/workflows/prerelease-package.yml +++ b/.github/workflows/prerelease-package.yml @@ -3,7 +3,7 @@ name: Prerelease on: push: branches: - - 'main' + - 'develop' jobs: build-and-publish: diff --git a/package-lock.json b/package-lock.json index de0aab9..57d541e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.5.8", + "version": "0.10.4-rc.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.5.8", + "version": "0.10.4-rc.0", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", @@ -25,7 +25,7 @@ "tiny-invariant": "^1.2.0", "uuid": "^8.3.2", "ws": "^8.5.0", - "zod": "^3.16.0" + "zod": "^3.17.3" }, "devDependencies": { "@typechain/ethers-v5": "^10.0.0", @@ -11099,9 +11099,9 @@ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" }, "node_modules/zod": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.16.0.tgz", - "integrity": "sha512-szrIkryADbTM+xBt2a1KoS2CJQXec4f9xG78bj5MJeEH/XqmmHpnO+fG3IE115AKBJak+2HrbxLZkc9mhdbDKA==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.17.3.tgz", + "integrity": "sha512-4oKP5zvG6GGbMlqBkI5FESOAweldEhSOZ6LI6cG+JzUT7ofj1ZOC0PJudpQOpT1iqOFpYYtX5Pw0+o403y4bcg==", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -18842,9 +18842,9 @@ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" }, "zod": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.16.0.tgz", - "integrity": "sha512-szrIkryADbTM+xBt2a1KoS2CJQXec4f9xG78bj5MJeEH/XqmmHpnO+fG3IE115AKBJak+2HrbxLZkc9mhdbDKA==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.17.3.tgz", + "integrity": "sha512-4oKP5zvG6GGbMlqBkI5FESOAweldEhSOZ6LI6cG+JzUT7ofj1ZOC0PJudpQOpT1iqOFpYYtX5Pw0+o403y4bcg==" } } } diff --git a/package.json b/package.json index 9cf8d92..7154210 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.0", + "version": "0.10.4-rc.1", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", @@ -76,7 +76,7 @@ "tiny-invariant": "^1.2.0", "uuid": "^8.3.2", "ws": "^8.5.0", - "zod": "^3.16.0" + "zod": "^3.17.3" }, "homepage": "https://github.com/orionprotocol/sdk#readme", "files": [ diff --git a/src/config/envs.json b/src/config/envs.json index b202a8d..2b1805f 100644 --- a/src/config/envs.json +++ b/src/config/envs.json @@ -44,6 +44,16 @@ } } }, + "experimental": { + "networks": { + "97": { + "api": "https://dn-dev.orionprotocol.io/bsc-testnet" + }, + "3": { + "api": "https://dn-dev.orionprotocol.io/eth-ropsten" + } + } + }, "broken": { "networks": { "0": { diff --git a/src/services/OrionAggregator/ws/MessageType.ts b/src/services/OrionAggregator/ws/MessageType.ts index bf52367..cb51d25 100644 --- a/src/services/OrionAggregator/ws/MessageType.ts +++ b/src/services/OrionAggregator/ws/MessageType.ts @@ -7,6 +7,7 @@ const MessageType = { ASSET_PAIRS_CONFIG_UPDATE: 'apcu', ADDRESS_UPDATE: 'au', BROKER_TRADABLE_ATOMIC_SWAP_ASSETS_BALANCE_UPDATE: 'btasabu', + UNSUBSCRIPTION_DONE: 'ud', } as const; export default MessageType; diff --git a/src/services/OrionAggregator/ws/index.ts b/src/services/OrionAggregator/ws/index.ts index 7682d5b..ef979ad 100644 --- a/src/services/OrionAggregator/ws/index.ts +++ b/src/services/OrionAggregator/ws/index.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; import WebSocket from 'isomorphic-ws'; -import { validate as uuidValidate } from 'uuid'; +import { validate as uuidValidate, v4 as uuidv4 } from 'uuid'; import { fullOrderSchema, orderUpdateSchema } from './schemas/addressUpdateSchema'; import MessageType from './MessageType'; import SubscriptionType from './SubscriptionType'; @@ -14,6 +14,7 @@ import { SwapInfoByAmountIn, SwapInfoByAmountOut, SwapInfoBase, FullOrder, OrderUpdate, AssetPairUpdate, OrderbookItem, Balance, } from '../../../types'; +import unsubscriptionDoneSchema from './schemas/unsubscriptionDoneSchema'; // import errorSchema from './schemas/errorSchema'; const mapFullOrder = (o: z.infer): FullOrder => ({ @@ -76,9 +77,10 @@ type BrokerTradableAtomicSwapBalanceSubscription = { } type PairConfigSubscription = { - callback: ( + callback: ({ kind, data }: { + kind: 'initial' | 'update', data: Partial>, - ) => void, + }) => void, } type AggregatedOrderbookSubscription = { @@ -94,18 +96,32 @@ type SwapInfoSubscription = { payload: SwapSubscriptionRequest, callback: (swapInfo: SwapInfoByAmountIn | SwapInfoByAmountOut) => void, } -type AddressUpdateSubscription = { - payload: string, - callback: ({ fullOrders, orderUpdate, balances } : { - fullOrders?: FullOrder[], - orderUpdate?: OrderUpdate | FullOrder, - balances?: Partial< + +type AddressUpdateUpdate = { + kind: 'update', + balances: Partial< Record< string, Balance > - >, - }) => void, + >, + order?: OrderUpdate | FullOrder +} + +type AddressUpdateInitial = { + kind: 'initial', + balances: Partial< + Record< + string, + Balance + > + >, + orders?: FullOrder[] // The field is not defined if the user has no orders +} + +type AddressUpdateSubscription = { + payload: string, + callback: (data: AddressUpdateUpdate | AddressUpdateInitial) => void, } type Subscription = { @@ -115,21 +131,22 @@ type Subscription = { [SubscriptionType.BROKER_TRADABLE_ATOMIC_SWAP_ASSETS_BALANCE_UPDATES_SUBSCRIBE]: BrokerTradableAtomicSwapBalanceSubscription, [SubscriptionType.SWAP_SUBSCRIBE]: SwapInfoSubscription } - -type Subscriptions = { - [K in T]: Subscription[K] -} class OrionAggregatorWS { private ws: WebSocket | undefined; - private subscriptions: Partial> = {}; + private subscriptions: Partial<{ + [K in keyof Subscription]: Subscription[K] + }> = {}; + + private onInit?: () => void; private onError?: (err: string) => void; private readonly wsUrl: string; - constructor(wsUrl: string, onError?: (err: string) => void) { + constructor(wsUrl: string, onInit?: () => void, onError?: (err: string) => void) { this.wsUrl = wsUrl; + this.onInit = onInit; this.onError = onError; } @@ -160,6 +177,7 @@ class OrionAggregatorWS { if (!this.ws) this.init(); this.send({ T: type, + id: uuidv4(), ...('payload' in subscription) && { S: subscription.payload, }, @@ -170,6 +188,7 @@ class OrionAggregatorWS { unsubscribe(subscription: keyof typeof UnsubscriptionType | string) { this.send({ + id: uuidv4(), T: UNSUBSCRIBE, S: subscription, }); @@ -221,6 +240,7 @@ class OrionAggregatorWS { orderBookSchema, swapInfoSchema, errorSchema, + unsubscriptionDoneSchema, ]); const json = messageSchema.parse(rawJson); @@ -280,8 +300,9 @@ class OrionAggregatorWS { } } break; - // case MessageType.INITIALIZATION: - // break; + case MessageType.INITIALIZATION: + this.onInit?.(); + break; case MessageType.AGGREGATED_ORDER_BOOK_UPDATE: { const { ob, S } = json; const mapOrderbookItems = (rawItems: typeof ob.a | typeof ob.b) => rawItems.reduce((acc, item) => { @@ -324,7 +345,10 @@ class OrionAggregatorWS { }), {}); this.subscriptions[ SubscriptionType.ASSET_PAIRS_CONFIG_UPDATES_SUBSCRIBE - ]?.callback(priceUpdates); + ]?.callback({ + kind: json.k === 'i' ? 'initial' : 'update', + data: priceUpdates, + }); } break; case MessageType.ADDRESS_UPDATE: { @@ -356,7 +380,8 @@ class OrionAggregatorWS { this.subscriptions[ SubscriptionType.ADDRESS_UPDATES_SUBSCRIBE ]?.callback({ - fullOrders, + kind: 'initial', + orders: fullOrders, balances, }); } @@ -373,7 +398,8 @@ class OrionAggregatorWS { this.subscriptions[ SubscriptionType.ADDRESS_UPDATES_SUBSCRIBE ]?.callback({ - orderUpdate, + kind: 'update', + order: orderUpdate, balances, }); } diff --git a/src/services/OrionAggregator/ws/schemas/assetPairsConfigSchema.ts b/src/services/OrionAggregator/ws/schemas/assetPairsConfigSchema.ts index 1cf160f..48e563f 100644 --- a/src/services/OrionAggregator/ws/schemas/assetPairsConfigSchema.ts +++ b/src/services/OrionAggregator/ws/schemas/assetPairsConfigSchema.ts @@ -4,6 +4,7 @@ import baseMessageSchema from './baseMessageSchema'; const assetPairsConfigSchema = baseMessageSchema.extend({ T: z.literal(MessageType.ASSET_PAIRS_CONFIG_UPDATE), + k: z.enum(['i', 'u']), u: z.array( z.tuple([ z.string(), // pairName diff --git a/src/services/OrionAggregator/ws/schemas/baseMessageSchema.ts b/src/services/OrionAggregator/ws/schemas/baseMessageSchema.ts index ec6c749..afec88d 100644 --- a/src/services/OrionAggregator/ws/schemas/baseMessageSchema.ts +++ b/src/services/OrionAggregator/ws/schemas/baseMessageSchema.ts @@ -3,6 +3,7 @@ import MessageType from '../MessageType'; const baseMessageSchema = z.object({ T: z.nativeEnum(MessageType), + id: z.string().optional(), _: z.number(), }); diff --git a/src/services/OrionAggregator/ws/schemas/unsubscriptionDoneSchema.ts b/src/services/OrionAggregator/ws/schemas/unsubscriptionDoneSchema.ts new file mode 100644 index 0000000..4dbe81d --- /dev/null +++ b/src/services/OrionAggregator/ws/schemas/unsubscriptionDoneSchema.ts @@ -0,0 +1,9 @@ +import { z } from 'zod'; +import MessageType from '../MessageType'; +import baseMessageSchema from './baseMessageSchema'; + +const unsubscriptionDoneSchema = baseMessageSchema.extend({ + T: z.literal(MessageType.UNSUBSCRIPTION_DONE), +}); + +export default unsubscriptionDoneSchema; From 76c0fcbad5307b4563709424acd50ed10a9881aa Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Fri, 27 May 2022 10:00:39 +0400 Subject: [PATCH 02/10] Docs updated --- README.md | 36 ++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c9fbaa6..bb09aa1 100644 --- a/README.md +++ b/README.md @@ -276,24 +276,28 @@ orionUnit.orionAggregator.ws.subscribe( "aus", // ADDRESS_UPDATES_SUBSCRIBE — orders, balances { payload: "0x0000000000000000000000000000000000000000", // Some wallet address - callback: ({ fullOrders, orderUpdate, balances }) => { - // Each field is optional - if (fullOrders) console.log(fullOrders); // Completed orders - - if (orderUpdate) { - switch (orderUpdate.kind) { - case "full": - console.log("Order completed", orderUpdate); - break; - case "update": - console.log("Order in the process of execution", orderUpdate); - break; - default: - break; + callback: (data) => { + switch (data.kind) { + case "initial": + if (data.orders) console.log(data.orders); // All orders. "orders" is undefined if you don't have any orders yet + console.log(data.balances); // Since this is initial message, the balances contain all assets + break; + case "update": { + if (data.order) { + switch (data.order.kind) { + case "full": + console.log("Pool order", data.order); // Orders from the pool go into history with the SETTLED status + break; + case "update": + console.log("Order in the process of execution", data.order); + break; + default: + break; + } + } + if (balances) console.log("Balance update", balances); // Since this is an update message, the balances only contain the changed assets } } - - if (balances) console.log("Balance update", balances); }, } ); diff --git a/package.json b/package.json index 7154210..237383f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.1", + "version": "0.10.4-rc.2", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", From 1b660c9ada641f5222fbc2450509c590dd68c6a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Fri, 27 May 2022 10:46:54 +0400 Subject: [PATCH 03/10] Change prerelease workflow --- .github/workflows/prerelease-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease-package.yml b/.github/workflows/prerelease-package.yml index d9fb5d6..98cd052 100644 --- a/.github/workflows/prerelease-package.yml +++ b/.github/workflows/prerelease-package.yml @@ -2,8 +2,8 @@ name: Prerelease on: push: - branches: - - 'develop' + branches-ignore: + - 'main' jobs: build-and-publish: From fd212d23668f67004b669937ef426e1f1343d827 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sat, 28 May 2022 11:17:18 +0400 Subject: [PATCH 04/10] poolOnly --- .vscode/settings.json | 4 +++- README.md | 3 +++ package.json | 2 +- src/OrionUnit/Exchange/swapMarket.ts | 13 ++++++++++++- src/services/OrionAggregator/index.ts | 6 +++++- src/services/OrionAggregator/ws/index.ts | 3 ++- src/types.ts | 4 ++++ 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c5bb9b..131a6c4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,8 @@ { "cSpell.words": [ + "ASCENDEX", "bignumber", - "denormalized" + "denormalized", + "KUCOIN" ] } \ No newline at end of file diff --git a/README.md b/README.md index bb09aa1..362fc7b 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,8 @@ orionUnit.exchange slippagePercent: 1, signer: wallet, // or signer when UI options: { + // All options are optional 🙂 + poolOnly: true, // You can specify whether you want to perform the exchange only through the pool logger: console.log, // Set it to true if you want the issues associated with // the lack of allowance to be automatically corrected @@ -252,6 +254,7 @@ orionUnit.orionAggregator.ws.subscribe( i: assetIn, // asset in o: assetOut, // asset out e: true, // true when type of swap is exactSpend, can be omitted (true by default) + es: ['ORION_POOL'] // OPTIONAL! Specify ['ORION_POOL'] if you want "pool only" swap execution a: 5.62345343, // amount }, // Handle data update in your way diff --git a/package.json b/package.json index 237383f..9b06ce2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.2", + "version": "0.10.4-rc.3", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", diff --git a/src/OrionUnit/Exchange/swapMarket.ts b/src/OrionUnit/Exchange/swapMarket.ts index 87abbde..9ce4faa 100644 --- a/src/OrionUnit/Exchange/swapMarket.ts +++ b/src/OrionUnit/Exchange/swapMarket.ts @@ -21,6 +21,7 @@ export type SwapMarketParams = { signer: ethers.Signer, orionUnit: OrionUnit, options?: { + poolOnly?: boolean, logger?: (message: string) => void, autoApprove?: boolean, developer?: { @@ -115,7 +116,17 @@ export default async function swapMarket({ signer, ); - const swapInfo = await simpleFetch(orionAggregator.getSwapInfo)(type, assetIn, assetOut, amount.toString()); + const swapInfo = await simpleFetch(orionAggregator.getSwapInfo)( + type, + assetIn, + assetOut, + amount.toString(), + options?.poolOnly ? ['ORION_POOL'] : undefined, + ); + + if (options?.poolOnly === true && options.poolOnly !== swapInfo.isThroughPoolOptimal) { + throw new Error(`Unexpected Orion Aggregator response. Please, contact support. Report swap request id: ${swapInfo.id}`); + } if (swapInfo.type === 'exactReceive' && amountBN.lt(swapInfo.minAmountOut)) { throw new Error(`Amount is too low. Min amountOut is ${swapInfo.minAmountOut} ${assetOut}`); diff --git a/src/services/OrionAggregator/index.ts b/src/services/OrionAggregator/index.ts index 55bfe84..2a3c909 100644 --- a/src/services/OrionAggregator/index.ts +++ b/src/services/OrionAggregator/index.ts @@ -9,7 +9,7 @@ import errorSchema from './schemas/errorSchema'; import placeAtomicSwapSchema from './schemas/placeAtomicSwapSchema'; import { OrionAggregatorWS } from './ws'; import { atomicSwapHistorySchema } from './schemas/atomicSwapHistorySchema'; -import { SignedCancelOrderRequest, SignedOrder } from '../../types'; +import { Exchange, SignedCancelOrderRequest, SignedOrder } from '../../types'; import { pairConfigSchema } from './schemas'; import { aggregatedOrderbookSchema, exchangeOrderbookSchema, @@ -151,6 +151,7 @@ class OrionAggregator { assetIn: string, assetOut: string, amount: string, + exchanges?: Exchange[], ) => { const url = new URL(`${this.apiUrl}/api/v1/swap`); url.searchParams.append('assetIn', assetIn); @@ -160,6 +161,9 @@ class OrionAggregator { } else { url.searchParams.append('amountOut', amount); } + if (exchanges) { + url.searchParams.append('exchanges', exchanges.join(',')); + } return fetchWithValidation( url.toString(), diff --git a/src/services/OrionAggregator/ws/index.ts b/src/services/OrionAggregator/ws/index.ts index ef979ad..64d0a24 100644 --- a/src/services/OrionAggregator/ws/index.ts +++ b/src/services/OrionAggregator/ws/index.ts @@ -12,7 +12,7 @@ import { import UnsubscriptionType from './UnsubscriptionType'; import { SwapInfoByAmountIn, SwapInfoByAmountOut, SwapInfoBase, - FullOrder, OrderUpdate, AssetPairUpdate, OrderbookItem, Balance, + FullOrder, OrderUpdate, AssetPairUpdate, OrderbookItem, Balance, Exchange, } from '../../../types'; import unsubscriptionDoneSchema from './schemas/unsubscriptionDoneSchema'; // import errorSchema from './schemas/errorSchema'; @@ -69,6 +69,7 @@ type SwapSubscriptionRequest = { i: string, // asset in o: string, // asset out a: number // amount IN/OUT + es?: Exchange[], // exchange list e?: boolean; // is amount IN? Value `false` means a = amount OUT, `true` if omitted } diff --git a/src/types.ts b/src/types.ts index 2bf243b..37aa007 100644 --- a/src/types.ts +++ b/src/types.ts @@ -195,3 +195,7 @@ export type BalanceIssue = { readonly sources: Source[], readonly fixes?: Fix[], } + +const availableExchanges = ['ORION_POOL', 'ASCENDEX', 'BINANCE', 'KUCOIN'] as const; + +export type Exchange = typeof availableExchanges[number]; From 1702910a266f168c4ff73a9a13871801256c571d Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sat, 28 May 2022 12:29:12 +0400 Subject: [PATCH 05/10] Update format --- README.md | 11 +++++++---- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- src/services/OrionAggregator/index.ts | 4 +++- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 362fc7b..6c2d9a3 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,7 @@ const swapInfo = await simpleFetch(orionUnit.orionAggregator.getSwapInfo)( assetIn: 'ORN', assetOut: 'USDT', amount: 6.23453457, + exchanges: ['ORION_POOL'] // OPTIONAL! Specify ['ORION_POOL'] if you want "pool only" swap execution ); ``` @@ -200,10 +201,12 @@ const { orderId } = await simpleFetch(orionUnit.orionAggregator.placeOrder)( // Default ("verbose") fetch -const placeOrderFetchResult = await orionUnit.orionAggregator - .placeOrder - // Same params as above - (); +const placeOrderFetchResult = await orionUnit.orionAggregator.placeOrder( + { + // Same params as above + }, + false +); if (placeOrderFetchResult.isErr()) { // You can handle fetching errors here diff --git a/package-lock.json b/package-lock.json index 57d541e..992456d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.0", + "version": "0.10.4-rc.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.0", + "version": "0.10.4-rc.3", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", @@ -45,7 +45,7 @@ "jest": "^27.5.1", "ts-loader": "^9.2.8", "typechain": "^8.0.0", - "typescript": "^4.6.3", + "typescript": "^4.7.2", "webpack": "^5.72.0", "webpack-cli": "^4.9.2" } @@ -10619,9 +10619,9 @@ } }, "node_modules/typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", + "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -18509,9 +18509,9 @@ } }, "typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", + "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==", "dev": true }, "typical": { diff --git a/package.json b/package.json index 9b06ce2..9e483c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.3", + "version": "0.10.4-rc.4", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", @@ -55,7 +55,7 @@ "jest": "^27.5.1", "ts-loader": "^9.2.8", "typechain": "^8.0.0", - "typescript": "^4.6.3", + "typescript": "^4.7.2", "webpack": "^5.72.0", "webpack-cli": "^4.9.2" }, diff --git a/src/services/OrionAggregator/index.ts b/src/services/OrionAggregator/index.ts index 2a3c909..545663d 100644 --- a/src/services/OrionAggregator/index.ts +++ b/src/services/OrionAggregator/index.ts @@ -162,7 +162,9 @@ class OrionAggregator { url.searchParams.append('amountOut', amount); } if (exchanges) { - url.searchParams.append('exchanges', exchanges.join(',')); + exchanges.forEach((exchange) => { + url.searchParams.append('exchanges', exchange); + }); } return fetchWithValidation( From d9294673b50f2c28832fb6a7c705d35476555355 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sat, 28 May 2022 17:02:27 +0400 Subject: [PATCH 06/10] Logger improvements --- src/BalanceGuard.ts | 11 ++++++++--- src/OrionUnit/Exchange/swapMarket.ts | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/BalanceGuard.ts b/src/BalanceGuard.ts index 2496040..f18decd 100644 --- a/src/BalanceGuard.ts +++ b/src/BalanceGuard.ts @@ -27,16 +27,20 @@ export default class BalanceGuard { private readonly signer: ethers.Signer; + private readonly logger?: (message: string) => void; + constructor( balances: Partial>>, nativeCryptocurrency: Asset, provider: ethers.providers.Provider, signer: ethers.Signer, + logger?: (message: string) => void, ) { this.balances = balances; this.nativeCryptocurrency = nativeCryptocurrency; this.provider = provider; this.signer = signer; + this.logger = logger; } registerRequirement(expense: BalanceRequirement) { @@ -132,11 +136,12 @@ export default class BalanceGuard { const gasLimit = await this.provider.estimateGas(unsignedApproveTx); unsignedApproveTx.gasLimit = gasLimit; + this.logger?.('Approve transaction signing...'); const signedTx = await this.signer.signTransaction(unsignedApproveTx); const txResponse = await this.provider.sendTransaction(signedTx); - console.log(`${issue.asset.name} approve transaction sent ${txResponse.hash}. Waiting for confirmation...`); + this.logger?.(`${issue.asset.name} approve transaction sent ${txResponse.hash}. Waiting for confirmation...`); await txResponse.wait(); - console.log(`${issue.asset.name} approve transaction confirmed.`); + this.logger?.(`${issue.asset.name} approve transaction confirmed.`); }; await issue.fixes?.reduce(async (promise, item) => { await promise; @@ -156,7 +161,7 @@ export default class BalanceGuard { }; async check(fixAutofixable?: boolean) { - console.log(`Balance requirements: ${this.requirements + this.logger?.(`Balance requirements: ${this.requirements .map((requirement) => `${requirement.amount} ${requirement.asset.name} ` + `for '${requirement.reason}' ` + `from [${requirement.sources.join(' + ')}]`) diff --git a/src/OrionUnit/Exchange/swapMarket.ts b/src/OrionUnit/Exchange/swapMarket.ts index 9ce4faa..7ed7e1d 100644 --- a/src/OrionUnit/Exchange/swapMarket.ts +++ b/src/OrionUnit/Exchange/swapMarket.ts @@ -114,6 +114,7 @@ export default async function swapMarket({ }, provider, signer, + options?.logger, ); const swapInfo = await simpleFetch(orionAggregator.getSwapInfo)( @@ -231,8 +232,8 @@ export default async function swapMarket({ const nonce = await provider.getTransactionCount(walletAddress, 'pending'); unsignedSwapThroughOrionPoolTx.nonce = nonce; - const signedSwapThroughOrionPoolTx = await signer.signTransaction(unsignedSwapThroughOrionPoolTx); - const swapThroughOrionPoolTxResponse = await provider.sendTransaction(signedSwapThroughOrionPoolTx); + options?.logger?.('Signing transaction...'); + const swapThroughOrionPoolTxResponse = await signer.sendTransaction(unsignedSwapThroughOrionPoolTx); return { through: 'orion_pool', txHash: swapThroughOrionPoolTxResponse.hash, From 9e8b90e4771f9f0b29edd72071a949d0a591f3eb Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sun, 29 May 2022 18:33:23 +0400 Subject: [PATCH 07/10] Webpack / contracts --- .eslintrc.js | 1 + README.md | 18 +- package-lock.json | 679 +------ package.json | 16 +- src/BalanceGuard.ts | 11 +- src/OrionUnit/Exchange/deposit.ts | 5 +- src/OrionUnit/Exchange/swapMarket.ts | 5 +- src/OrionUnit/Exchange/withdraw.ts | 5 +- src/OrionUnit/FarmingManager/index.ts | 14 +- src/abis/CustomStakingReward.json | 494 ----- src/abis/ERC20.json | 222 --- src/abis/Exchange.json | 1687 ----------------- src/abis/IDOCollector.json | 524 ----- src/abis/IDODistributor.json | 362 ---- src/abis/IUniswapV2Pair.json | 1 - src/abis/IUniswapV2Router.json | 1 - src/abis/LiquidityMigrator.json | 159 -- src/abis/OrionGovernance.json | 851 --------- src/abis/OrionMigrator.json | 1 - src/abis/OrionPoolV2Factory.json | 1 - src/abis/OrionStakingReward.json | 507 ----- src/abis/OrionVoting.json | 1 - src/abis/PriceOracle.json | 273 --- src/abis/StakingRewardsWithLongTermBonus.json | 1 - src/entities/Exchange.ts | 6 +- src/index.ts | 1 - src/utils/checkIsToken.ts | 2 +- src/utils/getBalance.ts | 9 +- src/utils/getBalances.ts | 4 +- tsconfig.json | 6 +- webpack.config.js | 36 +- 31 files changed, 98 insertions(+), 5805 deletions(-) delete mode 100644 src/abis/CustomStakingReward.json delete mode 100644 src/abis/ERC20.json delete mode 100644 src/abis/Exchange.json delete mode 100644 src/abis/IDOCollector.json delete mode 100644 src/abis/IDODistributor.json delete mode 100644 src/abis/IUniswapV2Pair.json delete mode 100644 src/abis/IUniswapV2Router.json delete mode 100644 src/abis/LiquidityMigrator.json delete mode 100644 src/abis/OrionGovernance.json delete mode 100644 src/abis/OrionMigrator.json delete mode 100644 src/abis/OrionPoolV2Factory.json delete mode 100644 src/abis/OrionStakingReward.json delete mode 100644 src/abis/OrionVoting.json delete mode 100644 src/abis/PriceOracle.json delete mode 100644 src/abis/StakingRewardsWithLongTermBonus.json diff --git a/.eslintrc.js b/.eslintrc.js index 66b8648..f42aa78 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -26,6 +26,7 @@ module.exports = { '@typescript-eslint', ], rules: { + "camelcase": "off", '@typescript-eslint/consistent-type-assertions': [ 'error', { diff --git a/README.md b/README.md index 6c2d9a3..f246137 100644 --- a/README.md +++ b/README.md @@ -131,21 +131,23 @@ const candles = await simpleFetch(orionUnit.priceFeed.getCandles)( ### Using contracts ```ts -import { contracts } from "@orionprotocol/sdk"; +import { + Exchange__factory, + ERC20__factory, + OrionGovernance__factory, + OrionVoting__factory, +} from "@orionprotocol/contracts/ethers"; -const exchangeContract = contracts.Exchange__factory.connect( +const exchangeContract = Exchange__factory.connect( exchangeContractAddress, orionUnit.provider ); -const erc20Contract = contracts.ERC20__factory.connect( - tokenAddress, - orionUnit.provider -); -const governanceContract = contracts.OrionGovernance__factory.connect( +const erc20Contract = ERC20__factory.connect(tokenAddress, orionUnit.provider); +const governanceContract = OrionGovernance__factory.connect( governanceAddress, orionUnit.provider ); -const orionVoting = contracts.OrionVoting__factory.connect( +const orionVoting = OrionVoting__factory.connect( votingContractAddress, orionUnit.provider ); diff --git a/package-lock.json b/package-lock.json index 992456d..dfca9b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,18 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.3", + "version": "0.10.4-rc.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.3", + "version": "0.10.4-rc.4", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", + "@orionprotocol/contracts": "0.0.7", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -28,7 +29,6 @@ "zod": "^3.17.3" }, "devDependencies": { - "@typechain/ethers-v5": "^10.0.0", "@types/node": "^17.0.23", "@types/socket.io-client": "1.4.33", "@types/uuid": "^8.3.4", @@ -43,8 +43,7 @@ "eslint-plugin-import": "^2.25.4", "husky": "^7.0.4", "jest": "^27.5.1", - "ts-loader": "^9.2.8", - "typechain": "^8.0.0", + "ts-loader": "^9.3.0", "typescript": "^4.7.2", "webpack": "^5.72.0", "webpack-cli": "^4.9.2" @@ -2486,6 +2485,11 @@ "node": ">= 8" } }, + "node_modules/@orionprotocol/contracts": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", + "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + }, "node_modules/@sinonjs/commons": { "version": "1.8.3", "dev": true, @@ -2510,24 +2514,6 @@ "node": ">= 6" } }, - "node_modules/@typechain/ethers-v5": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-10.0.0.tgz", - "integrity": "sha512-Kot7fwAqnH96ZbI8xrRgj5Kpv9yCEdjo7mxRqrH7bYpEgijT5MmuOo8IVsdhOu7Uog4ONg7k/d5UdbAtTKUgsA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15", - "ts-essentials": "^7.0.1" - }, - "peerDependencies": { - "@ethersproject/abi": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/providers": "^5.0.0", - "ethers": "^5.1.3", - "typechain": "^8.0.0", - "typescript": ">=4.3.0" - } - }, "node_modules/@types/babel__core": { "version": "7.1.18", "dev": true, @@ -3211,15 +3197,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/array-back": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", - "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/array-includes": { "version": "3.1.4", "dev": true, @@ -4199,125 +4176,6 @@ "node": ">= 0.8" } }, - "node_modules/command-line-args": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", - "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", - "dev": true, - "dependencies": { - "array-back": "^3.1.0", - "find-replace": "^3.0.0", - "lodash.camelcase": "^4.3.0", - "typical": "^4.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/command-line-usage": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.2.tgz", - "integrity": "sha512-I+0XN613reAhpBQ6icsPOTwu9cvhc9NtLtUcY2fGYuwm9JZiWBzFDA8w0PHqQjru7Xth7fM/y9TJ13+VKdjh7Q==", - "dev": true, - "dependencies": { - "array-back": "^4.0.1", - "chalk": "^2.4.2", - "table-layout": "^1.0.1", - "typical": "^5.2.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/command-line-usage/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/command-line-usage/node_modules/array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/command-line-usage/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/command-line-usage/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/command-line-usage/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/command-line-usage/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/command-line-usage/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/command-line-usage/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/command-line-usage/node_modules/typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4570,15 +4428,6 @@ "dev": true, "license": "MIT" }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/deep-is": { "version": "0.1.4", "dev": true, @@ -5624,18 +5473,6 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1" } }, - "node_modules/find-replace": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", - "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", - "dev": true, - "dependencies": { - "array-back": "^3.0.1" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/find-up": { "version": "2.1.0", "dev": true, @@ -5677,20 +5514,6 @@ "node": ">= 6" } }, - "node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "dev": true, @@ -8833,15 +8656,6 @@ "json5": "lib/cli.js" } }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/just-clone": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-5.0.1.tgz", @@ -8941,12 +8755,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, "node_modules/lodash.merge": { "version": "4.6.2", "dev": true, @@ -9106,18 +8914,6 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/ms": { "version": "2.1.2", "dev": true, @@ -9572,21 +9368,6 @@ "node": ">= 0.8.0" } }, - "node_modules/prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", - "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -9696,15 +9477,6 @@ "node": ">= 0.10" } }, - "node_modules/reduce-flatten": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", - "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", @@ -10137,12 +9909,6 @@ } ] }, - "node_modules/string-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-format/-/string-format-2.0.0.tgz", - "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==", - "dev": true - }, "node_modules/string.prototype.trimend": { "version": "1.0.4", "dev": true, @@ -10244,39 +10010,6 @@ "dev": true, "license": "MIT" }, - "node_modules/table-layout": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", - "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", - "dev": true, - "dependencies": { - "array-back": "^4.0.1", - "deep-extend": "~0.6.0", - "typical": "^5.2.0", - "wordwrapjs": "^4.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/table-layout/node_modules/array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/table-layout/node_modules/typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -10462,34 +10195,10 @@ "node": ">=0.10.0" } }, - "node_modules/ts-command-line-args": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.2.1.tgz", - "integrity": "sha512-mnK68QA86FYzQYTSA/rxIjT/8EpKsvQw9QkawPic8I8t0gjAOw3Oa509NIRoaY1FmH7hdrncMp7t7o+vYoceNQ==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "command-line-args": "^5.1.1", - "command-line-usage": "^6.1.0", - "string-format": "^2.0.0" - }, - "bin": { - "write-markdown": "dist/write-markdown.js" - } - }, - "node_modules/ts-essentials": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-7.0.3.tgz", - "integrity": "sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==", - "dev": true, - "peerDependencies": { - "typescript": ">=3.7.0" - } - }, "node_modules/ts-loader": { - "version": "9.2.8", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.8.tgz", - "integrity": "sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.0.tgz", + "integrity": "sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==", "dev": true, "dependencies": { "chalk": "^4.1.0", @@ -10566,50 +10275,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/typechain": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.0.0.tgz", - "integrity": "sha512-rqDfDYc9voVAhmfVfAwzg3VYFvhvs5ck1X9T/iWkX745Cul4t+V/smjnyqrbDzWDbzD93xfld1epg7Y/uFAesQ==", - "dev": true, - "dependencies": { - "@types/prettier": "^2.1.1", - "debug": "^4.3.1", - "fs-extra": "^7.0.0", - "glob": "7.1.7", - "js-sha3": "^0.8.0", - "lodash": "^4.17.15", - "mkdirp": "^1.0.4", - "prettier": "^2.3.1", - "ts-command-line-args": "^2.2.0", - "ts-essentials": "^7.0.1" - }, - "bin": { - "typechain": "dist/cli/cli.js" - }, - "peerDependencies": { - "typescript": ">=4.3.0" - } - }, - "node_modules/typechain/node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", "dev": true, @@ -10631,15 +10296,6 @@ "node": ">=4.2.0" } }, - "node_modules/typical": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", - "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/unbox-primitive": { "version": "1.0.1", "dev": true, @@ -10953,28 +10609,6 @@ "node": ">=0.10.0" } }, - "node_modules/wordwrapjs": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", - "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", - "dev": true, - "dependencies": { - "reduce-flatten": "^2.0.0", - "typical": "^5.2.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/wordwrapjs/node_modules/typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/wrappy": { "version": "1.0.2", "dev": true, @@ -12707,6 +12341,11 @@ "fastq": "^1.6.0" } }, + "@orionprotocol/contracts": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", + "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + }, "@sinonjs/commons": { "version": "1.8.3", "dev": true, @@ -12725,16 +12364,6 @@ "version": "1.1.2", "dev": true }, - "@typechain/ethers-v5": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-10.0.0.tgz", - "integrity": "sha512-Kot7fwAqnH96ZbI8xrRgj5Kpv9yCEdjo7mxRqrH7bYpEgijT5MmuOo8IVsdhOu7Uog4ONg7k/d5UdbAtTKUgsA==", - "dev": true, - "requires": { - "lodash": "^4.17.15", - "ts-essentials": "^7.0.1" - } - }, "@types/babel__core": { "version": "7.1.18", "dev": true, @@ -13247,12 +12876,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "array-back": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", - "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", - "dev": true - }, "array-includes": { "version": "3.1.4", "dev": true, @@ -14006,100 +13629,6 @@ "delayed-stream": "~1.0.0" } }, - "command-line-args": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", - "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", - "dev": true, - "requires": { - "array-back": "^3.1.0", - "find-replace": "^3.0.0", - "lodash.camelcase": "^4.3.0", - "typical": "^4.0.0" - } - }, - "command-line-usage": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.2.tgz", - "integrity": "sha512-I+0XN613reAhpBQ6icsPOTwu9cvhc9NtLtUcY2fGYuwm9JZiWBzFDA8w0PHqQjru7Xth7fM/y9TJ13+VKdjh7Q==", - "dev": true, - "requires": { - "array-back": "^4.0.1", - "chalk": "^2.4.2", - "table-layout": "^1.0.1", - "typical": "^5.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true - } - } - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -14295,12 +13824,6 @@ "version": "0.7.0", "dev": true }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, "deep-is": { "version": "0.1.4", "dev": true @@ -15057,15 +14580,6 @@ "pkg-dir": "^4.1.0" } }, - "find-replace": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", - "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", - "dev": true, - "requires": { - "array-back": "^3.0.1" - } - }, "find-up": { "version": "2.1.0", "dev": true, @@ -15094,17 +14608,6 @@ "mime-types": "^2.1.12" } }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs.realpath": { "version": "1.0.0", "dev": true @@ -17289,15 +16792,6 @@ "minimist": "^1.2.0" } }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, "just-clone": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-5.0.1.tgz", @@ -17366,12 +16860,6 @@ "version": "4.17.21", "dev": true }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "dev": true @@ -17485,12 +16973,6 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "ms": { "version": "2.1.2", "dev": true @@ -17790,12 +17272,6 @@ "version": "1.2.1", "dev": true }, - "prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", - "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", - "dev": true - }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -17873,12 +17349,6 @@ "resolve": "^1.9.0" } }, - "reduce-flatten": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", - "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", - "dev": true - }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", @@ -18187,12 +17657,6 @@ } } }, - "string-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-format/-/string-format-2.0.0.tgz", - "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==", - "dev": true - }, "string.prototype.trimend": { "version": "1.0.4", "dev": true, @@ -18251,32 +17715,6 @@ "version": "3.2.4", "dev": true }, - "table-layout": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", - "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", - "dev": true, - "requires": { - "array-back": "^4.0.1", - "deep-extend": "~0.6.0", - "typical": "^5.2.0", - "wordwrapjs": "^4.0.0" - }, - "dependencies": { - "array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "dev": true - }, - "typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true - } - } - }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -18396,29 +17834,10 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, - "ts-command-line-args": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.2.1.tgz", - "integrity": "sha512-mnK68QA86FYzQYTSA/rxIjT/8EpKsvQw9QkawPic8I8t0gjAOw3Oa509NIRoaY1FmH7hdrncMp7t7o+vYoceNQ==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "command-line-args": "^5.1.1", - "command-line-usage": "^6.1.0", - "string-format": "^2.0.0" - } - }, - "ts-essentials": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-7.0.3.tgz", - "integrity": "sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==", - "dev": true, - "requires": {} - }, "ts-loader": { - "version": "9.2.8", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.8.tgz", - "integrity": "sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.0.tgz", + "integrity": "sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==", "dev": true, "requires": { "chalk": "^4.1.0", @@ -18467,40 +17886,6 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, - "typechain": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.0.0.tgz", - "integrity": "sha512-rqDfDYc9voVAhmfVfAwzg3VYFvhvs5ck1X9T/iWkX745Cul4t+V/smjnyqrbDzWDbzD93xfld1epg7Y/uFAesQ==", - "dev": true, - "requires": { - "@types/prettier": "^2.1.1", - "debug": "^4.3.1", - "fs-extra": "^7.0.0", - "glob": "7.1.7", - "js-sha3": "^0.8.0", - "lodash": "^4.17.15", - "mkdirp": "^1.0.4", - "prettier": "^2.3.1", - "ts-command-line-args": "^2.2.0", - "ts-essentials": "^7.0.1" - }, - "dependencies": { - "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, "typedarray-to-buffer": { "version": "3.1.5", "dev": true, @@ -18514,12 +17899,6 @@ "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==", "dev": true }, - "typical": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", - "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", - "dev": true - }, "unbox-primitive": { "version": "1.0.1", "dev": true, @@ -18741,24 +18120,6 @@ "version": "1.2.3", "dev": true }, - "wordwrapjs": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", - "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", - "dev": true, - "requires": { - "reduce-flatten": "^2.0.0", - "typical": "^5.2.0" - }, - "dependencies": { - "typical": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", - "dev": true - } - } - }, "wrappy": { "version": "1.0.2", "dev": true diff --git a/package.json b/package.json index 9e483c1..c2b9b80 100644 --- a/package.json +++ b/package.json @@ -1,24 +1,23 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.4", + "version": "0.10.4-rc.5", "description": "Orion Protocol SDK", - "main": "./lib/esm/index.js", + "main": "./lib/main.js", "module": "./lib/esm/index.js", - "types": "./lib/esm/index.d.ts", + "types": "./lib/esm/types.d.ts", "scripts": { "start": "npm run build && node lib/esm/index.js", "develop": "concurrently -i -k -p \"[{name}]\" -n \"Node,TypeScript\" -c \"yellow.bold,cyan.bold\" \"yarn watch-js\" \"yarn watch-ts\"", "clean": "rimraf lib/*", - "watch-ts": "npm run typechain:generate-types && tsc -w --skipLibCheck", + "watch-ts": "tsc -w --skipLibCheck", "watch-js": "nodemon lib/esm/index.js", "prepare": "npm run build", - "prebuild": "npm run typechain:generate-types && tsc", + "prebuild": "tsc", "build": "webpack", "test": "exit 0", "coverage": "jest --coverage", "lint:eslint": "eslint ./src --ext .ts,.js,.tsx,.jsx", "lint:eslint:fix": "eslint ./src --ext .ts,.js,.tsx,.jsx --fix", - "typechain:generate-types": "typechain --target=ethers-v5 ./src/abis/*.json --out-dir ./src/artifacts/contracts", "postpublish": "npm run publish-npm", "publish-npm": "npm publish --access public --ignore-scripts --@orionprotocol:registry='https://registry.npmjs.org'" }, @@ -38,7 +37,6 @@ "url": "https://github.com/orionprotocol/sdk/issues" }, "devDependencies": { - "@typechain/ethers-v5": "^10.0.0", "@types/node": "^17.0.23", "@types/socket.io-client": "1.4.33", "@types/uuid": "^8.3.4", @@ -53,8 +51,7 @@ "eslint-plugin-import": "^2.25.4", "husky": "^7.0.4", "jest": "^27.5.1", - "ts-loader": "^9.2.8", - "typechain": "^8.0.0", + "ts-loader": "^9.3.0", "typescript": "^4.7.2", "webpack": "^5.72.0", "webpack-cli": "^4.9.2" @@ -63,6 +60,7 @@ "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", + "@orionprotocol/contracts": "0.0.7", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/src/BalanceGuard.ts b/src/BalanceGuard.ts index f18decd..9bf5bac 100644 --- a/src/BalanceGuard.ts +++ b/src/BalanceGuard.ts @@ -1,7 +1,8 @@ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import clone from 'just-clone'; -import { contracts, utils } from '.'; +import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import { utils } from '.'; import { APPROVE_ERC20_GAS_LIMIT, NATIVE_CURRENCY_PRECISION } from './constants'; import { AggregatedBalanceRequirement, ApproveFix, Asset, BalanceIssue, BalanceRequirement, Source, @@ -59,7 +60,7 @@ export default class BalanceGuard { spenderAddress: string, ) { const walletAddress = await this.signer.getAddress(); - const tokenContract = contracts.ERC20__factory + const tokenContract = ERC20__factory .connect(assetAddress, this.provider); const unsignedTx = await tokenContract.populateTransaction .approve( @@ -112,7 +113,7 @@ export default class BalanceGuard { balanceIssues: BalanceIssue[], ) => { const fixBalanceIssue = async (issue: BalanceIssue) => { - const tokenContract = contracts.ERC20__factory.connect(issue.asset.address, this.provider); + const tokenContract = ERC20__factory.connect(issue.asset.address, this.provider); const approve = async ({ spenderAddress, targetAmount }: ApproveFix) => { const bnTargetAmount = new BigNumber(targetAmount); const unsignedApproveTx = await tokenContract @@ -232,7 +233,7 @@ export default class BalanceGuard { denormalizedAllowance = remainingBalance.wallet; } else { if (!spenderAddress) throw new Error(`Spender address is required for ${asset.name}`); - const tokenContract = contracts.ERC20__factory.connect(asset.address, this.provider); + const tokenContract = ERC20__factory.connect(asset.address, this.provider); const tokenDecimals = await tokenContract.decimals(); const walletAddress = await this.signer.getAddress(); const tokenAllowance = await tokenContract.allowance(walletAddress, spenderAddress); @@ -327,7 +328,7 @@ export default class BalanceGuard { denormalizedAllowance = remainingBalance.wallet; } else { if (!spenderAddress) throw new Error(`Spender address is required for ${asset.name}`); - const tokenContract = contracts.ERC20__factory.connect(asset.address, this.provider); + const tokenContract = ERC20__factory.connect(asset.address, this.provider); const tokenDecimals = await tokenContract.decimals(); const walletAddress = await this.signer.getAddress(); const tokenAllowance = await tokenContract.allowance(walletAddress, spenderAddress); diff --git a/src/OrionUnit/Exchange/deposit.ts b/src/OrionUnit/Exchange/deposit.ts index 2ade2da..9795c61 100644 --- a/src/OrionUnit/Exchange/deposit.ts +++ b/src/OrionUnit/Exchange/deposit.ts @@ -1,10 +1,11 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; +import { Exchange__factory } from '@orionprotocol/contracts/ethers'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; -import { contracts, utils } from '../..'; +import { utils } from '../..'; import { DEPOSIT_ERC20_GAS_LIMIT, DEPOSIT_ETH_GAS_LIMIT, INTERNAL_ORION_PRECISION, NATIVE_CURRENCY_PRECISION, } from '../../constants'; @@ -43,7 +44,7 @@ export default async function deposit({ const nativeCryptocurrency = getNativeCryptocurrency(assetToAddress); - const exchangeContract = contracts.Exchange__factory.connect(exchangeContractAddress, provider); + const exchangeContract = Exchange__factory.connect(exchangeContractAddress, provider); const gasPriceWei = await simpleFetch(orionBlockchain.getGasPriceWei)(); const assetAddress = assetToAddress[asset]; diff --git a/src/OrionUnit/Exchange/swapMarket.ts b/src/OrionUnit/Exchange/swapMarket.ts index 7ed7e1d..a858697 100644 --- a/src/OrionUnit/Exchange/swapMarket.ts +++ b/src/OrionUnit/Exchange/swapMarket.ts @@ -2,11 +2,12 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; +import { Exchange__factory } from '@orionprotocol/contracts/ethers'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import getAvailableSources from '../../utils/getAvailableFundsSources'; import OrionUnit from '..'; -import { contracts, crypt, utils } from '../..'; +import { crypt, utils } from '../..'; import { INTERNAL_ORION_PRECISION, NATIVE_CURRENCY_PRECISION, SWAP_THROUGH_ORION_POOL_GAS_LIMIT } from '../../constants'; import getNativeCryptocurrency from '../../utils/getNativeCryptocurrency'; import simpleFetch from '../../simpleFetch'; @@ -82,7 +83,7 @@ export default async function swapMarket({ } = await simpleFetch(orionBlockchain.getInfo)(); const nativeCryptocurrency = getNativeCryptocurrency(assetToAddress); - const exchangeContract = contracts.Exchange__factory.connect(exchangeContractAddress, provider); + const exchangeContract = Exchange__factory.connect(exchangeContractAddress, provider); const feeAssets = await simpleFetch(orionBlockchain.getTokensFee)(); const pricesInOrn = await simpleFetch(orionBlockchain.getPrices)(); const gasPriceWei = await simpleFetch(orionBlockchain.getGasPriceWei)(); diff --git a/src/OrionUnit/Exchange/withdraw.ts b/src/OrionUnit/Exchange/withdraw.ts index e04aff4..1c34bc0 100644 --- a/src/OrionUnit/Exchange/withdraw.ts +++ b/src/OrionUnit/Exchange/withdraw.ts @@ -1,10 +1,11 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; +import { Exchange__factory } from '@orionprotocol/contracts/ethers'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; -import { contracts, utils } from '../..'; +import { utils } from '../..'; import { INTERNAL_ORION_PRECISION, NATIVE_CURRENCY_PRECISION, WITHDRAW_GAS_LIMIT, } from '../../constants'; @@ -42,7 +43,7 @@ export default async function withdraw({ } = await simpleFetch(orionBlockchain.getInfo)(); const nativeCryptocurrency = getNativeCryptocurrency(assetToAddress); - const exchangeContract = contracts.Exchange__factory.connect(exchangeContractAddress, provider); + const exchangeContract = Exchange__factory.connect(exchangeContractAddress, provider); const gasPriceWei = await simpleFetch(orionBlockchain.getGasPriceWei)(); const assetAddress = assetToAddress[asset]; diff --git a/src/OrionUnit/FarmingManager/index.ts b/src/OrionUnit/FarmingManager/index.ts index 013937f..5c4c0d6 100644 --- a/src/OrionUnit/FarmingManager/index.ts +++ b/src/OrionUnit/FarmingManager/index.ts @@ -1,7 +1,7 @@ +import { Exchange__factory, IUniswapV2Pair__factory, IUniswapV2Router__factory } from '@orionprotocol/contracts/ethers'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import OrionUnit from '..'; -import { contracts } from '../..'; import BalanceGuard from '../../BalanceGuard'; import { ADD_LIQUIDITY_GAS_LIMIT, INTERNAL_ORION_PRECISION, NATIVE_CURRENCY_PRECISION } from '../../constants'; import simpleFetch from '../../simpleFetch'; @@ -51,7 +51,7 @@ export default class FarmingManager { const walletAddress = await signer.getAddress(); - const exchangeContract = contracts.Exchange__factory + const exchangeContract = Exchange__factory .connect(exchangeContractAddress, this.orionUnit.provider); const assetAAddress = assetToAddress[assetA]; @@ -90,9 +90,9 @@ export default class FarmingManager { const pool = poolsConfig.pools[poolName]; if (!pool) throw new Error(`Pool ${poolName} not found`); - const pairContract = contracts.IUniswapV2Pair__factory + const pairContract = IUniswapV2Pair__factory .connect(pool.lpTokenAddress, this.orionUnit.provider); - const routerContract = contracts.IUniswapV2Router__factory + const routerContract = IUniswapV2Router__factory .connect(poolsConfig.routerAddress, this.orionUnit.provider); let pairTokensIsInversed = false; @@ -242,7 +242,7 @@ export default class FarmingManager { const walletAddress = await signer.getAddress(); - const exchangeContract = contracts.Exchange__factory + const exchangeContract = Exchange__factory .connect(exchangeContractAddress, this.orionUnit.provider); const nativeCryptocurrency = getNativeCryptocurrency(assetToAddress); const balances = await getBalances( @@ -268,12 +268,12 @@ export default class FarmingManager { signer, ); - const pairContract = contracts.IUniswapV2Pair__factory + const pairContract = IUniswapV2Pair__factory .connect(pool.lpTokenAddress, this.orionUnit.provider); const { _reserve0, _reserve1 } = await pairContract.getReserves(); - const routerContract = contracts.IUniswapV2Router__factory + const routerContract = IUniswapV2Router__factory .connect(poolsConfig.routerAddress, this.orionUnit.provider); let pairTokensIsInversed = false; diff --git a/src/abis/CustomStakingReward.json b/src/abis/CustomStakingReward.json deleted file mode 100644 index accdf3f..0000000 --- a/src/abis/CustomStakingReward.json +++ /dev/null @@ -1,494 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardAdded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardPaid", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Staked", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Withdrawn", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "_balances", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "earned", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - } - ], - "name": "emergencyAssetWithdrawal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "exit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "getReward", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_stakingToken", - "type": "address" - }, - { - "internalType": "address", - "name": "_rewardsToken", - "type": "address" - }, - { - "internalType": "address", - "name": "_owner", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "lastTimeRewardApplicable", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "lastUpdateTime", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_reward", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_rewardsDuration", - "type": "uint256" - } - ], - "name": "notifyRewardAmount", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "periodFinish", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerToken", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerTokenStored", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardRate", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "rewards", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardsDuration", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardsToken", - "outputs": [ - { - "internalType": "contract IERC20", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "stake", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - } - ], - "name": "stakeTo", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "stakeWithPermit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "stakingToken", - "outputs": [ - { - "internalType": "contract IERC20", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "userRewardPerTokenPaid", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "withdraw", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/ERC20.json b/src/abis/ERC20.json deleted file mode 100644 index 668d697..0000000 --- a/src/abis/ERC20.json +++ /dev/null @@ -1,222 +0,0 @@ -[ - { - "constant": true, - "inputs": [], - "name": "name", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_spender", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_from", - "type": "address" - }, - { - "name": "_to", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "decimals", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "balance", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "symbol", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_to", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_owner", - "type": "address" - }, - { - "name": "_spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "payable": true, - "stateMutability": "payable", - "type": "fallback" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "from", - "type": "address" - }, - { - "indexed": true, - "name": "to", - "type": "address" - }, - { - "indexed": false, - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - } -] \ No newline at end of file diff --git a/src/abis/Exchange.json b/src/abis/Exchange.json deleted file mode 100644 index e8d28e8..0000000 --- a/src/abis/Exchange.json +++ /dev/null @@ -1,1687 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "indexed": false, - "internalType": "bytes", - "name": "secret", - "type": "bytes" - } - ], - "name": "AtomicClaimed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "indexed": false, - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - } - ], - "name": "AtomicLocked", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "indexed": false, - "internalType": "bytes", - "name": "secret", - "type": "bytes" - } - ], - "name": "AtomicRedeemed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "indexed": false, - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - } - ], - "name": "AtomicRefunded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "assetAddress", - "type": "address" - }, - { - "indexed": false, - "internalType": "bool", - "name": "isDeposit", - "type": "bool" - }, - { - "indexed": false, - "internalType": "uint112", - "name": "amount", - "type": "uint112" - }, - { - "indexed": false, - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - } - ], - "name": "NewAssetTransaction", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "buyer", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "seller", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint64", - "name": "filledPrice", - "type": "uint64" - }, - { - "indexed": false, - "internalType": "uint192", - "name": "filledAmount", - "type": "uint192" - }, - { - "indexed": false, - "internalType": "uint192", - "name": "amountQuote", - "type": "uint192" - } - ], - "name": "NewTrade", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "stateMutability": "nonpayable", - "type": "fallback" - }, - { - "inputs": [], - "name": "WETH", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "_orionpoolRouter", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "assetRisks", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "atomicSwaps", - "outputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "bool", - "name": "used", - "type": "bool" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint24", - "name": "targetChainId", - "type": "uint24" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "calcPosition", - "outputs": [ - { - "components": [ - { - "internalType": "enum MarginalFunctionality.PositionState", - "name": "state", - "type": "uint8" - }, - { - "internalType": "int256", - "name": "weightedPosition", - "type": "int256" - }, - { - "internalType": "int256", - "name": "totalPosition", - "type": "int256" - }, - { - "internalType": "int256", - "name": "totalLiabilities", - "type": "int256" - } - ], - "internalType": "struct MarginalFunctionality.Position", - "name": "", - "type": "tuple" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "checkPosition", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "internalType": "bytes", - "name": "secret", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "matcherSignature", - "type": "bytes" - } - ], - "name": "claimAtomic", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "deposit", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "assetAddress", - "type": "address" - }, - { - "internalType": "uint112", - "name": "amount", - "type": "uint112" - } - ], - "name": "depositAsset", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "buyOrder", - "type": "tuple" - }, - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "sellOrder", - "type": "tuple" - }, - { - "internalType": "uint64", - "name": "filledPrice", - "type": "uint64" - }, - { - "internalType": "uint112", - "name": "filledAmount", - "type": "uint112" - } - ], - "name": "fillOrders", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "order", - "type": "tuple" - }, - { - "internalType": "uint112", - "name": "filledAmount", - "type": "uint112" - }, - { - "internalType": "uint64", - "name": "blockchainFee", - "type": "uint64" - }, - { - "internalType": "address[]", - "name": "path", - "type": "address[]" - } - ], - "name": "fillThroughOrionPool", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "filledAmounts", - "outputs": [ - { - "internalType": "uint192", - "name": "", - "type": "uint192" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "assetAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getBalance", - "outputs": [ - { - "internalType": "int192", - "name": "", - "type": "int192" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "assetsAddresses", - "type": "address[]" - }, - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getBalances", - "outputs": [ - { - "internalType": "int192[]", - "name": "balances", - "type": "int192[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getCollateralAssets", - "outputs": [ - { - "internalType": "address[]", - "name": "", - "type": "address[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "orderHash", - "type": "bytes32" - }, - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "order", - "type": "tuple" - } - ], - "name": "getFilledAmounts", - "outputs": [ - { - "internalType": "int192", - "name": "totalFilled", - "type": "int192" - }, - { - "internalType": "int192", - "name": "totalFeesPaid", - "type": "int192" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getLiabilities", - "outputs": [ - { - "components": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - }, - { - "internalType": "uint192", - "name": "outstandingAmount", - "type": "uint192" - } - ], - "internalType": "struct MarginalFunctionality.Liability[]", - "name": "liabilitiesArray", - "type": "tuple[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getLockedStakeBalance", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "order", - "type": "tuple" - } - ], - "name": "getOrderHash", - "outputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [], - "name": "initialize", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "liabilities", - "outputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - }, - { - "internalType": "uint192", - "name": "outstandingAmount", - "type": "uint192" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "liquidationPremium", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint24", - "name": "targetChainId", - "type": "uint24" - }, - { - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - } - ], - "internalType": "struct LibAtomic.LockOrder", - "name": "swap", - "type": "tuple" - } - ], - "name": "lockAtomic", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - } - ], - "name": "lockStake", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "broker", - "type": "address" - }, - { - "internalType": "address", - "name": "redeemedAsset", - "type": "address" - }, - { - "internalType": "uint112", - "name": "amount", - "type": "uint112" - } - ], - "name": "partiallyLiquidate", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "positionOverdue", - "outputs": [ - { - "internalType": "uint64", - "name": "", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "priceOverdue", - "outputs": [ - { - "internalType": "uint64", - "name": "", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "internalType": "address", - "name": "claimReceiver", - "type": "address" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibAtomic.RedeemOrder", - "name": "order1", - "type": "tuple" - }, - { - "internalType": "bytes", - "name": "secret1", - "type": "bytes" - }, - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "internalType": "address", - "name": "claimReceiver", - "type": "address" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibAtomic.RedeemOrder", - "name": "order2", - "type": "tuple" - }, - { - "internalType": "bytes", - "name": "secret2", - "type": "bytes" - } - ], - "name": "redeem2Atomics", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "internalType": "address", - "name": "claimReceiver", - "type": "address" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibAtomic.RedeemOrder", - "name": "order", - "type": "tuple" - }, - { - "internalType": "bytes", - "name": "secret", - "type": "bytes" - } - ], - "name": "redeemAtomic", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "secretHash", - "type": "bytes32" - } - ], - "name": "refundAtomic", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "requestReleaseStake", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "token", - "type": "address" - }, - { - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "safeAutoTransferFrom", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "secrets", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "orionToken", - "type": "address" - }, - { - "internalType": "address", - "name": "priceOracleAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "allowedMatcher", - "type": "address" - }, - { - "internalType": "address", - "name": "orionpoolRouter", - "type": "address" - } - ], - "name": "setBasicParams", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "stakeRisk", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint112", - "name": "amount_spend", - "type": "uint112" - }, - { - "internalType": "uint112", - "name": "amount_receive", - "type": "uint112" - }, - { - "internalType": "address[]", - "name": "path", - "type": "address[]" - }, - { - "internalType": "bool", - "name": "is_exact_spend", - "type": "bool" - } - ], - "name": "swapThroughOrionPool", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "assets", - "type": "address[]" - }, - { - "internalType": "uint8[]", - "name": "risks", - "type": "uint8[]" - } - ], - "name": "updateAssetRisks", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "_collateralAssets", - "type": "address[]" - }, - { - "internalType": "uint8", - "name": "_stakeRisk", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_liquidationPremium", - "type": "uint8" - }, - { - "internalType": "uint64", - "name": "_priceOverdue", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "_positionOverdue", - "type": "uint64" - } - ], - "name": "updateMarginalSettings", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "senderAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherAddress", - "type": "address" - }, - { - "internalType": "address", - "name": "baseAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "quoteAsset", - "type": "address" - }, - { - "internalType": "address", - "name": "matcherFeeAsset", - "type": "address" - }, - { - "internalType": "uint64", - "name": "amount", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "matcherFee", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "nonce", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint8", - "name": "buySide", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "isPersonalSign", - "type": "bool" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct LibValidator.Order", - "name": "order", - "type": "tuple" - } - ], - "name": "validateOrder", - "outputs": [ - { - "internalType": "bool", - "name": "isValid", - "type": "bool" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "assetAddress", - "type": "address" - }, - { - "internalType": "uint112", - "name": "amount", - "type": "uint112" - } - ], - "name": "withdraw", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "assetA", - "type": "address" - }, - { - "internalType": "address", - "name": "asseBNotETH", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amountADesired", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amountBDesired", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amountAMin", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amountBMin", - "type": "uint256" - } - ], - "name": "withdrawToPool", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "stateMutability": "payable", - "type": "receive" - } -] \ No newline at end of file diff --git a/src/abis/IDOCollector.json b/src/abis/IDOCollector.json deleted file mode 100644 index 0a5677a..0000000 --- a/src/abis/IDOCollector.json +++ /dev/null @@ -1,524 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "indexed": true, - "internalType": "bytes32", - "name": "previousAdminRole", - "type": "bytes32" - }, - { - "indexed": true, - "internalType": "bytes32", - "name": "newAdminRole", - "type": "bytes32" - } - ], - "name": "RoleAdminChanged", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "indexed": true, - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "RoleGranted", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "indexed": true, - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "RoleRevoked", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "time", - "type": "uint256" - } - ], - "name": "TokensClaimed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "participant", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "time", - "type": "uint256" - } - ], - "name": "UserParticipated", - "type": "event" - }, - { - "inputs": [], - "name": "DEFAULT_ADMIN_ROLE", - "outputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "ORNToken", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "OWNER_ROLE", - "outputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_owner", - "type": "address" - } - ], - "name": "addOwner", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "allocation", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "claimTokens", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "address", - "name": "wallet", - "type": "address" - } - ], - "name": "emergencyAssetWithdrawal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "finishTime", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - } - ], - "name": "getRoleAdmin", - "outputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "internalType": "uint256", - "name": "index", - "type": "uint256" - } - ], - "name": "getRoleMember", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - } - ], - "name": "getRoleMemberCount", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "grantRole", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "hasRole", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "idoToken", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "participate", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "renounceRole", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "role", - "type": "bytes32" - }, - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "revokeRole", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_ornToken", - "type": "address" - }, - { - "internalType": "address", - "name": "_idoToken", - "type": "address" - }, - { - "internalType": "uint32", - "name": "_startTime", - "type": "uint32" - }, - { - "internalType": "uint32", - "name": "_finishTime", - "type": "uint32" - }, - { - "internalType": "uint256", - "name": "_allocation", - "type": "uint256" - }, - { - "internalType": "uint32", - "name": "_startClaimTime", - "type": "uint32" - } - ], - "name": "setIDOParams", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "startClaimTime", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "startTime", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes4", - "name": "interfaceId", - "type": "bytes4" - } - ], - "name": "supportsInterface", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalORN", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "userBalances", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/IDODistributor.json b/src/abis/IDODistributor.json deleted file mode 100644 index 27f2db2..0000000 --- a/src/abis/IDODistributor.json +++ /dev/null @@ -1,362 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "NewTokenDistribution", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint192", - "name": "amount", - "type": "uint192" - }, - { - "indexed": false, - "internalType": "bytes32", - "name": "orderHash", - "type": "bytes32" - } - ], - "name": "TokensClaimed", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "accrued", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "address", - "name": "receiver", - "type": "address" - }, - { - "internalType": "address", - "name": "asset", - "type": "address" - }, - { - "internalType": "uint192", - "name": "amount", - "type": "uint192" - }, - { - "internalType": "uint64", - "name": "startTime", - "type": "uint64" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct IDOAccruedDistributor.Order", - "name": "order_", - "type": "tuple" - } - ], - "name": "claimTokens", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "claimedOrders", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "uint32", - "name": "finishClaimTime_", - "type": "uint32" - } - ], - "name": "distibuteNewTokens", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - } - ], - "name": "emergencyAssetWithdrawal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "finishClaimTime", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "idoToken", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "idoToken_", - "type": "address" - }, - { - "internalType": "address", - "name": "verifier_", - "type": "address" - }, - { - "internalType": "uint32", - "name": "startClaimTime_", - "type": "uint32" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "lastTimeRewardApplicable", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "payouts", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "startClaimTime", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "term", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "tokensAllocation", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "idoToken_", - "type": "address" - }, - { - "internalType": "address", - "name": "verifier_", - "type": "address" - }, - { - "internalType": "uint32", - "name": "startClaimTime_", - "type": "uint32" - } - ], - "name": "updateParams", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "verifier", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/IUniswapV2Pair.json b/src/abis/IUniswapV2Pair.json deleted file mode 100644 index 7a05a55..0000000 --- a/src/abis/IUniswapV2Pair.json +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1","type":"uint256"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"Burn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount0In","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1In","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount0Out","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1Out","type":"uint256"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"Swap","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint112","name":"reserve0","type":"uint112"},{"indexed":false,"internalType":"uint112","name":"reserve1","type":"uint112"}],"name":"Sync","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[],"name":"DOMAIN_SEPARATOR","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"MINIMUM_LIQUIDITY","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"PERMIT_TYPEHASH","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"value","type":"uint256"}],"name":"approve","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"burn","outputs":[{"internalType":"uint256","name":"amount0","type":"uint256"},{"internalType":"uint256","name":"amount1","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"factory","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getReserves","outputs":[{"internalType":"uint112","name":"_reserve0","type":"uint112"},{"internalType":"uint112","name":"_reserve1","type":"uint112"},{"internalType":"uint32","name":"_blockTimestampLast","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token0","type":"address"},{"internalType":"address","name":"_token1","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"kLast","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"mint","outputs":[{"internalType":"uint256","name":"liquidity","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"nonces","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"value","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"name":"permit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"price0CumulativeLast","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"price1CumulativeLast","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"skim","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount0Out","type":"uint256"},{"internalType":"uint256","name":"amount1Out","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"swap","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"sync","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"token0","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"token1","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/src/abis/IUniswapV2Router.json b/src/abis/IUniswapV2Router.json deleted file mode 100644 index 383ca61..0000000 --- a/src/abis/IUniswapV2Router.json +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[{"internalType":"address","name":"_factory","type":"address"},{"internalType":"address","name":"_WETH","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"WETH","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"tokenA","type":"address"},{"internalType":"address","name":"tokenB","type":"address"},{"internalType":"uint256","name":"amountADesired","type":"uint256"},{"internalType":"uint256","name":"amountBDesired","type":"uint256"},{"internalType":"uint256","name":"amountAMin","type":"uint256"},{"internalType":"uint256","name":"amountBMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"addLiquidity","outputs":[{"internalType":"uint256","name":"amountA","type":"uint256"},{"internalType":"uint256","name":"amountB","type":"uint256"},{"internalType":"uint256","name":"liquidity","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"amountTokenDesired","type":"uint256"},{"internalType":"uint256","name":"amountTokenMin","type":"uint256"},{"internalType":"uint256","name":"amountETHMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"addLiquidityETH","outputs":[{"internalType":"uint256","name":"amountToken","type":"uint256"},{"internalType":"uint256","name":"amountETH","type":"uint256"},{"internalType":"uint256","name":"liquidity","type":"uint256"}],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"factory","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"uint256","name":"reserveIn","type":"uint256"},{"internalType":"uint256","name":"reserveOut","type":"uint256"}],"name":"getAmountIn","outputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"uint256","name":"reserveIn","type":"uint256"},{"internalType":"uint256","name":"reserveOut","type":"uint256"}],"name":"getAmountOut","outputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"}],"name":"getAmountsIn","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"}],"name":"getAmountsOut","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountA","type":"uint256"},{"internalType":"uint256","name":"reserveA","type":"uint256"},{"internalType":"uint256","name":"reserveB","type":"uint256"}],"name":"quote","outputs":[{"internalType":"uint256","name":"amountB","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"tokenA","type":"address"},{"internalType":"address","name":"tokenB","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountAMin","type":"uint256"},{"internalType":"uint256","name":"amountBMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"removeLiquidity","outputs":[{"internalType":"uint256","name":"amountA","type":"uint256"},{"internalType":"uint256","name":"amountB","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountTokenMin","type":"uint256"},{"internalType":"uint256","name":"amountETHMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"removeLiquidityETH","outputs":[{"internalType":"uint256","name":"amountToken","type":"uint256"},{"internalType":"uint256","name":"amountETH","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountTokenMin","type":"uint256"},{"internalType":"uint256","name":"amountETHMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"removeLiquidityETHSupportingFeeOnTransferTokens","outputs":[{"internalType":"uint256","name":"amountETH","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountTokenMin","type":"uint256"},{"internalType":"uint256","name":"amountETHMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"internalType":"bool","name":"approveMax","type":"bool"},{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"name":"removeLiquidityETHWithPermit","outputs":[{"internalType":"uint256","name":"amountToken","type":"uint256"},{"internalType":"uint256","name":"amountETH","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountTokenMin","type":"uint256"},{"internalType":"uint256","name":"amountETHMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"internalType":"bool","name":"approveMax","type":"bool"},{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"name":"removeLiquidityETHWithPermitSupportingFeeOnTransferTokens","outputs":[{"internalType":"uint256","name":"amountETH","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"tokenA","type":"address"},{"internalType":"address","name":"tokenB","type":"address"},{"internalType":"uint256","name":"liquidity","type":"uint256"},{"internalType":"uint256","name":"amountAMin","type":"uint256"},{"internalType":"uint256","name":"amountBMin","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"internalType":"bool","name":"approveMax","type":"bool"},{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"name":"removeLiquidityWithPermit","outputs":[{"internalType":"uint256","name":"amountA","type":"uint256"},{"internalType":"uint256","name":"amountB","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapETHForExactTokens","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactETHForTokens","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactETHForTokensSupportingFeeOnTransferTokens","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactTokensForETH","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactTokensForETHSupportingFeeOnTransferTokens","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactTokensForTokens","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountIn","type":"uint256"},{"internalType":"uint256","name":"amountOutMin","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapExactTokensForTokensSupportingFeeOnTransferTokens","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"uint256","name":"amountInMax","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapTokensForExactETH","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amountOut","type":"uint256"},{"internalType":"uint256","name":"amountInMax","type":"uint256"},{"internalType":"address[]","name":"path","type":"address[]"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"swapTokensForExactTokens","outputs":[{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}] \ No newline at end of file diff --git a/src/abis/LiquidityMigrator.json b/src/abis/LiquidityMigrator.json deleted file mode 100644 index aa0e6cb..0000000 --- a/src/abis/LiquidityMigrator.json +++ /dev/null @@ -1,159 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "inputs": [], - "name": "WETH9", - "outputs": [ - { - "internalType": "contract IWETH9", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "exchange", - "outputs": [ - { - "internalType": "contract IExchangeWithAtomic", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "exchangeAllowances", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_exchange", - "type": "address" - }, - { - "internalType": "address", - "name": "_WETH9", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "pairAddress", - "type": "address" - }, - { - "internalType": "uint256", - "name": "tokensToMigrate", - "type": "uint256" - }, - { - "internalType": "bytes32", - "name": "secretHash0", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "secretHash1", - "type": "bytes32" - }, - { - "internalType": "uint64", - "name": "expiration", - "type": "uint64" - }, - { - "internalType": "uint24", - "name": "targetChainId", - "type": "uint24" - } - ], - "name": "migrate", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "stateMutability": "payable", - "type": "receive" - } -] \ No newline at end of file diff --git a/src/abis/OrionGovernance.json b/src/abis/OrionGovernance.json deleted file mode 100644 index 2cf79f0..0000000 --- a/src/abis/OrionGovernance.json +++ /dev/null @@ -1,851 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardAdded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardPaid", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Staked", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Withdrawn", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "internalType": "uint56", - "name": "lock_increase_amount", - "type": "uint56" - } - ], - "name": "acceptLock", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "internalType": "uint56", - "name": "new_lock_amount", - "type": "uint56" - } - ], - "name": "acceptNewLockAmount", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "internalType": "uint56", - "name": "lock_decrease_amount", - "type": "uint56" - } - ], - "name": "acceptUnlock", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "balances_", - "outputs": [ - { - "internalType": "uint56", - "name": "balance", - "type": "uint56" - }, - { - "internalType": "uint56", - "name": "locked_balance", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "basic_fee_percent", - "outputs": [ - { - "internalType": "uint16", - "name": "", - "type": "uint16" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint56", - "name": "burn_size", - "type": "uint56" - } - ], - "name": "burn", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "burn_vote_end_", - "outputs": [ - { - "internalType": "uint64", - "name": "", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "earned", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - } - ], - "name": "emergencyAssetWithdrawal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "exit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "extra_fee_percent", - "outputs": [ - { - "internalType": "uint16", - "name": "", - "type": "uint16" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "extra_fee_seconds", - "outputs": [ - { - "internalType": "uint64", - "name": "", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "fee_total", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getAvailableWithdrawBalance", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getBalance", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getLockedBalance", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getReward", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "getRewardForDuration", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getTotalBalance", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "user", - "type": "address" - } - ], - "name": "getTotalLockedBalance", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "wallet", - "type": "address" - } - ], - "name": "getVaults", - "outputs": [ - { - "components": [ - { - "internalType": "uint56", - "name": "amount", - "type": "uint56" - }, - { - "internalType": "uint64", - "name": "created_time", - "type": "uint64" - } - ], - "internalType": "struct OrionGovernance.UserVault[]", - "name": "", - "type": "tuple[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "staking_token", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "lastTimeRewardApplicable", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "lastUpdateTime", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "reward", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_rewardsDuration", - "type": "uint256" - } - ], - "name": "notifyRewardAmount", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "periodFinish", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerToken", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerTokenStored", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardRate", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "rewards", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardsDuration", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint64", - "name": "burn_vote_end", - "type": "uint64" - } - ], - "name": "setBurnVoteEnd", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint16", - "name": "extra_fee_percent_", - "type": "uint16" - }, - { - "internalType": "uint64", - "name": "extra_fee_seconds_", - "type": "uint64" - }, - { - "internalType": "uint16", - "name": "basic_fee_percent_", - "type": "uint16" - } - ], - "name": "setVaultParameters", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "voting_contract_address", - "type": "address" - } - ], - "name": "setVotingContractAddress", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint56", - "name": "adding_amount", - "type": "uint56" - } - ], - "name": "stake", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "staking_token_", - "outputs": [ - { - "internalType": "contract IERC20", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "total_balance_", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "total_votes_burn_", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "total_votes_dont_burn_", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "userRewardPerTokenPaid", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "user_burn_votes_", - "outputs": [ - { - "internalType": "uint56", - "name": "", - "type": "uint56" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "index", - "type": "uint256" - } - ], - "name": "vaultWithdraw", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "vaults_", - "outputs": [ - { - "internalType": "uint56", - "name": "amount", - "type": "uint56" - }, - { - "internalType": "uint64", - "name": "created_time", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint56", - "name": "voting_amount", - "type": "uint56" - }, - { - "internalType": "bool", - "name": "vote_for_burn", - "type": "bool" - } - ], - "name": "voteBurn", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "voteBurnAvailable", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "voting_contract_address_", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint56", - "name": "removing_amount", - "type": "uint56" - } - ], - "name": "withdraw", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/OrionMigrator.json b/src/abis/OrionMigrator.json deleted file mode 100644 index b840480..0000000 --- a/src/abis/OrionMigrator.json +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[{"internalType":"address","name":"_pair","type":"address"},{"internalType":"address","name":"_router","type":"address"},{"internalType":"address","name":"_WETH9","type":"address"},{"internalType":"address","name":"_stakingRewards","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount0V1","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1V1","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount0V2","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1V2","type":"uint256"}],"name":"TestCalc","type":"event"},{"inputs":[{"internalType":"uint256","name":"tokensToMigrate","type":"uint256"},{"internalType":"uint256","name":"amount0Min","type":"uint256"},{"internalType":"uint256","name":"amount1Min","type":"uint256"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"deadline","type":"uint256"}],"name":"migrate","outputs":[],"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/src/abis/OrionPoolV2Factory.json b/src/abis/OrionPoolV2Factory.json deleted file mode 100644 index d0a723c..0000000 --- a/src/abis/OrionPoolV2Factory.json +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[{"internalType":"address","name":"_feeToSetter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"token0","type":"address"},{"indexed":true,"internalType":"address","name":"token1","type":"address"},{"indexed":false,"internalType":"address","name":"pair","type":"address"},{"indexed":false,"internalType":"uint256","name":"","type":"uint256"}],"name":"PairCreated","type":"event"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"allPairs","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"allPairsLength","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"value","type":"bytes32"}],"name":"bytes32ToString","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"tokenA","type":"address"},{"internalType":"address","name":"tokenB","type":"address"}],"name":"createPair","outputs":[{"internalType":"address","name":"pair","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"feeTo","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"feeToSetter","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"getPair","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_feeTo","type":"address"}],"name":"setFeeTo","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeToSetter","type":"address"}],"name":"setFeeToSetter","outputs":[],"stateMutability":"nonpayable","type":"function"}] diff --git a/src/abis/OrionStakingReward.json b/src/abis/OrionStakingReward.json deleted file mode 100644 index 68d9890..0000000 --- a/src/abis/OrionStakingReward.json +++ /dev/null @@ -1,507 +0,0 @@ -[ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardAdded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "name": "RewardPaid", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Staked", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "balances_account", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "rewardPerToken", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "userRewardPerTokenPaid_account", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "rewards_account", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "voting_contract_getPoolRewards", - "type": "uint256" - } - ], - "name": "TestEarnedCalc", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "_rewardPerToken", - "type": "uint256" - } - ], - "name": "TestRewardPerToken", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "_rewardPerTokenStored", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "_voting_pool_accumulator_stored", - "type": "uint256" - } - ], - "name": "TestUpdateReward", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "rewards", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "userRewardPerTokenPaid", - "type": "uint256" - } - ], - "name": "TestUpdateRewardUser", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "user", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "Withdrawn", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "_balances", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "earned", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "asset", - "type": "address" - } - ], - "name": "emergencyAssetWithdrawal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "exit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "getReward", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_stakingToken", - "type": "address" - }, - { - "internalType": "address", - "name": "voting_contract_address", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerToken", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "rewardPerTokenStored", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "rewards", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "stake", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - } - ], - "name": "stakeTo", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "stakeWithPermit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "stakingToken", - "outputs": [ - { - "internalType": "contract IERC20", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "userRewardPerTokenPaid", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "voting_contract_", - "outputs": [ - { - "internalType": "contract IOrionVoting", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "voting_pool_accumulator_stored_", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "withdraw", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/OrionVoting.json b/src/abis/OrionVoting.json deleted file mode 100644 index 5751cc0..0000000 --- a/src/abis/OrionVoting.json +++ /dev/null @@ -1 +0,0 @@ -[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[{"internalType":"address","name":"poolAddress","type":"address"},{"internalType":"uint56","name":"amount","type":"uint56"}],"name":"cease","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint56","name":"amount","type":"uint56"},{"internalType":"address","name":"to","type":"address"}],"name":"claimRewards","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"pool_address","type":"address"}],"name":"getPoolRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getRewardPerVotingToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"rewards_token","type":"address"},{"internalType":"address","name":"governance_contract_address","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"pool_states_","outputs":[{"internalType":"uint8","name":"state","type":"uint8"},{"internalType":"uint56","name":"votes","type":"uint56"},{"internalType":"uint256","name":"last_acc_reward_per_voting_token","type":"uint256"},{"internalType":"uint256","name":"acc_reward","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"reward_rate_","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewards_token_","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"pool_address","type":"address"},{"internalType":"uint8","name":"new_state","type":"uint8"}],"name":"setPoolState","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint64","name":"rewards","type":"uint64"},{"internalType":"uint64","name":"duration","type":"uint64"}],"name":"setRewards","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint56","name":"","type":"uint56"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"total_supply_","outputs":[{"internalType":"uint56","name":"","type":"uint56"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"user_votes_","outputs":[{"internalType":"uint56","name":"voted_amount","type":"uint56"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"poolAddress","type":"address"},{"internalType":"uint56","name":"amount","type":"uint56"}],"name":"vote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"pool_address","type":"address"}],"name":"votes","outputs":[{"internalType":"uint56","name":"","type":"uint56"}],"stateMutability":"view","type":"function"}] \ No newline at end of file diff --git a/src/abis/PriceOracle.json b/src/abis/PriceOracle.json deleted file mode 100644 index 519516e..0000000 --- a/src/abis/PriceOracle.json +++ /dev/null @@ -1,273 +0,0 @@ -[ - { - "inputs": [ - { - "internalType": "address", - "name": "publicKey", - "type": "address" - }, - { - "internalType": "address", - "name": "_baseAsset", - "type": "address" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "OwnershipTransferred", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "assetPrices", - "outputs": [ - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "baseAsset", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "chainLinkETHAggregator", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "added", - "type": "address[]" - }, - { - "internalType": "address[]", - "name": "removed", - "type": "address[]" - } - ], - "name": "changePriceProviderAuthorization", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "assets", - "type": "address[]" - } - ], - "name": "getChainLinkPriceData", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "assetAddresses", - "type": "address[]" - } - ], - "name": "givePrices", - "outputs": [ - { - "components": [ - { - "internalType": "uint64", - "name": "price", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - } - ], - "internalType": "struct PriceOracle.PriceDataOut[]", - "name": "", - "type": "tuple[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "oraclePublicKey", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "priceProviderAuthorization", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address[]", - "name": "assetAddresses", - "type": "address[]" - }, - { - "internalType": "uint64[]", - "name": "prices", - "type": "uint64[]" - }, - { - "internalType": "uint64", - "name": "timestamp", - "type": "uint64" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct PriceOracle.Prices", - "name": "priceFeed", - "type": "tuple" - } - ], - "name": "provideDataAddressAuthorization", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "renounceOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address[]", - "name": "assets", - "type": "address[]" - }, - { - "internalType": "address[]", - "name": "aggregatorAddresses", - "type": "address[]" - } - ], - "name": "setChainLinkAggregators", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "newOwner", - "type": "address" - } - ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } -] \ No newline at end of file diff --git a/src/abis/StakingRewardsWithLongTermBonus.json b/src/abis/StakingRewardsWithLongTermBonus.json deleted file mode 100644 index 8855e62..0000000 --- a/src/abis/StakingRewardsWithLongTermBonus.json +++ /dev/null @@ -1 +0,0 @@ -[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"reward","type":"uint256"}],"name":"RewardAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"reward","type":"uint256"}],"name":"RewardPaid","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"Staked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"Withdrawn","type":"event"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"earned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"asset","type":"address"}],"name":"emergencyAssetWithdrawal","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"exit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"uint16","name":"period","type":"uint16"}],"name":"findLastBalanceInPeriod","outputs":[{"internalType":"uint256","name":"longTermStake","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getReward","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"getRewardForDuration","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_rewardsDistribution","type":"address"},{"internalType":"address","name":"_rewardsToken","type":"address"},{"internalType":"address","name":"_stakingToken","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"lastTimeRewardApplicable","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"lastUpdateTime","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"reward","type":"uint256"},{"internalType":"uint256","name":"_rewardsDuration","type":"uint256"},{"internalType":"uint256","name":"longTermBonus","type":"uint256"}],"name":"notifyRewardAmount","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"periodFinish","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardPerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardPerTokenStored","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardRate","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"rewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardsDistribution","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardsDuration","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardsToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"stake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"deadline","type":"uint256"},{"internalType":"uint8","name":"v","type":"uint8"},{"internalType":"bytes32","name":"r","type":"bytes32"},{"internalType":"bytes32","name":"s","type":"bytes32"}],"name":"stakeWithPermit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"stakingToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"userRewardPerTokenPaid","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/src/entities/Exchange.ts b/src/entities/Exchange.ts index 051dd4c..8ca9e06 100644 --- a/src/entities/Exchange.ts +++ b/src/entities/Exchange.ts @@ -1,11 +1,11 @@ /* eslint-disable camelcase */ import { Provider } from '@ethersproject/providers'; -import { BytesLike, ethers, Signer } from 'ethers'; import { Exchange as ExchangeContract, Exchange__factory as ExchangeContract__factory, -} from '../artifacts/contracts'; -import { LibAtomic } from '../artifacts/contracts/Exchange'; +} from '@orionprotocol/contracts/ethers'; +import { LibAtomic } from '@orionprotocol/contracts/ethers/Exchange'; +import { BytesLike, ethers, Signer } from 'ethers'; import { DEPOSIT_ERC20_GAS_LIMIT, DEPOSIT_ETH_GAS_LIMIT, LOCKATOMIC_GAS_LIMIT, REDEEMATOMIC_GAS_LIMIT, SWAP_THROUGH_ORION_POOL_GAS_LIMIT, WITHDRAW_GAS_LIMIT, diff --git a/src/index.ts b/src/index.ts index 214962d..ebc8338 100644 --- a/src/index.ts +++ b/src/index.ts @@ -10,7 +10,6 @@ export { default as fetchWithValidation } from './fetchWithValidation'; export { default as simpleFetch } from './simpleFetch'; export * as utils from './utils'; export * as services from './services'; -export * as contracts from './artifacts/contracts'; export * as crypt from './crypt'; export * from './constants'; export * from './types'; diff --git a/src/utils/checkIsToken.ts b/src/utils/checkIsToken.ts index c5b437d..b9b4822 100644 --- a/src/utils/checkIsToken.ts +++ b/src/utils/checkIsToken.ts @@ -1,7 +1,7 @@ /* eslint-disable camelcase */ +import { ERC20__factory } from '@orionprotocol/contracts/ethers'; import { ethers } from 'ethers'; import invariant from 'tiny-invariant'; -import { ERC20__factory } from '../artifacts/contracts'; const checkIsToken = async (address: string, provider?: ethers.providers.Provider) => { invariant(provider, 'No provider for token checking'); diff --git a/src/utils/getBalance.ts b/src/utils/getBalance.ts index 4d9df63..033fbe6 100644 --- a/src/utils/getBalance.ts +++ b/src/utils/getBalance.ts @@ -1,6 +1,9 @@ +import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import type { Exchange } from '@orionprotocol/contracts/ethers'; + import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { contracts, utils } from '..'; +import { utils } from '..'; import { INTERNAL_ORION_PRECISION, NATIVE_CURRENCY_PRECISION } from '../constants'; import { OrionAggregator } from '../services/OrionAggregator'; @@ -9,7 +12,7 @@ export default async function getBalance( asset: string, assetAddress: string, walletAddress: string, - exchangeContract: contracts.Exchange, + exchangeContract: Exchange, provider: ethers.providers.Provider, ) { const assetIsNativeCryptocurrency = assetAddress === ethers.constants.AddressZero; @@ -19,7 +22,7 @@ export default async function getBalance( let denormalizedAssetInWalletBalance: BigNumber | undefined; if (!assetIsNativeCryptocurrency) { - const assetContract = contracts.ERC20__factory.connect(assetAddress, provider); + const assetContract = ERC20__factory.connect(assetAddress, provider); const assetDecimals = await assetContract.decimals(); assetWalletBalance = await assetContract.balanceOf(walletAddress); diff --git a/src/utils/getBalances.ts b/src/utils/getBalances.ts index 89a9b26..1f3964f 100644 --- a/src/utils/getBalances.ts +++ b/src/utils/getBalances.ts @@ -1,6 +1,6 @@ +import type { Exchange } from '@orionprotocol/contracts/ethers'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { contracts } from '..'; import { OrionAggregator } from '../services/OrionAggregator'; import getBalance from './getBalance'; @@ -8,7 +8,7 @@ export default async ( balancesRequired: Partial>, orionAggregator: OrionAggregator, walletAddress: string, - exchangeContract: contracts.Exchange, + exchangeContract: Exchange, provider: ethers.providers.Provider, ) => { const balances = await Promise.all( diff --git a/tsconfig.json b/tsconfig.json index 2aeb43b..b8c1b12 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,7 @@ // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ /* Language and Environment */ - "target": "ES2018", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "target": "ES5", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ // "lib": [ // "", // ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ @@ -34,7 +34,7 @@ // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ /* Modules */ - "module": "CommonJS", /* Specify what module code is generated. */ + "module": "ES6", /* Specify what module code is generated. */ // "rootDir": "./", /* Specify the root folder within your source files. */ "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ @@ -55,7 +55,7 @@ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ "sourceMap": true, /* Create source map files for emitted JavaScript files. */ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./lib/esm", /* Specify an output folder for all emitted files. */ + "outDir": "./lib", /* Specify an output folder for all emitted files. */ // "removeComments": true, /* Disable emitting comments. */ // "noEmit": true, /* Disable emitting files from a compilation. */ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ diff --git a/webpack.config.js b/webpack.config.js index 715cd18..e4e2309 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,25 +3,35 @@ const path = require("path"); module.exports = (env, argv) => { return { mode: "production", - entry: { - index: path.resolve(__dirname, "./lib/esm/index.js") + entry: './src/index.ts', + // devtool: 'inline-source-map', + module: { + rules: [ + { + test: /\.ts$/, + use: [{ + loader: 'ts-loader', + options: { allowTsInNodeModules: true } + }] + }, + ], }, output: { - path: path.resolve(__dirname, "./lib/umd"), // builds to ./lib/umd/ + path: path.resolve(__dirname, "lib"), // builds to ./lib filename: "[name].js", // index.js - library: "orionprotocol", // aka window.myLibrary - libraryTarget: "umd", // supports commonjs, amd and web browsers + library: { + name: 'orionprotocol', // aka window.myLibrary + type: 'umd', // supports commonjs, amd and web browsers + }, globalObject: "this" }, - module: { - rules: [{ test: /\.t|js$/, use: "babel-loader" }] - }, resolve: { - fallback: { - "crypto": require.resolve("crypto-browserify"), - "buffer": require.resolve("buffer/"), - "stream": require.resolve("stream-browserify"), - } + extensions: ['.ts', '.js'], + // fallback: { + // "crypto": require.resolve("crypto-browserify"), + // "buffer": require.resolve("buffer/"), + // "stream": require.resolve("stream-browserify"), + // } } }; }; \ No newline at end of file From 79d94b70dedaf5f24068f6ff93c454c1a7ca43f2 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sun, 29 May 2022 18:34:21 +0400 Subject: [PATCH 08/10] Remove prebuild --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c2b9b80..807af1c 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "watch-ts": "tsc -w --skipLibCheck", "watch-js": "nodemon lib/esm/index.js", "prepare": "npm run build", - "prebuild": "tsc", "build": "webpack", "test": "exit 0", "coverage": "jest --coverage", From 9bfd2617bedab3c188735288b7c84e67544b777f Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sun, 29 May 2022 18:43:06 +0400 Subject: [PATCH 09/10] Fix --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 807af1c..a622f36 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.5", + "version": "0.10.4-rc.6", "description": "Orion Protocol SDK", - "main": "./lib/main.js", + "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", "types": "./lib/esm/types.d.ts", "scripts": { From da67332e5ffb14d6e2617497c36ea6e14c1246e0 Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Sun, 29 May 2022 19:17:56 +0400 Subject: [PATCH 10/10] Bump contracts --- package-lock.json | 18 +++++++------- package.json | 7 +++--- src/BalanceGuard.ts | 2 +- src/OrionUnit/Exchange/deposit.ts | 2 +- src/OrionUnit/Exchange/swapMarket.ts | 2 +- src/OrionUnit/Exchange/withdraw.ts | 2 +- src/OrionUnit/FarmingManager/index.ts | 2 +- src/entities/Exchange.ts | 4 +-- src/utils/checkIsToken.ts | 2 +- src/utils/getBalance.ts | 3 +-- src/utils/getBalances.ts | 2 +- tsconfig.json | 2 +- webpack.config.js | 36 ++++++++++----------------- 13 files changed, 37 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfca9b2..a2be9bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.4", + "version": "0.10.4-rc.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.4", + "version": "0.10.4-rc.6", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", - "@orionprotocol/contracts": "0.0.7", + "@orionprotocol/contracts": "0.0.8", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", @@ -2486,9 +2486,9 @@ } }, "node_modules/@orionprotocol/contracts": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", - "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.8.tgz", + "integrity": "sha512-dgfowYXTf2nu/o9wcQbnLZg+kF7mJusP62unGSxhRKjquVrF1qids+lpSyjvbA9KT/XYKbXg61tXOZ9pOdrBTw==" }, "node_modules/@sinonjs/commons": { "version": "1.8.3", @@ -12342,9 +12342,9 @@ } }, "@orionprotocol/contracts": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.7.tgz", - "integrity": "sha512-v8+3gff6LdqSzJTkNyw422N8memes+yrgss4Sc6KcNBPyqqjm0apiS3wpKKVpJSsZekWrVferiTPuiwLhiVo1Q==" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@orionprotocol/contracts/-/contracts-0.0.8.tgz", + "integrity": "sha512-dgfowYXTf2nu/o9wcQbnLZg+kF7mJusP62unGSxhRKjquVrF1qids+lpSyjvbA9KT/XYKbXg61tXOZ9pOdrBTw==" }, "@sinonjs/commons": { "version": "1.8.3", diff --git a/package.json b/package.json index a622f36..73940a6 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "@orionprotocol/sdk", - "version": "0.10.4-rc.6", + "version": "0.10.4-rc.7", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", - "types": "./lib/esm/types.d.ts", + "types": "./lib/esm/index.d.ts", "scripts": { "start": "npm run build && node lib/esm/index.js", "develop": "concurrently -i -k -p \"[{name}]\" -n \"Node,TypeScript\" -c \"yellow.bold,cyan.bold\" \"yarn watch-js\" \"yarn watch-ts\"", @@ -12,6 +12,7 @@ "watch-ts": "tsc -w --skipLibCheck", "watch-js": "nodemon lib/esm/index.js", "prepare": "npm run build", + "prebuild": "tsc", "build": "webpack", "test": "exit 0", "coverage": "jest --coverage", @@ -59,7 +60,7 @@ "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", "@lukeed/csprng": "^1.0.1", - "@orionprotocol/contracts": "0.0.7", + "@orionprotocol/contracts": "0.0.8", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", diff --git a/src/BalanceGuard.ts b/src/BalanceGuard.ts index 9bf5bac..400886c 100644 --- a/src/BalanceGuard.ts +++ b/src/BalanceGuard.ts @@ -1,7 +1,7 @@ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import clone from 'just-clone'; -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory } from '@orionprotocol/contracts'; import { utils } from '.'; import { APPROVE_ERC20_GAS_LIMIT, NATIVE_CURRENCY_PRECISION } from './constants'; import { diff --git a/src/OrionUnit/Exchange/deposit.ts b/src/OrionUnit/Exchange/deposit.ts index 9795c61..6381eb7 100644 --- a/src/OrionUnit/Exchange/deposit.ts +++ b/src/OrionUnit/Exchange/deposit.ts @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; diff --git a/src/OrionUnit/Exchange/swapMarket.ts b/src/OrionUnit/Exchange/swapMarket.ts index a858697..26e0d0a 100644 --- a/src/OrionUnit/Exchange/swapMarket.ts +++ b/src/OrionUnit/Exchange/swapMarket.ts @@ -2,7 +2,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import getAvailableSources from '../../utils/getAvailableFundsSources'; diff --git a/src/OrionUnit/Exchange/withdraw.ts b/src/OrionUnit/Exchange/withdraw.ts index 1c34bc0..0edeaad 100644 --- a/src/OrionUnit/Exchange/withdraw.ts +++ b/src/OrionUnit/Exchange/withdraw.ts @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; -import { Exchange__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory } from '@orionprotocol/contracts'; import getBalances from '../../utils/getBalances'; import BalanceGuard from '../../BalanceGuard'; import OrionUnit from '..'; diff --git a/src/OrionUnit/FarmingManager/index.ts b/src/OrionUnit/FarmingManager/index.ts index 5c4c0d6..506c1cc 100644 --- a/src/OrionUnit/FarmingManager/index.ts +++ b/src/OrionUnit/FarmingManager/index.ts @@ -1,4 +1,4 @@ -import { Exchange__factory, IUniswapV2Pair__factory, IUniswapV2Router__factory } from '@orionprotocol/contracts/ethers'; +import { Exchange__factory, IUniswapV2Pair__factory, IUniswapV2Router__factory } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import OrionUnit from '..'; diff --git a/src/entities/Exchange.ts b/src/entities/Exchange.ts index 8ca9e06..f7e9ddd 100644 --- a/src/entities/Exchange.ts +++ b/src/entities/Exchange.ts @@ -3,8 +3,8 @@ import { Provider } from '@ethersproject/providers'; import { Exchange as ExchangeContract, Exchange__factory as ExchangeContract__factory, -} from '@orionprotocol/contracts/ethers'; -import { LibAtomic } from '@orionprotocol/contracts/ethers/Exchange'; +} from '@orionprotocol/contracts'; +import { LibAtomic } from '@orionprotocol/contracts/lib/ethers/Exchange'; import { BytesLike, ethers, Signer } from 'ethers'; import { DEPOSIT_ERC20_GAS_LIMIT, DEPOSIT_ETH_GAS_LIMIT, LOCKATOMIC_GAS_LIMIT, diff --git a/src/utils/checkIsToken.ts b/src/utils/checkIsToken.ts index b9b4822..43aa6c3 100644 --- a/src/utils/checkIsToken.ts +++ b/src/utils/checkIsToken.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory } from '@orionprotocol/contracts'; import { ethers } from 'ethers'; import invariant from 'tiny-invariant'; diff --git a/src/utils/getBalance.ts b/src/utils/getBalance.ts index 033fbe6..eb8f0fd 100644 --- a/src/utils/getBalance.ts +++ b/src/utils/getBalance.ts @@ -1,5 +1,4 @@ -import { ERC20__factory } from '@orionprotocol/contracts/ethers'; -import type { Exchange } from '@orionprotocol/contracts/ethers'; +import { ERC20__factory, Exchange } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; diff --git a/src/utils/getBalances.ts b/src/utils/getBalances.ts index 1f3964f..98ddce8 100644 --- a/src/utils/getBalances.ts +++ b/src/utils/getBalances.ts @@ -1,4 +1,4 @@ -import type { Exchange } from '@orionprotocol/contracts/ethers'; +import { Exchange } from '@orionprotocol/contracts'; import BigNumber from 'bignumber.js'; import { ethers } from 'ethers'; import { OrionAggregator } from '../services/OrionAggregator'; diff --git a/tsconfig.json b/tsconfig.json index b8c1b12..6d741f5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -55,7 +55,7 @@ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ "sourceMap": true, /* Create source map files for emitted JavaScript files. */ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./lib", /* Specify an output folder for all emitted files. */ + "outDir": "./lib/esm", /* Specify an output folder for all emitted files. */ // "removeComments": true, /* Disable emitting comments. */ // "noEmit": true, /* Disable emitting files from a compilation. */ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ diff --git a/webpack.config.js b/webpack.config.js index e4e2309..715cd18 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,35 +3,25 @@ const path = require("path"); module.exports = (env, argv) => { return { mode: "production", - entry: './src/index.ts', - // devtool: 'inline-source-map', - module: { - rules: [ - { - test: /\.ts$/, - use: [{ - loader: 'ts-loader', - options: { allowTsInNodeModules: true } - }] - }, - ], + entry: { + index: path.resolve(__dirname, "./lib/esm/index.js") }, output: { - path: path.resolve(__dirname, "lib"), // builds to ./lib + path: path.resolve(__dirname, "./lib/umd"), // builds to ./lib/umd/ filename: "[name].js", // index.js - library: { - name: 'orionprotocol', // aka window.myLibrary - type: 'umd', // supports commonjs, amd and web browsers - }, + library: "orionprotocol", // aka window.myLibrary + libraryTarget: "umd", // supports commonjs, amd and web browsers globalObject: "this" }, + module: { + rules: [{ test: /\.t|js$/, use: "babel-loader" }] + }, resolve: { - extensions: ['.ts', '.js'], - // fallback: { - // "crypto": require.resolve("crypto-browserify"), - // "buffer": require.resolve("buffer/"), - // "stream": require.resolve("stream-browserify"), - // } + fallback: { + "crypto": require.resolve("crypto-browserify"), + "buffer": require.resolve("buffer/"), + "stream": require.resolve("stream-browserify"), + } } }; }; \ No newline at end of file