From 66e19b3544c716c18d36c208a53c2e208863b05c Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Tue, 26 Dec 2023 12:47:28 -0800 Subject: [PATCH] feat: upgrade to ESM BREAKING CHANGE The module is now an ESM. Signed-off-by: Raymond Feng --- .eslintrc.js => .eslintrc.cjs | 0 .vscode/settings.json | 4 +- README.md | 6 +- hardhat.config.js => hardhat.config.cjs | 3 +- package-lock.json | 522 +++++++++--------- package.json | 9 +- src/__examples__/main.ts | 12 +- .../staking-contracts-service.acceptance.ts | 4 +- src/adapters/Jngl-staking.adapter.ts | 6 +- src/adapters/ab.adapter.ts | 6 +- src/adapters/banshees-staking.adapter.ts | 6 +- src/adapters/bapeliens-staking.adapter.ts | 6 +- src/adapters/cbzgrow.adapter.ts | 8 +- src/adapters/chillrx.adapter.ts | 6 +- src/adapters/coco.adapter.ts | 8 +- src/adapters/digitz.adapter.ts | 4 +- src/adapters/dogface.adapter.ts | 8 +- src/adapters/dogface2.adapter.ts | 8 +- src/adapters/dogs-unchained.adapter.ts | 8 +- src/adapters/e4c-ranger-staking.adapter.ts | 6 +- src/adapters/erc20-staking.adapter.ts | 6 +- .../flooring-protocol-staking.adapter.ts | 6 +- src/adapters/genk-staking.adapter.ts | 6 +- src/adapters/habibiz-royals.adapter.ts | 8 +- src/adapters/idol-marketplace.adapter.ts | 6 +- .../lifestory-planet-staking.adapter.ts | 6 +- src/adapters/meltdown-1.adapter.ts | 6 +- src/adapters/meltdown.adapter.ts | 6 +- src/adapters/moonrunners.adapter.ts | 6 +- src/adapters/mtg.adapter.ts | 6 +- src/adapters/nftw-escrow.adapter.ts | 10 +- src/adapters/omniguard-eternals.adapter.ts | 8 +- src/adapters/plutoalliance.adapter.ts | 6 +- src/adapters/primordia.adapter.ts | 6 +- src/adapters/random-staking.adapter.ts | 8 +- src/adapters/rd-staking.adapter.ts | 6 +- src/adapters/rekt-dogs-adapter.ts | 6 +- src/adapters/renft.adapter.ts | 4 +- src/adapters/replicantx-staking.adapter.ts | 6 +- src/adapters/ririsu.adapter.ts | 6 +- src/adapters/rival-bears-staking.adapter.ts | 8 +- src/adapters/robo.adapter.ts | 6 +- src/adapters/sky-farm.adapter.ts | 6 +- src/adapters/spit-yard.adapter.ts | 6 +- src/adapters/sugartown.adapter.ts | 6 +- .../supreme-kong-2-staking.adapter.ts | 8 +- src/adapters/supreme-kong-staking.adapter.ts | 8 +- src/adapters/ttoo-staking.adapter.ts | 6 +- src/adapters/uwulend-staking.adapter.ts | 6 +- .../warriorsofankh-staking.adapter.ts | 6 +- src/adapters/xeno-mining.adapter.ts | 8 +- src/component.ts | 86 +-- src/index.ts | 10 +- src/keys.ts | 6 +- src/models/index.ts | 2 +- src/services/index.ts | 2 +- src/services/staking-contracts.service.ts | 4 +- src/staking.ts | 9 +- tsconfig.json | 6 +- 59 files changed, 484 insertions(+), 483 deletions(-) rename .eslintrc.js => .eslintrc.cjs (100%) rename hardhat.config.js => hardhat.config.cjs (96%) diff --git a/.eslintrc.js b/.eslintrc.cjs similarity index 100% rename from .eslintrc.js rename to .eslintrc.cjs diff --git a/.vscode/settings.json b/.vscode/settings.json index 0731366..4d57e61 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,8 +5,8 @@ "editor.trimAutoWhitespace": true, "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": true, - "source.fixAll.eslint": true + "source.organizeImports": "explicit", + "source.fixAll.eslint": "explicit" }, "files.exclude": { diff --git a/README.md b/README.md index 2bb886e..38c3cb9 100644 --- a/README.md +++ b/README.md @@ -57,10 +57,10 @@ To add a new staking contract, please follow the steps below. ```ts import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {Coco__factory} from '../types/factories/Coco__factory'; +import {Coco__factory} from '../types/factories/Coco__factory.js'; @injectable( { diff --git a/hardhat.config.js b/hardhat.config.cjs similarity index 96% rename from hardhat.config.js rename to hardhat.config.cjs index 2334bae..a36dfe4 100644 --- a/hardhat.config.js +++ b/hardhat.config.cjs @@ -5,7 +5,7 @@ require('@nomiclabs/hardhat-ethers'); require('@nomiclabs/hardhat-solhint'); -require('@typechain/hardhat'); +require('@collabland/typechain-hardhat'); const path = require('path'); const DEPLOYER_PRIVATE_KEY = @@ -60,6 +60,7 @@ const config = { target: 'ethers-v5', externalArtifacts: [path.join(__dirname, 'src/contracts/**/*.json')], dontOverrideCompile: false, + node16Modules: true, }, }; diff --git a/package-lock.json b/package-lock.json index 5048007..aaaa71b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,9 @@ "devDependencies": { "@collabland/chain": "^0.37.0", "@collabland/common": "^0.49.0", + "@collabland/typechain": "^8.4.0", + "@collabland/typechain-ethers-v5": "^11.2.0", + "@collabland/typechain-hardhat": "^9.2.0", "@loopback/build": "^10.1.3", "@loopback/core": "^5.1.3", "@loopback/eslint-config": "^14.0.4", @@ -22,8 +25,6 @@ "@loopback/testlab": "^6.1.3", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-solhint": "^3.0.1", - "@typechain/ethers-v5": "^11.1.2", - "@typechain/hardhat": "^7.0.0", "@types/chai": "^4.3.11", "@types/mocha": "^10.0.6", "@types/node": "^16.18.40", @@ -31,8 +32,7 @@ "ethers": "^5.7.0", "graphql": "^16.8.1", "graphql-request": "^6.1.0", - "hardhat": "^2.19.2", - "typechain": "^8.3.2", + "hardhat": "^2.19.4", "typescript": "~5.3.0" }, "engines": { @@ -621,6 +621,149 @@ "url": "https://opencollective.com/node-fetch" } }, + "node_modules/@collabland/typechain": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain/-/typechain-8.4.0.tgz", + "integrity": "sha512-6FeaPZVa9tmVqynJ1+8P0sydQOdFZorc7wt+Xq1OLmvUsuuwv32OimxWZprXJNRn0vjP8jN4CtlpoOcvUlpUNg==", + "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/@collabland/typechain-ethers-v5": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain-ethers-v5/-/typechain-ethers-v5-11.2.0.tgz", + "integrity": "sha512-ehx43to2Xcx5kCDVedTuzLEu93BPtW0lO0xTL5Sf+oNmRvi7S5YIeOYT8YhW9UwxGnpy3G84obQMxZVG6tDoGg==", + "dev": true, + "dependencies": { + "lodash": "^4.17.15", + "ts-essentials": "^7.0.1" + }, + "peerDependencies": { + "@collabland/typechain": "^8.4.0", + "@ethersproject/abi": "^5.0.0", + "@ethersproject/providers": "^5.0.0", + "ethers": "^5.1.3", + "typescript": ">=4.3.0" + } + }, + "node_modules/@collabland/typechain-hardhat": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain-hardhat/-/typechain-hardhat-9.2.0.tgz", + "integrity": "sha512-HhE/uYrcgeW0DkO37aHSWHmvbcUubWf8mMAJec52S9Vk/jX5FwK3f4Yx49hO93eRI8Vz0phL1OpBTl/8N2ki0g==", + "dev": true, + "dependencies": { + "fs-extra": "^9.1.0" + }, + "peerDependencies": { + "@collabland/typechain": "^8.4.0", + "hardhat": "^2.9.9" + } + }, + "node_modules/@collabland/typechain-hardhat/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@collabland/typechain/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@collabland/typechain/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/@collabland/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/@collabland/typechain/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@collabland/typechain/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@collabland/typechain/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -2983,55 +3126,6 @@ "antlr4ts": "^0.5.0-alpha.4" } }, - "node_modules/@typechain/ethers-v5": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-11.1.2.tgz", - "integrity": "sha512-ID6pqWkao54EuUQa0P5RgjvfA3MYqxUQKpbGKERbsjBW5Ra7EIXvbMlPp2pcP5IAdUkyMCFYsP2SN5q7mPdLDQ==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15", - "ts-essentials": "^7.0.1" - }, - "peerDependencies": { - "@ethersproject/abi": "^5.0.0", - "@ethersproject/providers": "^5.0.0", - "ethers": "^5.1.3", - "typechain": "^8.3.2", - "typescript": ">=4.3.0" - } - }, - "node_modules/@typechain/hardhat": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-7.0.0.tgz", - "integrity": "sha512-XB79i5ewg9Met7gMVGfgVkmypicbnI25T5clJBEooMoW2161p4zvKFpoS2O+lBppQyMrPIZkdvl2M3LMDayVcA==", - "dev": true, - "dependencies": { - "fs-extra": "^9.1.0" - }, - "peerDependencies": { - "@ethersproject/abi": "^5.4.7", - "@ethersproject/providers": "^5.4.7", - "@typechain/ethers-v5": "^11.0.0", - "ethers": "^5.4.7", - "hardhat": "^2.9.9", - "typechain": "^8.2.0" - } - }, - "node_modules/@typechain/hardhat/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@types/bn.js": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", @@ -10759,104 +10853,6 @@ "node": ">= 0.6" } }, - "node_modules/typechain": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.3.2.tgz", - "integrity": "sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==", - "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/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/typechain/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/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/typechain/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/typechain/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/typechain/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -11784,6 +11780,118 @@ } } }, + "@collabland/typechain": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain/-/typechain-8.4.0.tgz", + "integrity": "sha512-6FeaPZVa9tmVqynJ1+8P0sydQOdFZorc7wt+Xq1OLmvUsuuwv32OimxWZprXJNRn0vjP8jN4CtlpoOcvUlpUNg==", + "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": { + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "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" + } + }, + "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" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + } + } + }, + "@collabland/typechain-ethers-v5": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain-ethers-v5/-/typechain-ethers-v5-11.2.0.tgz", + "integrity": "sha512-ehx43to2Xcx5kCDVedTuzLEu93BPtW0lO0xTL5Sf+oNmRvi7S5YIeOYT8YhW9UwxGnpy3G84obQMxZVG6tDoGg==", + "dev": true, + "requires": { + "lodash": "^4.17.15", + "ts-essentials": "^7.0.1" + } + }, + "@collabland/typechain-hardhat": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@collabland/typechain-hardhat/-/typechain-hardhat-9.2.0.tgz", + "integrity": "sha512-HhE/uYrcgeW0DkO37aHSWHmvbcUubWf8mMAJec52S9Vk/jX5FwK3f4Yx49hO93eRI8Vz0phL1OpBTl/8N2ki0g==", + "dev": true, + "requires": { + "fs-extra": "^9.1.0" + }, + "dependencies": { + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + } + } + }, "@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -13484,39 +13592,6 @@ "antlr4ts": "^0.5.0-alpha.4" } }, - "@typechain/ethers-v5": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-11.1.2.tgz", - "integrity": "sha512-ID6pqWkao54EuUQa0P5RgjvfA3MYqxUQKpbGKERbsjBW5Ra7EIXvbMlPp2pcP5IAdUkyMCFYsP2SN5q7mPdLDQ==", - "dev": true, - "requires": { - "lodash": "^4.17.15", - "ts-essentials": "^7.0.1" - } - }, - "@typechain/hardhat": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-7.0.0.tgz", - "integrity": "sha512-XB79i5ewg9Met7gMVGfgVkmypicbnI25T5clJBEooMoW2161p4zvKFpoS2O+lBppQyMrPIZkdvl2M3LMDayVcA==", - "dev": true, - "requires": { - "fs-extra": "^9.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - } - } - }, "@types/bn.js": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz", @@ -19573,85 +19648,6 @@ "mime-types": "~2.1.24" } }, - "typechain": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.3.2.tgz", - "integrity": "sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==", - "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": { - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "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" - } - }, - "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" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - } - } - }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", diff --git a/package.json b/package.json index 123f16d..b630266 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "Collab.Land", "staking" ], + "type": "module", "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { @@ -62,8 +63,8 @@ "@loopback/testlab": "^6.1.3", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-solhint": "^3.0.1", - "@typechain/ethers-v5": "^11.1.2", - "@typechain/hardhat": "^7.0.0", + "@collabland/typechain-ethers-v5": "^11.2.0", + "@collabland/typechain-hardhat": "^9.2.0", "@types/chai": "^4.3.11", "@types/mocha": "^10.0.6", "@types/node": "^16.18.40", @@ -71,8 +72,8 @@ "ethers": "^5.7.0", "graphql": "^16.8.1", "graphql-request": "^6.1.0", - "hardhat": "^2.19.2", - "typechain": "^8.3.2", + "hardhat": "^2.19.4", + "@collabland/typechain": "^8.4.0", "typescript": "~5.3.0" }, "license": "MIT", diff --git a/src/__examples__/main.ts b/src/__examples__/main.ts index ff7be6e..f99bd29 100644 --- a/src/__examples__/main.ts +++ b/src/__examples__/main.ts @@ -4,8 +4,9 @@ // License text available at https://opensource.org/licenses/MIT import {Application} from '@loopback/core'; -import {StakingContractsComponent} from '../component'; -import {STAKING_CONTRACTS_SERVICE} from '../keys'; +import {StakingContractsComponent} from '../component.js'; +import {STAKING_CONTRACTS_SERVICE} from '../keys.js'; +import {isMain} from '@collabland/common'; async function main() { const app = new Application(); @@ -23,9 +24,6 @@ async function main() { process.exit(0); } -if (require.main === module) { - main().catch(err => { - console.error(err); - process.exit(1); - }); +if (isMain(import.meta.url)) { + await main(); } diff --git a/src/__tests__/acceptance/staking-contracts-service.acceptance.ts b/src/__tests__/acceptance/staking-contracts-service.acceptance.ts index 7a2374c..3978d0c 100644 --- a/src/__tests__/acceptance/staking-contracts-service.acceptance.ts +++ b/src/__tests__/acceptance/staking-contracts-service.acceptance.ts @@ -7,8 +7,8 @@ import {AssetType} from '@collabland/chain'; import {BigNumber, debugFactory, getEnvVar, pMap} from '@collabland/common'; import {Application} from '@loopback/core'; import {expect} from '@loopback/testlab'; -import {StakingContractsComponent} from '../../component'; -import {STAKING_CONTRACTS_SERVICE} from '../../keys'; +import {StakingContractsComponent} from '../../component.js'; +import {STAKING_CONTRACTS_SERVICE} from '../../keys.js'; const debug = debugFactory('collabland:staking-contracts'); // eslint-disable-next-line @typescript-eslint/no-misused-promises diff --git a/src/adapters/Jngl-staking.adapter.ts b/src/adapters/Jngl-staking.adapter.ts index 02f57c3..5dcd8fc 100644 --- a/src/adapters/Jngl-staking.adapter.ts +++ b/src/adapters/Jngl-staking.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {JnglStaking__factory} from '../types/factories/JnglStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {JnglStaking__factory} from '../types/factories/JnglStaking__factory.js'; @injectable( { diff --git a/src/adapters/ab.adapter.ts b/src/adapters/ab.adapter.ts index c245cac..255277f 100644 --- a/src/adapters/ab.adapter.ts +++ b/src/adapters/ab.adapter.ts @@ -6,9 +6,9 @@ import {getEnvVar} from '@collabland/common'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {request, gql} from 'graphql-request'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {gql, request} from 'graphql-request'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // interface for query return type interface Data { diff --git a/src/adapters/banshees-staking.adapter.ts b/src/adapters/banshees-staking.adapter.ts index d9a2b84..f2fb7f7 100644 --- a/src/adapters/banshees-staking.adapter.ts +++ b/src/adapters/banshees-staking.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {BansheesStaking__factory} from '../types/factories/BansheesStaking__factory'; +import {BansheesStaking__factory} from '../types/factories/BansheesStaking__factory.js'; @injectable( { diff --git a/src/adapters/bapeliens-staking.adapter.ts b/src/adapters/bapeliens-staking.adapter.ts index a477db2..9020c43 100644 --- a/src/adapters/bapeliens-staking.adapter.ts +++ b/src/adapters/bapeliens-staking.adapter.ts @@ -1,8 +1,8 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {BapeliensStaking__factory} from '../types/factories/BapeliensStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {BapeliensStaking__factory} from '../types/factories/BapeliensStaking__factory.js'; @injectable( { diff --git a/src/adapters/cbzgrow.adapter.ts b/src/adapters/cbzgrow.adapter.ts index a989bea..9164e6f 100644 --- a/src/adapters/cbzgrow.adapter.ts +++ b/src/adapters/cbzgrow.adapter.ts @@ -5,11 +5,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {Cbzgrow} from '../types/Cbzgrow'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {Cbzgrow} from '../types/Cbzgrow.js'; // Use the full path to import instead of `../types` -import {Cbzgrow__factory} from '../types/factories/Cbzgrow__factory'; +import {Cbzgrow__factory} from '../types/factories/Cbzgrow__factory.js'; @injectable( { diff --git a/src/adapters/chillrx.adapter.ts b/src/adapters/chillrx.adapter.ts index 535ce27..da86f7c 100644 --- a/src/adapters/chillrx.adapter.ts +++ b/src/adapters/chillrx.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {ChillrxStaking__factory} from '../types/factories/ChillrxStaking__factory'; +import {ChillrxStaking__factory} from '../types/factories/ChillrxStaking__factory.js'; @injectable( { diff --git a/src/adapters/coco.adapter.ts b/src/adapters/coco.adapter.ts index 606fed0..e27263c 100644 --- a/src/adapters/coco.adapter.ts +++ b/src/adapters/coco.adapter.ts @@ -5,11 +5,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {Coco} from '../types/Coco'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {Coco} from '../types/Coco.js'; // Use the full path to import instead of `../types` -import {Coco__factory} from '../types/factories/Coco__factory'; +import {Coco__factory} from '../types/factories/Coco__factory.js'; @injectable( { diff --git a/src/adapters/digitz.adapter.ts b/src/adapters/digitz.adapter.ts index 6ebea47..f4a9308 100644 --- a/src/adapters/digitz.adapter.ts +++ b/src/adapters/digitz.adapter.ts @@ -5,8 +5,8 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` @injectable( diff --git a/src/adapters/dogface.adapter.ts b/src/adapters/dogface.adapter.ts index f15890b..c798992 100644 --- a/src/adapters/dogface.adapter.ts +++ b/src/adapters/dogface.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {DogfaceStaking} from '../types/DogfaceStaking'; -import {DogfaceStaking__factory} from '../types/factories/DogfaceStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {DogfaceStaking} from '../types/DogfaceStaking.js'; +import {DogfaceStaking__factory} from '../types/factories/DogfaceStaking__factory.js'; @injectable( { diff --git a/src/adapters/dogface2.adapter.ts b/src/adapters/dogface2.adapter.ts index 3149906..f6b9bc3 100644 --- a/src/adapters/dogface2.adapter.ts +++ b/src/adapters/dogface2.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {Dogface2ndStaking} from '../types/Dogface2ndStaking'; -import {Dogface2ndStaking__factory} from '../types/factories/Dogface2ndStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {Dogface2ndStaking} from '../types/Dogface2ndStaking.js'; +import {Dogface2ndStaking__factory} from '../types/factories/Dogface2ndStaking__factory.js'; @injectable( { diff --git a/src/adapters/dogs-unchained.adapter.ts b/src/adapters/dogs-unchained.adapter.ts index 3507d14..6666437 100644 --- a/src/adapters/dogs-unchained.adapter.ts +++ b/src/adapters/dogs-unchained.adapter.ts @@ -6,10 +6,10 @@ import {AssetName} from '@collabland/chain'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {DuStaking} from '../types/DuStaking'; -import {DuStaking__factory} from '../types/factories/DuStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {DuStaking} from '../types/DuStaking.js'; +import {DuStaking__factory} from '../types/factories/DuStaking__factory.js'; @injectable( { diff --git a/src/adapters/e4c-ranger-staking.adapter.ts b/src/adapters/e4c-ranger-staking.adapter.ts index 3c03cbd..0e93964 100644 --- a/src/adapters/e4c-ranger-staking.adapter.ts +++ b/src/adapters/e4c-ranger-staking.adapter.ts @@ -7,9 +7,9 @@ import {JsonFragment} from '@ethersproject/abi'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {Contract, Provider} from 'ethcall'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {E4cRangerStaking__factory} from '../types/factories/E4cRangerStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {E4cRangerStaking__factory} from '../types/factories/E4cRangerStaking__factory.js'; abstract class E4CStakingContractAdapter extends BaseStakingContractAdapter { private ecProvider: Provider; diff --git a/src/adapters/erc20-staking.adapter.ts b/src/adapters/erc20-staking.adapter.ts index 7b257c2..5250235 100644 --- a/src/adapters/erc20-staking.adapter.ts +++ b/src/adapters/erc20-staking.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {IStakingModule__factory} from '../types/factories/IStakingModule__factory'; +import {IStakingModule__factory} from '../types/factories/IStakingModule__factory.js'; @injectable( { diff --git a/src/adapters/flooring-protocol-staking.adapter.ts b/src/adapters/flooring-protocol-staking.adapter.ts index baf20ac..71d6d7b 100644 --- a/src/adapters/flooring-protocol-staking.adapter.ts +++ b/src/adapters/flooring-protocol-staking.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {FlooringProtocolStaking__factory} from '../types/factories/FlooringProtocolStaking__factory'; +import {FlooringProtocolStaking__factory} from '../types/factories/FlooringProtocolStaking__factory.js'; @injectable( { diff --git a/src/adapters/genk-staking.adapter.ts b/src/adapters/genk-staking.adapter.ts index dd10550..40d37e1 100644 --- a/src/adapters/genk-staking.adapter.ts +++ b/src/adapters/genk-staking.adapter.ts @@ -1,8 +1,8 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {GenkStaking__factory} from '../types/factories/GenkStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {GenkStaking__factory} from '../types/factories/GenkStaking__factory.js'; @injectable( { diff --git a/src/adapters/habibiz-royals.adapter.ts b/src/adapters/habibiz-royals.adapter.ts index 8f63348..ded056f 100644 --- a/src/adapters/habibiz-royals.adapter.ts +++ b/src/adapters/habibiz-royals.adapter.ts @@ -1,10 +1,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {HabibizStaking} from '../types/HabibizStaking'; -import {HabibizStaking__factory} from '../types/factories/HabibizStaking__factory'; +import {HabibizStaking} from '../types/HabibizStaking.js'; +import {HabibizStaking__factory} from '../types/factories/HabibizStaking__factory.js'; @injectable( { diff --git a/src/adapters/idol-marketplace.adapter.ts b/src/adapters/idol-marketplace.adapter.ts index b04812b..004d050 100644 --- a/src/adapters/idol-marketplace.adapter.ts +++ b/src/adapters/idol-marketplace.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {IdolMarketplace__factory} from '../types/factories/IdolMarketplace__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {IdolMarketplace__factory} from '../types/factories/IdolMarketplace__factory.js'; @injectable( { diff --git a/src/adapters/lifestory-planet-staking.adapter.ts b/src/adapters/lifestory-planet-staking.adapter.ts index 26ca8c7..6562048 100644 --- a/src/adapters/lifestory-planet-staking.adapter.ts +++ b/src/adapters/lifestory-planet-staking.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {LifestoryPlanetStaking__factory} from '../types/factories/LifestoryPlanetStaking__factory'; +import {LifestoryPlanetStaking__factory} from '../types/factories/LifestoryPlanetStaking__factory.js'; @injectable( { diff --git a/src/adapters/meltdown-1.adapter.ts b/src/adapters/meltdown-1.adapter.ts index 6e5df6e..bbec217 100644 --- a/src/adapters/meltdown-1.adapter.ts +++ b/src/adapters/meltdown-1.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {MeltdownChildren__factory} from '../types/factories/MeltdownChildren__factory'; +import {MeltdownChildren__factory} from '../types/factories/MeltdownChildren__factory.js'; @injectable( { diff --git a/src/adapters/meltdown.adapter.ts b/src/adapters/meltdown.adapter.ts index b1cd1a5..7eb87cc 100644 --- a/src/adapters/meltdown.adapter.ts +++ b/src/adapters/meltdown.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {Meltdown03__factory} from '../types/factories/Meltdown03__factory'; +import {Meltdown03__factory} from '../types/factories/Meltdown03__factory.js'; @injectable( { diff --git a/src/adapters/moonrunners.adapter.ts b/src/adapters/moonrunners.adapter.ts index b028b5e..8874a96 100644 --- a/src/adapters/moonrunners.adapter.ts +++ b/src/adapters/moonrunners.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {MoonrunnersStaking__factory} from '../types/factories/MoonrunnersStaking__factory'; +import {MoonrunnersStaking__factory} from '../types/factories/MoonrunnersStaking__factory.js'; @injectable( { diff --git a/src/adapters/mtg.adapter.ts b/src/adapters/mtg.adapter.ts index efb8427..2fe73f4 100644 --- a/src/adapters/mtg.adapter.ts +++ b/src/adapters/mtg.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {MtgStaking__factory} from '../types/factories/MtgStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {MtgStaking__factory} from '../types/factories/MtgStaking__factory.js'; @injectable( { diff --git a/src/adapters/nftw-escrow.adapter.ts b/src/adapters/nftw-escrow.adapter.ts index 652db10..20a4b65 100644 --- a/src/adapters/nftw-escrow.adapter.ts +++ b/src/adapters/nftw-escrow.adapter.ts @@ -6,11 +6,11 @@ import {pMap} from '@collabland/common'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {MtgStaking__factory} from '../types/factories/MtgStaking__factory'; -import {NftwEscrow__factory} from '../types/factories/NftwEscrow__factory'; -import {NftwEscrow} from '../types/NftwEscrow'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {NftwEscrow} from '../types/NftwEscrow.js'; +import {MtgStaking__factory} from '../types/factories/MtgStaking__factory.js'; +import {NftwEscrow__factory} from '../types/factories/NftwEscrow__factory.js'; @injectable( { diff --git a/src/adapters/omniguard-eternals.adapter.ts b/src/adapters/omniguard-eternals.adapter.ts index 6d4464a..96f58b0 100644 --- a/src/adapters/omniguard-eternals.adapter.ts +++ b/src/adapters/omniguard-eternals.adapter.ts @@ -1,11 +1,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` import {AssetName} from '@collabland/chain'; -import {OmniguardEternals} from '../types'; -import {OmniguardEternals__factory} from '../types/factories/OmniguardEternals__factory'; +import {OmniguardEternals__factory} from '../types/factories/OmniguardEternals__factory.js'; +import {OmniguardEternals} from '../types/index.js'; @injectable( { diff --git a/src/adapters/plutoalliance.adapter.ts b/src/adapters/plutoalliance.adapter.ts index ed8e6bd..383d455 100644 --- a/src/adapters/plutoalliance.adapter.ts +++ b/src/adapters/plutoalliance.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {PlutoallianceStaking__factory} from '../types/factories/PlutoallianceStaking__factory'; +import {PlutoallianceStaking__factory} from '../types/factories/PlutoallianceStaking__factory.js'; @injectable( { diff --git a/src/adapters/primordia.adapter.ts b/src/adapters/primordia.adapter.ts index 86b3696..a42e8e4 100644 --- a/src/adapters/primordia.adapter.ts +++ b/src/adapters/primordia.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {PrimordiaStaking__factory} from '../types/factories/PrimordiaStaking__factory'; +import {PrimordiaStaking__factory} from '../types/factories/PrimordiaStaking__factory.js'; @injectable( { diff --git a/src/adapters/random-staking.adapter.ts b/src/adapters/random-staking.adapter.ts index a539a80..afe7f1f 100644 --- a/src/adapters/random-staking.adapter.ts +++ b/src/adapters/random-staking.adapter.ts @@ -6,10 +6,10 @@ import {AssetName} from '@collabland/chain'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {RandomStaking__factory} from '../types/factories/RandomStaking__factory'; -import type {RandomStaking} from '../types/RandomStaking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {RandomStaking} from '../types/RandomStaking.js'; +import {RandomStaking__factory} from '../types/factories/RandomStaking__factory.js'; /** * The nft contract address diff --git a/src/adapters/rd-staking.adapter.ts b/src/adapters/rd-staking.adapter.ts index 2710236..7dc982f 100644 --- a/src/adapters/rd-staking.adapter.ts +++ b/src/adapters/rd-staking.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {RdStaking__factory} from '../types'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {RdStaking__factory} from '../types/index.js'; @injectable( { diff --git a/src/adapters/rekt-dogs-adapter.ts b/src/adapters/rekt-dogs-adapter.ts index bb5526f..f88f634 100644 --- a/src/adapters/rekt-dogs-adapter.ts +++ b/src/adapters/rekt-dogs-adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {RektDogsStaking__factory} from '../types/factories/RektDogsStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {RektDogsStaking__factory} from '../types/factories/RektDogsStaking__factory.js'; @injectable( { diff --git a/src/adapters/renft.adapter.ts b/src/adapters/renft.adapter.ts index 5080a1c..4cbc587 100644 --- a/src/adapters/renft.adapter.ts +++ b/src/adapters/renft.adapter.ts @@ -12,8 +12,8 @@ import { } from '@collabland/common'; import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter} from '../staking.js'; type PartialRenting = { rentAmount: string; diff --git a/src/adapters/replicantx-staking.adapter.ts b/src/adapters/replicantx-staking.adapter.ts index ed2d6f0..59bd4fc 100644 --- a/src/adapters/replicantx-staking.adapter.ts +++ b/src/adapters/replicantx-staking.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {ReplicantxStaking__factory} from '../types/factories/ReplicantxStaking__factory'; +import {ReplicantxStaking__factory} from '../types/factories/ReplicantxStaking__factory.js'; @injectable( { diff --git a/src/adapters/ririsu.adapter.ts b/src/adapters/ririsu.adapter.ts index 0e44110..b276909 100644 --- a/src/adapters/ririsu.adapter.ts +++ b/src/adapters/ririsu.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {RirisuStaking__factory} from '../types/factories/RirisuStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {RirisuStaking__factory} from '../types/factories/RirisuStaking__factory.js'; @injectable( { diff --git a/src/adapters/rival-bears-staking.adapter.ts b/src/adapters/rival-bears-staking.adapter.ts index 6d2a260..1b54b53 100644 --- a/src/adapters/rival-bears-staking.adapter.ts +++ b/src/adapters/rival-bears-staking.adapter.ts @@ -5,11 +5,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {RivalBearsStaking} from '../types/RivalBearsStaking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {RivalBearsStaking} from '../types/RivalBearsStaking.js'; // Use the full path to import instead of `../types` -import {RivalBearsStaking__factory} from '../types/factories/RivalBearsStaking__factory'; +import {RivalBearsStaking__factory} from '../types/factories/RivalBearsStaking__factory.js'; @injectable( { diff --git a/src/adapters/robo.adapter.ts b/src/adapters/robo.adapter.ts index 7daca01..6e47249 100644 --- a/src/adapters/robo.adapter.ts +++ b/src/adapters/robo.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {RoboStaking__factory} from '../types/factories/RoboStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {RoboStaking__factory} from '../types/factories/RoboStaking__factory.js'; @injectable( { diff --git a/src/adapters/sky-farm.adapter.ts b/src/adapters/sky-farm.adapter.ts index 9f80b78..449e6fd 100644 --- a/src/adapters/sky-farm.adapter.ts +++ b/src/adapters/sky-farm.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {SkyFarm__factory} from '../types/factories/SkyFarm__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {SkyFarm__factory} from '../types/factories/SkyFarm__factory.js'; @injectable( { diff --git a/src/adapters/spit-yard.adapter.ts b/src/adapters/spit-yard.adapter.ts index dd98001..71c0f94 100644 --- a/src/adapters/spit-yard.adapter.ts +++ b/src/adapters/spit-yard.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {SpitYard__factory} from '../types/factories/SpitYard__factory'; +import {SpitYard__factory} from '../types/factories/SpitYard__factory.js'; @injectable( { diff --git a/src/adapters/sugartown.adapter.ts b/src/adapters/sugartown.adapter.ts index c52e536..59dbbb3 100644 --- a/src/adapters/sugartown.adapter.ts +++ b/src/adapters/sugartown.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {SugartownStaking__factory} from '../types/factories/SugartownStaking__factory'; +import {SugartownStaking__factory} from '../types/factories/SugartownStaking__factory.js'; @injectable( { diff --git a/src/adapters/supreme-kong-2-staking.adapter.ts b/src/adapters/supreme-kong-2-staking.adapter.ts index 82f86cb..22aed84 100644 --- a/src/adapters/supreme-kong-2-staking.adapter.ts +++ b/src/adapters/supreme-kong-2-staking.adapter.ts @@ -1,11 +1,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` import {AssetName} from '@collabland/chain'; -import {SupremeKong2Staking} from '../types/SupremeKong2Staking'; -import {SupremeKong2Staking__factory} from '../types/factories/SupremeKong2Staking__factory'; +import {SupremeKong2Staking} from '../types/SupremeKong2Staking.js'; +import {SupremeKong2Staking__factory} from '../types/factories/SupremeKong2Staking__factory.js'; @injectable( { diff --git a/src/adapters/supreme-kong-staking.adapter.ts b/src/adapters/supreme-kong-staking.adapter.ts index 454724d..1a20023 100644 --- a/src/adapters/supreme-kong-staking.adapter.ts +++ b/src/adapters/supreme-kong-staking.adapter.ts @@ -1,11 +1,11 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` import {AssetName} from '@collabland/chain'; -import {SupremeKongStaking} from '../types/SupremeKongStaking'; -import {SupremeKongStaking__factory} from '../types/factories/SupremeKongStaking__factory'; +import {SupremeKongStaking} from '../types/SupremeKongStaking.js'; +import {SupremeKongStaking__factory} from '../types/factories/SupremeKongStaking__factory.js'; @injectable( { diff --git a/src/adapters/ttoo-staking.adapter.ts b/src/adapters/ttoo-staking.adapter.ts index aa514de..316ca7f 100644 --- a/src/adapters/ttoo-staking.adapter.ts +++ b/src/adapters/ttoo-staking.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {TtooStaking__factory} from '../types/factories/TtooStaking__factory'; +import {TtooStaking__factory} from '../types/factories/TtooStaking__factory.js'; @injectable( { diff --git a/src/adapters/uwulend-staking.adapter.ts b/src/adapters/uwulend-staking.adapter.ts index d249539..f4948b8 100644 --- a/src/adapters/uwulend-staking.adapter.ts +++ b/src/adapters/uwulend-staking.adapter.ts @@ -5,9 +5,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import {UwulendStaking__factory} from '../types/factories/UwulendStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import {UwulendStaking__factory} from '../types/factories/UwulendStaking__factory.js'; @injectable( { diff --git a/src/adapters/warriorsofankh-staking.adapter.ts b/src/adapters/warriorsofankh-staking.adapter.ts index 7140a58..9402c8e 100644 --- a/src/adapters/warriorsofankh-staking.adapter.ts +++ b/src/adapters/warriorsofankh-staking.adapter.ts @@ -1,9 +1,9 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; // Use the full path to import instead of `../types` -import {WarriorsofankhStaking__factory} from '../types/factories/WarriorsofankhStaking__factory'; +import {WarriorsofankhStaking__factory} from '../types/factories/WarriorsofankhStaking__factory.js'; @injectable( { diff --git a/src/adapters/xeno-mining.adapter.ts b/src/adapters/xeno-mining.adapter.ts index 7e5d06e..a53fe40 100644 --- a/src/adapters/xeno-mining.adapter.ts +++ b/src/adapters/xeno-mining.adapter.ts @@ -5,10 +5,10 @@ import {BindingScope, extensionFor, injectable} from '@loopback/core'; import {BigNumber} from 'ethers'; -import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys'; -import {BaseStakingContractAdapter, StakingAsset} from '../staking'; -import type {XenoStaking} from '../types/XenoStaking'; -import {XenoStaking__factory} from '../types/factories/XenoStaking__factory'; +import {STAKING_ADAPTERS_EXTENSION_POINT} from '../keys.js'; +import {BaseStakingContractAdapter, StakingAsset} from '../staking.js'; +import type {XenoStaking} from '../types/XenoStaking.js'; +import {XenoStaking__factory} from '../types/factories/XenoStaking__factory.js'; @injectable( { diff --git a/src/component.ts b/src/component.ts index 6c6b86c..33f5f0b 100644 --- a/src/component.ts +++ b/src/component.ts @@ -9,56 +9,56 @@ import { injectable, ServiceOrProviderClass, } from '@loopback/core'; -import {ChillRxStakingContractAdapter} from './adapters/chillrx.adapter'; -import {CocoStakingContractAdapter} from './adapters/coco.adapter'; -import {DogfaceStakingContractAdapter} from './adapters/dogface.adapter'; -import {Dogface2ndStakingContractAdapter} from './adapters/dogface2.adapter'; -import {DogsUnchainedStakingContractAdapter} from './adapters/dogs-unchained.adapter'; +import {ChillRxStakingContractAdapter} from './adapters/chillrx.adapter.js'; +import {CocoStakingContractAdapter} from './adapters/coco.adapter.js'; +import {DogfaceStakingContractAdapter} from './adapters/dogface.adapter.js'; +import {Dogface2ndStakingContractAdapter} from './adapters/dogface2.adapter.js'; +import {DogsUnchainedStakingContractAdapter} from './adapters/dogs-unchained.adapter.js'; import { E4CGoldStakingContractAdapter, E4CRangerStakingContractAdapter, -} from './adapters/e4c-ranger-staking.adapter'; -import {PerionCreditsStakingContractAdapter} from './adapters/erc20-staking.adapter'; -import {IdolMarketplaceContractAdapter} from './adapters/idol-marketplace.adapter'; -import {LifestoryPlanetStakingAdapter} from './adapters/lifestory-planet-staking.adapter'; -import {MeltdownContractAdapter} from './adapters/meltdown-1.adapter'; -import {Meltdown03ContractAdapter} from './adapters/meltdown.adapter'; +} from './adapters/e4c-ranger-staking.adapter.js'; +import {PerionCreditsStakingContractAdapter} from './adapters/erc20-staking.adapter.js'; +import {IdolMarketplaceContractAdapter} from './adapters/idol-marketplace.adapter.js'; +import {LifestoryPlanetStakingAdapter} from './adapters/lifestory-planet-staking.adapter.js'; +import {MeltdownContractAdapter} from './adapters/meltdown-1.adapter.js'; +import {Meltdown03ContractAdapter} from './adapters/meltdown.adapter.js'; -import {AngelBlockStakingContractAdapter} from './adapters/ab.adapter'; -import {BansheesStakingContractAdapter} from './adapters/banshees-staking.adapter'; -import {BapeliensStakingContractAdapter} from './adapters/bapeliens-staking.adapter'; -import {CbzGrowStakingContractAdapter} from './adapters/cbzgrow.adapter'; -import {FlooringProtocolStakingContractAdapter} from './adapters/flooring-protocol-staking.adapter'; -import {GenKStakingContractAdapter} from './adapters/genk-staking.adapter'; -import {HabibizRoyalsStakingContractAdapter} from './adapters/habibiz-royals.adapter'; -import {JnglStakingContractAdapter} from './adapters/Jngl-staking.adapter'; -import {MoonrunnersStakingContractAdapter} from './adapters/moonrunners.adapter'; -import {MtgStakingContractAdapter} from './adapters/mtg.adapter'; -import {OmniguardEternalsStakingContractAdapter} from './adapters/omniguard-eternals.adapter'; -import {PlutoallianceStakingAdapter} from './adapters/plutoalliance.adapter'; -import {PrimordiaStakingContractAdapter} from './adapters/primordia.adapter'; -import {RandomStakingContractAdapter} from './adapters/random-staking.adapter'; -import {RDStakingContractAdapter} from './adapters/rd-staking.adapter'; -import {RektDogsStakingContractAdapter} from './adapters/rekt-dogs-adapter'; +import {AngelBlockStakingContractAdapter} from './adapters/ab.adapter.js'; +import {BansheesStakingContractAdapter} from './adapters/banshees-staking.adapter.js'; +import {BapeliensStakingContractAdapter} from './adapters/bapeliens-staking.adapter.js'; +import {CbzGrowStakingContractAdapter} from './adapters/cbzgrow.adapter.js'; +import {FlooringProtocolStakingContractAdapter} from './adapters/flooring-protocol-staking.adapter.js'; +import {GenKStakingContractAdapter} from './adapters/genk-staking.adapter.js'; +import {HabibizRoyalsStakingContractAdapter} from './adapters/habibiz-royals.adapter.js'; +import {JnglStakingContractAdapter} from './adapters/Jngl-staking.adapter.js'; +import {MoonrunnersStakingContractAdapter} from './adapters/moonrunners.adapter.js'; +import {MtgStakingContractAdapter} from './adapters/mtg.adapter.js'; +import {OmniguardEternalsStakingContractAdapter} from './adapters/omniguard-eternals.adapter.js'; +import {PlutoallianceStakingAdapter} from './adapters/plutoalliance.adapter.js'; +import {PrimordiaStakingContractAdapter} from './adapters/primordia.adapter.js'; +import {RandomStakingContractAdapter} from './adapters/random-staking.adapter.js'; +import {RDStakingContractAdapter} from './adapters/rd-staking.adapter.js'; +import {RektDogsStakingContractAdapter} from './adapters/rekt-dogs-adapter.js'; import { ReNFTEthereumSylvesterV0StakingContractAdapter, ReNFTPolygonSylvesterV1StakingContractAdapter, -} from './adapters/renft.adapter'; -import {ReplicantXStakingContractAdapter} from './adapters/replicantx-staking.adapter'; -import {RirisuStakingContractAdapter} from './adapters/ririsu.adapter'; -import {RivalBearsStakingContractAdapter} from './adapters/rival-bears-staking.adapter'; -import {RoboStakingContractAdapter} from './adapters/robo.adapter'; -import {SkyFarmStakingContractAdapter} from './adapters/sky-farm.adapter'; -import {SpitYardContractAdapter} from './adapters/spit-yard.adapter'; -import {SugartownStakingContractAdapter} from './adapters/sugartown.adapter'; -import {SupremeKong2StakingContractAdapter} from './adapters/supreme-kong-2-staking.adapter'; -import {SupremeKongStakingContractAdapter} from './adapters/supreme-kong-staking.adapter'; -import {TtooStakingContractAdapter} from './adapters/ttoo-staking.adapter'; -import {UwULendStakingContractAdapter} from './adapters/uwulend-staking.adapter'; -import {WarriorsofankhStakingContractAdapter} from './adapters/warriorsofankh-staking.adapter'; -import {XenoStakingContractAdapter} from './adapters/xeno-mining.adapter'; -import {STAKING_CONTRACTS_COMPONENT} from './keys'; -import {StakingContractsService} from './services/staking-contracts.service'; +} from './adapters/renft.adapter.js'; +import {ReplicantXStakingContractAdapter} from './adapters/replicantx-staking.adapter.js'; +import {RirisuStakingContractAdapter} from './adapters/ririsu.adapter.js'; +import {RivalBearsStakingContractAdapter} from './adapters/rival-bears-staking.adapter.js'; +import {RoboStakingContractAdapter} from './adapters/robo.adapter.js'; +import {SkyFarmStakingContractAdapter} from './adapters/sky-farm.adapter.js'; +import {SpitYardContractAdapter} from './adapters/spit-yard.adapter.js'; +import {SugartownStakingContractAdapter} from './adapters/sugartown.adapter.js'; +import {SupremeKong2StakingContractAdapter} from './adapters/supreme-kong-2-staking.adapter.js'; +import {SupremeKongStakingContractAdapter} from './adapters/supreme-kong-staking.adapter.js'; +import {TtooStakingContractAdapter} from './adapters/ttoo-staking.adapter.js'; +import {UwULendStakingContractAdapter} from './adapters/uwulend-staking.adapter.js'; +import {WarriorsofankhStakingContractAdapter} from './adapters/warriorsofankh-staking.adapter.js'; +import {XenoStakingContractAdapter} from './adapters/xeno-mining.adapter.js'; +import {STAKING_CONTRACTS_COMPONENT} from './keys.js'; +import {StakingContractsService} from './services/staking-contracts.service.js'; // Configure the binding for StakingContractsComponent @injectable({ diff --git a/src/index.ts b/src/index.ts index f33f604..35da844 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,8 +3,8 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './component'; -export * from './keys'; -export * from './models'; -export * from './services'; -export * from './types'; +export * from './component.js'; +export * from './keys.js'; +export * from './models/index.js'; +export * from './services/index.js'; +export * from './types/index.js'; diff --git a/src/keys.ts b/src/keys.ts index e46354b..f431b84 100644 --- a/src/keys.ts +++ b/src/keys.ts @@ -4,9 +4,9 @@ // License text available at https://opensource.org/licenses/MIT import {BindingKey, CoreBindings} from '@loopback/core'; -import type {StakingContractsComponent} from './component'; -import type {StakingContractsService} from './services/staking-contracts.service'; -import type {EthersProviderService} from './staking'; +import type {StakingContractsComponent} from './component.js'; +import type {StakingContractsService} from './services/staking-contracts.service.js'; +import type {EthersProviderService} from './staking.js'; export const STAKING_CONTRACTS_COMPONENT = BindingKey.create( diff --git a/src/models/index.ts b/src/models/index.ts index 66c858d..761f8c6 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './staking.model'; +export * from './staking.model.js'; diff --git a/src/services/index.ts b/src/services/index.ts index fff256e..aaf4a0a 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -3,4 +3,4 @@ // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT -export * from './staking-contracts.service'; +export * from './staking-contracts.service.js'; diff --git a/src/services/staking-contracts.service.ts b/src/services/staking-contracts.service.ts index a75a5e0..f93e4d3 100644 --- a/src/services/staking-contracts.service.ts +++ b/src/services/staking-contracts.service.ts @@ -20,8 +20,8 @@ import {BigNumber, utils} from 'ethers'; import { STAKING_ADAPTERS_EXTENSION_POINT, STAKING_CONTRACTS_SERVICE, -} from '../keys'; -import {StackingContractAdapter, StakingContractMetadata} from '../staking'; +} from '../keys.js'; +import {StackingContractAdapter, StakingContractMetadata} from '../staking.js'; const debug = debugFactory('collabland:staking-contracts'); diff --git a/src/staking.ts b/src/staking.ts index 6cdac73..ddf3a10 100644 --- a/src/staking.ts +++ b/src/staking.ts @@ -7,10 +7,10 @@ import {AssetType} from '@collabland/chain'; import {getEnvVar} from '@collabland/common'; import {inject} from '@loopback/core'; import {BigNumber, providers} from 'ethers'; -import {ETHERS_PROVIDER_SERVICE} from './keys'; -import {StakingAsset} from './models/staking.model'; +import {ETHERS_PROVIDER_SERVICE} from './keys.js'; +import {StakingAsset} from './models/staking.model.js'; -export {StakingAsset, StakingContractMetadata} from './models/staking.model'; +export {StakingAsset, StakingContractMetadata} from './models/staking.model.js'; export interface EthersProviderService { getProvider(chainIdOrNetwork: string | number): providers.Provider; @@ -68,7 +68,8 @@ export interface StackingContractAdapter { const defaultEthersProviderService = { getProvider(chainId: string | number) { - const projectId = getEnvVar('INFURA_PROJECT_ID'); + const projectId = + getEnvVar('INFURA_PROJECT_ID') ?? getEnvVar('STAKING_INFURA_PROJECT_ID'); const projectSecret = getEnvVar('INFURA_PROJECT_SECRET'); if (projectId == null) { return providers.getDefaultProvider(chainId); diff --git a/tsconfig.json b/tsconfig.json index c7b8e49..2241930 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,11 @@ "extends": "@loopback/build/config/tsconfig.common.json", "compilerOptions": { "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + "module": "NodeNext", + "target": "ES2022", + "useDefineForClassFields": false, + "moduleResolution": "NodeNext" }, "include": ["src"] }