diff --git a/.circleci/config.yml b/.circleci/config.yml index 6622e68db2..c73da43929 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -314,11 +314,6 @@ jobs: command: CHAIN_ID=1 pnpm run test:contracts:chainid:coverage environment: NODE_OPTIONS: --max-old-space-size=6144 - - run: - name: "Running chainid tests with coverage for goerli" - command: CHAIN_ID=5 pnpm run test:contracts:chainid:coverage - environment: - NODE_OPTIONS: --max-old-space-size=6144 - run: name: "Running chainid tests with coverage for xDai" command: CHAIN_ID=100 pnpm run test:contracts:chainid:coverage diff --git a/.gitignore b/.gitignore index 3ba88be91a..8c1a8e6670 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env node_modules parity-genesis.json contracts/Updated* diff --git a/contracts/colonyNetwork/ColonyNetworkENS.sol b/contracts/colonyNetwork/ColonyNetworkENS.sol index 4edb71dd46..fc13f01a2a 100644 --- a/contracts/colonyNetwork/ColonyNetworkENS.sol +++ b/contracts/colonyNetwork/ColonyNetworkENS.sol @@ -140,8 +140,6 @@ contract ColonyNetworkENS is ColonyNetworkStorage { function getGlobalENSDomain() internal view returns (string memory) { if (isMainnet()) { return "joincolony.eth"; - } else if (isGoerli()) { - return "joincolony.test"; } else if (isXdai()) { return "joincolony.colonyxdai"; } diff --git a/contracts/common/MultiChain.sol b/contracts/common/MultiChain.sol index 93ede3447b..cc56efd111 100644 --- a/contracts/common/MultiChain.sol +++ b/contracts/common/MultiChain.sol @@ -31,9 +31,4 @@ contract MultiChain { uint256 chainId = block.chainid; return (chainId == 1 || chainId == 2656691); } - - function isGoerli() internal view returns (bool) { - uint256 chainId = block.chainid; - return (chainId == 5 || chainId == 2656695); - } } diff --git a/docs/guides/reputation-mining-client.md b/docs/guides/reputation-mining-client.md index 91017f3cd6..eef1aae3bc 100644 --- a/docs/guides/reputation-mining-client.md +++ b/docs/guides/reputation-mining-client.md @@ -7,7 +7,7 @@ sidebar_position: 3 ## Running the Mining Client -The reputation mining client can be run locally to sync with a local ganache instance, the `goerli` testnet, or with glider on `mainnet`. +The reputation mining client can be run locally to sync with a local hardhat instance, the `arbitrum-sepolia` testnet, or with `arbitrum` itself. To participate in the reputation mining process you need to have staked at least the [minimum amount of CLNY Tokens](../interfaces/ireputationminingcycle#getminstake-uint256-minstake), for at least [one full mining cycle duration](../interfaces/ireputationminingcycle#getminingwindowduration-uint256-miningwindowduration) before you can submit a new reputation root hash. @@ -22,13 +22,13 @@ Mandatory arguments: ``` (--minerAddress
) | (--privateKey ) (--colonyNetworkAddress
) -(--syncFrom ) // [goerli:'548534', mainnet:'7913100'] +(--syncFrom ) // [arbitrum-sepolia: '28290396', arbitrum:'199165580'] ``` Optional arguments: ``` -[--network <(goerli|mainnet)>] +[--network <(arbitrum-sepolia|arbitrum)>] [--localPort ] [--dbPath <$PATH>] [--auto <(true|false)>] @@ -43,7 +43,7 @@ Private key of the miner account which the client will sign reputation mining co #### `--colonyNetworkAddress` -The address of the Colony Network's `EtherRouter`. See [Upgrades to the Colony Network](../concepts/upgrades) for more information about the EtherRouter design pattern. This address is static on `goerli` and `mainnet` `goerli` `0x79073fc2117dD054FCEdaCad1E7018C9CbE3ec0B` `mainnet` `0x5346d0f80e2816fad329f2c140c870ffc3c3e2ef` +The address of the Colony Network's `EtherRouter`. See [Upgrades to the Colony Network](../concepts/upgrades) for more information about the EtherRouter design pattern. This address is static on all networks, with the `arbitrum-sepolia` address of `0x7777494e3d8cce0D3570E21FEf820F9Fee077777` and the `arbitrum` address of `0xCCcccdCC0CcF6C708D860e19353c5f9a49ACccCc` #### `--dbPath` @@ -51,7 +51,7 @@ Path for the sqlite database storing reputation state. Default is `./reputationS #### `--network` -Used for connecting to a supported Infura node (instead of a local client). Valid options are `goerli` and `mainnet`. +Used for connecting to a supported Infura node (instead of a local client). Valid options are `arbitrum-sepolia` and `arbitrum`. #### `--localPort` @@ -59,10 +59,10 @@ Used to connect to a local client running on the specified port. Default is `854 #### `--syncFrom` -Block number to start reputation state sync from. This is the block at which the reputation mining process was initialised. This number is static on `goerli` and `mainnet` +Block number to start reputation state sync from. This is the block at which the reputation mining process was initialised. This number is static on all networks -* `goerli: 548534` -* `mainnet: 7913100` +* `arbitrum-sepolia: 28290396` +* `arbitrum: 199165580` Note that beginning the sync with a too-early block will result in an error. If you get this exception, try syncing from a more recent block. Note that the sync process can take long. Latest tests syncing a client from scratch to 28 reputation cycles took \~2 hours. @@ -108,7 +108,7 @@ The reputation mining client will answer queries for reputation scores locally o http://127.0.0.1:3000/{reputationState}/{colonyAddress}/{skillId}/{userAddress} ``` -An instance of the oracle is available for reputation queries against `goerli` or `mainnet` networks: +An instance of the oracle is available for reputation queries against all networks: ``` https://xdai.colony.io/reputation/{network}/{reputationState}/{colonyAddress}/{skillId}/{userAddress} @@ -116,14 +116,29 @@ https://xdai.colony.io/reputation/{network}/{reputationState}/{colonyAddress}/{s The oracle should be able to provide responses to any valid reputation score in all historical states, as well as the current state. For querying the colony-wide reputation instead of user-specific one, instead of {userAddress} use a zero address (`0x0000000000000000000000000000000000000000`) -For example, you can get the reputation score of the miner in a reputation state `0xc7eb2cf60aa4848ce0feed5d713c07fd26e404dd50ca3b9e4f2fabef196ca3bc`) using the address of the Meta Colony (`0x14946533cefe742399e9734a123f0c02d0405a51`), the mining skill id (`2`), and address of a miner (`0x0A1d439C7d0b9244035d4F934BBF8A418B35d064`). +For example, you can get the reputation score of the miner in a reputation state `0x4356fc32fc67dc29b03315b267e36b6e71a2c79a704d31d130ce7cd50f181b5b`) using the address of the Meta Colony (`0xa405A3353Bc7d6048C64BC3663f665A01fF3f43f`), the root domain skill id (`14346644871753686558079336823930779563196417`), and the address of a random contributor (`0xBDa44695a53DfEC8Fdb4b9c3087Ee1eDF91F5337`). ``` -https://xdai.colony.io/reputation/mainnet/0xc7eb2cf60aa4848ce0feed5d713c07fd26e404dd50ca3b9e4f2fabef196ca3bc/0x14946533cefe742399e9734a123f0c02d0405a51/2/0x0A1d439C7d0b9244035d4F934BBF8A418B35d064 +https://app.colony.io/reputation/arbitrum-one/0x4356fc32fc67dc29b03315b267e36b6e71a2c79a704d31d130ce7cd50f181b5b/0xa405A3353Bc7d6048C64BC3663f665A01fF3f43f/14346644871753686558079336823930779563196417/0xBDa44695a53DfEC8Fdb4b9c3087Ee1eDF91F5337 ``` The oracle returns ``` -{"branchMask":"0xc000000000000000000000000000000000000000000000000000000000000000","siblings":["0x15c45d734bccc204df2e275d516250ed0a1cd60ccabadf49e2157a3e8067e59c","0xd4ee79473ec5573d706be030f3077c44aef06f26745349bbd93dcf5f4e254422"],"key":"0x14946533cefe742399e9734a123f0c02d0405a5100000000000000000000000000000000000000000000000000000000000000020a1d439c7d0b9244035d4f934bbf8a418b35d064","value":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004","reputation":"0x0000000000000000000000000000000000000000000000000000000000000000","uid":"0x0000000000000000000000000000000000000000000000000000000000000004","reputationAmount":"0"} +{ + "branchMask": "0xff00000000000000000000000000000000000000000000000000000000000000", + "siblings": [ + "0x20c4fde0e447c113cd18c48d7d21d396e4c3796a3ff06c2975c26c78a613bb02", + "0x3dbf00c82c309552d520df46d5c78f221ea3b96210db7a6ad745798d15dd8946", + "0x12aa230bc3783dba9fd9a178614d4f63d5a73c6133d205dd5a0ac0b28ec5437a", + "0xabacb23c23992a4b141d6b4bf08ef2a89728cc2e63a9ea177c1825c73eaa2312", + "0xc3c01bb803ff65a943b4cf9cdd3d40cfaea4f5993bca9a158e94c35fa9ae076b", + "0x7580c51b923077b7765cd30187f907225971747aa1a545eba73edf7303b9d06a", + "0xa9cde995aeff9d18e72abdd19cb8efe14cbb130c098e40a36003ae5f94481868", + "0x271b5ece6ee0384943a59755daf48fb7f2b6291787418b107e58d2f1555f2832" + ], + "key": "0xa405a3353bc7d6048c64bc3663f665a01ff3f43f0000000000000000000000000000a4b100000000000000000000000000000001bda44695a53dfec8fdb4b9c3087ee1edf91f5337", + "value": "0x000000000000000000000000000000000000000000001207a14057eaa7cd3f2d0000000000000000000000000000000000000000000000000000000000000241", + "reputationAmount": "85143343283873545797421" +} ``` diff --git a/hardhat.config.js b/hardhat.config.js index c137aa2187..084e0052e2 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -1,5 +1,7 @@ /* global hre, config, task, runSuper */ +require("dotenv").config(); + const fs = require("fs"); const path = require("path"); @@ -134,6 +136,11 @@ module.exports = { contracts: [], }, networks: { + arbitrum: { + chainId: 42161, + url: "https://arb1.arbitrum.io/rpc", + accounts: [process.env.PRIVATE_KEY || "0x0355596cdb5e5242ad082c4fe3f8bbe48c9dba843fe1f99dd8272f487e70efae"], + }, development: { url: "http://localhost:8545", chainId: Number(process.env.CHAIN_ID) || FORKED_XDAI_CHAINID, diff --git a/package.json b/package.json index f8d2caf053..30cae759aa 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,7 @@ "bn.js": "^5.2.1", "body-parser": "^1.20.3", "chai": "^4.5.0", + "dotenv": "^8.0.0", "eslint": "^8.57.1", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.10.0", diff --git a/packages/reputation-miner/bin/index.js b/packages/reputation-miner/bin/index.js index 151736bb63..06841ad557 100644 --- a/packages/reputation-miner/bin/index.js +++ b/packages/reputation-miner/bin/index.js @@ -11,7 +11,8 @@ const {RetryProvider} = require("../../package-utils"); const { ConsoleAdapter, SlackAdapter, DiscordAdapter, TruffleLoader } = require("../../package-utils"); -const supportedInfuraNetworks = ["goerli", "rinkeby", "ropsten", "kovan", "mainnet"]; +const supportedInfuraNetworks = ["arbitrum-sepolia", "arbitrum"]; + const { minerAddress, privateKey, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c84748106c..c097f5279d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,7 +73,7 @@ importers: version: 1.0.5 '@wormhole-foundation/relayer-engine': specifier: ^0.3.2 - version: 0.3.2(@bull-board/ui@5.23.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2) + version: 0.3.2(@bull-board/ui@5.21.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2) async-request: specifier: ^1.2.0 version: 1.2.0 @@ -98,6 +98,9 @@ importers: chai: specifier: ^4.5.0 version: 4.5.0 + dotenv: + specifier: ^8.0.0 + version: 8.6.0 eslint: specifier: ^8.57.1 version: 8.57.1 @@ -452,7 +455,7 @@ importers: version: 0.10.17(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4) '@wormhole-foundation/relayer-engine': specifier: ^0.3.2 - version: 0.3.2(@bull-board/ui@5.21.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@22.7.4)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2) + version: 0.3.2(@bull-board/ui@5.21.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2) ethers: specifier: '5' version: 5.7.2 @@ -566,16 +569,6 @@ packages: dependencies: '@bull-board/ui': 5.21.0 redis-info: 3.1.0 - dev: false - - /@bull-board/api@5.23.0(@bull-board/ui@5.23.0): - resolution: {integrity: sha512-ZZGsWJ+XBG49GAlNgAL9tTEV6Ms7gMkQnZDbzwUhjGChCKWy62RWuPoZSefNXau9QH9+QzlzHRUeFvt4xr5wiw==} - peerDependencies: - '@bull-board/ui': 5.23.0 - dependencies: - '@bull-board/ui': 5.23.0 - redis-info: 3.1.0 - dev: true /@bull-board/koa@5.21.0: resolution: {integrity: sha512-hXZHZz+z93bf6aN295ZJ23eyT6ZwNNrke2Ec2SZO3xKnQ0AfAnDaLcqX/hLevD0XpIBX5OgjOnuOIChzk2n26w==} @@ -643,87 +636,11 @@ packages: - velocityjs - walrus - whiskers - dev: false - - /@bull-board/koa@5.23.0: - resolution: {integrity: sha512-WDoiwAgfBX7L4ud3nAbZiwBAG1N7Gsx/HL0b02a7ydGyqvznXmLRaWGrMTOol0iXnFBvrrBnYWqNsWGmIfZHfA==} - dependencies: - '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0) - '@bull-board/ui': 5.23.0 - ejs: 3.1.10 - koa: 2.15.3 - koa-mount: 4.0.0 - koa-router: 10.1.1 - koa-static: 5.0.0 - koa-views: 7.0.2(ejs@3.1.10) - transitivePeerDependencies: - - '@types/koa' - - arc-templates - - atpl - - babel-core - - bracket-template - - coffee-script - - dot - - dust - - dustjs-helpers - - dustjs-linkedin - - eco - - ect - - haml-coffee - - hamlet - - hamljs - - handlebars - - hogan.js - - htmling - - jade - - jazz - - jqtpl - - just - - liquid-node - - liquor - - lodash - - marko - - mote - - mustache - - nunjucks - - plates - - pug - - qejs - - ractive - - razor-tmpl - - react - - react-dom - - slm - - squirrelly - - supports-color - - swig - - swig-templates - - teacup - - templayed - - then-jade - - then-pug - - tinyliquid - - toffee - - twig - - twing - - underscore - - vash - - velocityjs - - walrus - - whiskers - dev: true /@bull-board/ui@5.21.0: resolution: {integrity: sha512-eH8QQwIHgCXxNEmlg9EZr3fSvno/bdbgBGfSQO5s9c9n9eDEaKX46ambKSPvgFPtwSdiV1AYQEa/3fGSebVIxg==} dependencies: '@bull-board/api': 5.21.0(@bull-board/ui@5.21.0) - dev: false - - /@bull-board/ui@5.23.0: - resolution: {integrity: sha512-iI/Ssl8T5ZEn9s899Qz67m92M6RU8thf/aqD7cUHB2yHmkCjqbw7s7NaODTsyArAsnyu7DGJMWm7EhbfFXDNgQ==} - dependencies: - '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0) - dev: true /@certusone/wormhole-sdk-proto-web@0.0.7(google-protobuf@3.21.4): resolution: {integrity: sha512-GCe1/bcqMS0Mt+hsWp4SE4NLL59pWmK0lhQXO0oqAKl0G9AuuTdudySMDF/sLc7z5H2w34bSuSrIEKvPuuSC+w==} @@ -777,7 +694,6 @@ packages: - react-dom - subscriptions-transport-ws - utf-8-validate - dev: false /@certusone/wormhole-sdk@0.10.18(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2): resolution: {integrity: sha512-VuN4AGB018ELkzTT/jN+yWgE6TWqXsHilxxCVWqGctzow2hKSFd8ADUhxhHigies436rS0vPvrgXi6m0J1+Ecw==} @@ -909,7 +825,6 @@ packages: '@solana/web3.js': 1.95.0 bn.js: 5.2.1 buffer-layout: 1.2.2 - dev: false /@coral-xyz/borsh@0.2.6(@solana/web3.js@1.95.3): resolution: {integrity: sha512-y6nmHw1bFcJib7sMHsQPpC8r47xhqDZVvhUdna7NUPzpSbOZG6f46N21+aXsQ2w/tG8Ggls488J/ZmwbgVmyjg==} @@ -1221,7 +1136,7 @@ packages: '@cosmjs/socket': 0.28.13 '@cosmjs/stream': 0.28.13 '@cosmjs/utils': 0.28.13 - axios: 0.21.4(debug@4.3.5) + axios: 0.21.4 readonly-date: 1.0.0 xstream: 11.14.0 transitivePeerDependencies: @@ -1239,7 +1154,7 @@ packages: '@cosmjs/socket': 0.29.5 '@cosmjs/stream': 0.29.5 '@cosmjs/utils': 0.29.5 - axios: 0.21.4(debug@4.3.5) + axios: 0.21.4 readonly-date: 1.0.0 xstream: 11.14.0 transitivePeerDependencies: @@ -1258,7 +1173,7 @@ packages: '@cosmjs/socket': 0.30.1 '@cosmjs/stream': 0.30.1 '@cosmjs/utils': 0.30.1 - axios: 0.21.4(debug@4.3.5) + axios: 0.21.4 readonly-date: 1.0.0 xstream: 11.14.0 transitivePeerDependencies: @@ -2378,7 +2293,7 @@ packages: dependencies: '@injectivelabs/exceptions': 1.14.13(google-protobuf@3.21.4) '@injectivelabs/ts-types': 1.14.13 - axios: 0.21.4(debug@4.3.5) + axios: 0.21.4 bignumber.js: 9.1.2 http-status-codes: 2.3.0 link-module-alias: 1.2.0 @@ -2495,7 +2410,7 @@ packages: dependencies: '@ledgerhq/cryptoassets': 5.53.0 '@ledgerhq/errors': 5.50.0 - '@ledgerhq/hw-transport': 5.26.0 + '@ledgerhq/hw-transport': 5.51.1 bignumber.js: 9.1.2 rlp: 2.2.7 dev: true @@ -2545,7 +2460,7 @@ packages: dependencies: '@ledgerhq/devices': 5.51.1 '@ledgerhq/errors': 5.50.0 - '@ledgerhq/hw-transport': 5.26.0 + '@ledgerhq/hw-transport': 5.51.1 '@ledgerhq/hw-transport-node-hid-noevents': 5.51.1 '@ledgerhq/logs': 5.50.0 lodash: 4.17.21 @@ -2571,7 +2486,7 @@ packages: deprecated: '@ledgerhq/hw-transport-u2f is deprecated. Please use @ledgerhq/hw-transport-webusb or @ledgerhq/hw-transport-webhid. https://github.com/LedgerHQ/ledgerjs/blob/master/docs/migrate_webusb.md' dependencies: '@ledgerhq/errors': 5.50.0 - '@ledgerhq/hw-transport': 5.26.0 + '@ledgerhq/hw-transport': 5.51.1 '@ledgerhq/logs': 5.50.0 u2f-api: 0.2.7 dev: true @@ -2602,7 +2517,6 @@ packages: '@ledgerhq/errors': 5.50.0 events: 3.3.0 dev: true - optional: true /@ledgerhq/logs@4.72.0: resolution: {integrity: sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA==} @@ -3480,7 +3394,6 @@ packages: resolution: {integrity: sha512-gLhCJXieSCrAU7acUJjbXl+IbGnqovvxQLlimztPoGgfLQ1wFYu+XJswrEVQqknZYK1pgxpxH3rZ+OKFs0ndQg==} dependencies: '@solana/errors': 2.0.0-preview.2 - dev: false /@solana/codecs-core@2.0.0-rc.1(typescript@5.6.2): resolution: {integrity: sha512-bauxqMfSs8EHD0JKESaNmNuNvkvHSuN3bbWAF5RjOfDu2PugxHrvRebmYauvSumZ3cTfQ4HJJX6PG5rN852qyQ==} @@ -3496,7 +3409,6 @@ packages: '@solana/codecs-core': 2.0.0-preview.2 '@solana/codecs-numbers': 2.0.0-preview.2 '@solana/errors': 2.0.0-preview.2 - dev: false /@solana/codecs-data-structures@2.0.0-rc.1(typescript@5.6.2): resolution: {integrity: sha512-rinCv0RrAVJ9rE/rmaibWJQxMwC5lSaORSZuwjopSUE6T0nb/MVg6Z1siNCXhh/HFTOg0l8bNvZHgBcN/yvXog==} @@ -3513,7 +3425,6 @@ packages: dependencies: '@solana/codecs-core': 2.0.0-preview.2 '@solana/errors': 2.0.0-preview.2 - dev: false /@solana/codecs-numbers@2.0.0-rc.1(typescript@5.6.2): resolution: {integrity: sha512-J5i5mOkvukXn8E3Z7sGIPxsThRCgSdgTWJDQeZvucQ9PT6Y3HiVXJ0pcWiOWAoQ3RX8e/f4I3IC+wE6pZiJzDQ==} @@ -3533,7 +3444,6 @@ packages: '@solana/codecs-numbers': 2.0.0-preview.2 '@solana/errors': 2.0.0-preview.2 fastestsmallesttextencoderdecoder: 1.0.22 - dev: false /@solana/codecs-strings@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-9/wPhw8TbGRTt6mHC4Zz1RqOnuPTqq1Nb4EyuvpZ39GW6O2t2Q7Q0XxiB3+BdoEjwA2XgPw6e2iRfvYgqty44g==} @@ -3557,7 +3467,6 @@ packages: '@solana/options': 2.0.0-preview.2 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - dev: false /@solana/codecs@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-qxoR7VybNJixV51L0G1RD2boZTcxmwUWnKCaJJExQ5qNKwbpSyDdWfFJfM5JhGyKe9DnPVOZB+JHWXnpbZBqrQ==} @@ -3579,7 +3488,6 @@ packages: dependencies: chalk: 5.3.0 commander: 12.1.0 - dev: false /@solana/errors@2.0.0-rc.1(typescript@5.6.2): resolution: {integrity: sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ==} @@ -3596,7 +3504,6 @@ packages: dependencies: '@solana/codecs-core': 2.0.0-preview.2 '@solana/codecs-numbers': 2.0.0-preview.2 - dev: false /@solana/options@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-mLUcR9mZ3qfHlmMnREdIFPf9dpMc/Bl66tLSOOWxw4ml5xMT2ohFn7WGqoKcu/UHkT9CrC6+amEdqCNvUqI7AA==} @@ -3623,7 +3530,6 @@ packages: '@solana/web3.js': 1.95.0 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - dev: false /@solana/spl-token-metadata@0.1.5(@solana/web3.js@1.95.0)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-DSBlo7vjuLe/xvNn75OKKndDBkFxlqjLdWlq6rf40StnrhRn7TDntHGLZpry1cf3uzQFShqeLROGNPAJwvkPnA==} @@ -3637,7 +3543,6 @@ packages: transitivePeerDependencies: - fastestsmallesttextencoderdecoder - typescript - dev: false /@solana/spl-token-metadata@0.1.5(@solana/web3.js@1.95.3)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-DSBlo7vjuLe/xvNn75OKKndDBkFxlqjLdWlq6rf40StnrhRn7TDntHGLZpry1cf3uzQFShqeLROGNPAJwvkPnA==} @@ -3669,7 +3574,6 @@ packages: - encoding - fastestsmallesttextencoderdecoder - utf-8-validate - dev: false /@solana/spl-token@0.3.11(@solana/web3.js@1.95.0)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-bvohO3rIMSVL24Pb+I4EYTJ6cL82eFpInEXD/I8K8upOGjpqHsKUoAempR/RnUlI1qSFNyFlWJfu6MNUgfbCQQ==} @@ -3688,7 +3592,6 @@ packages: - fastestsmallesttextencoderdecoder - typescript - utf-8-validate - dev: false /@solana/spl-token@0.3.11(@solana/web3.js@1.95.3)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-bvohO3rIMSVL24Pb+I4EYTJ6cL82eFpInEXD/I8K8upOGjpqHsKUoAempR/RnUlI1qSFNyFlWJfu6MNUgfbCQQ==} @@ -3737,7 +3640,6 @@ packages: - bufferutil - encoding - utf-8-validate - dev: false /@solana/web3.js@1.95.3: resolution: {integrity: sha512-O6rPUN0w2fkNqx/Z3QJMB9L225Ex10PRDH8bTaIUPZXMPV0QP8ZpPvjQnXK+upUczlRgzHzd6SjKIha1p+I6og==} @@ -3800,7 +3702,6 @@ packages: resolution: {integrity: sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==} dependencies: tslib: 2.7.0 - dev: false /@swc/helpers@0.5.13: resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} @@ -4279,7 +4180,6 @@ packages: resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} dependencies: '@types/node': 22.7.4 - dev: false /@types/ws@8.5.12: resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==} @@ -4600,7 +4500,7 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@wormhole-foundation/relayer-engine@0.3.2(@bull-board/ui@5.21.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@22.7.4)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2): + /@wormhole-foundation/relayer-engine@0.3.2(@bull-board/ui@5.21.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2): resolution: {integrity: sha512-6CAGZdxDpPZph+Gx1Tob5wEarEzvD27G7khoGhB9sc8KiOhRz8zDiBspFfLetzfBEHMiTyvAOibETV5G0ULilA==} dependencies: '@bull-board/api': 5.21.0(@bull-board/ui@5.21.0) @@ -4611,99 +4511,6 @@ packages: '@improbable-eng/grpc-web-node-http-transport': 0.15.0(@improbable-eng/grpc-web@0.15.0) '@mysten/sui.js': 0.32.2 '@sei-js/core': 1.5.0 - '@xlabs-xyz/wallet-monitor': 0.2.16(@types/node@22.7.4)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - bech32: 2.0.0 - bullmq: 3.15.8 - ethers: 5.7.2 - generic-pool: 3.9.0 - ioredis: 5.4.1 - koa: 2.15.3 - lru-cache: 9.1.2 - prom-client: 14.2.0 - winston: 3.13.1 - transitivePeerDependencies: - - '@bull-board/ui' - - '@improbable-eng/grpc-web' - - '@swc/core' - - '@swc/wasm' - - '@types/koa' - - '@types/node' - - '@types/react' - - arc-templates - - atpl - - babel-core - - bracket-template - - bufferutil - - coffee-script - - debug - - dot - - dust - - dustjs-helpers - - dustjs-linkedin - - eco - - ect - - encoding - - fastestsmallesttextencoderdecoder - - google-protobuf - - graphql-ws - - haml-coffee - - hamlet - - hamljs - - handlebars - - hogan.js - - htmling - - jade - - jazz - - jqtpl - - just - - liquid-node - - liquor - - lodash - - marko - - mote - - mustache - - nunjucks - - plates - - pug - - qejs - - ractive - - razor-tmpl - - react - - react-dom - - slm - - squirrelly - - subscriptions-transport-ws - - supports-color - - swig - - swig-templates - - teacup - - templayed - - then-jade - - then-pug - - tinyliquid - - toffee - - twig - - twing - - typescript - - underscore - - utf-8-validate - - vash - - velocityjs - - walrus - - whiskers - dev: false - - /@wormhole-foundation/relayer-engine@0.3.2(@bull-board/ui@5.23.0)(@improbable-eng/grpc-web@0.15.0)(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2): - resolution: {integrity: sha512-6CAGZdxDpPZph+Gx1Tob5wEarEzvD27G7khoGhB9sc8KiOhRz8zDiBspFfLetzfBEHMiTyvAOibETV5G0ULilA==} - dependencies: - '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0) - '@bull-board/koa': 5.23.0 - '@certusone/wormhole-sdk': 0.10.18(fastestsmallesttextencoderdecoder@1.0.22)(google-protobuf@3.21.4)(typescript@5.6.2) - '@certusone/wormhole-spydk': 0.0.1 - '@datastructures-js/queue': 4.2.3 - '@improbable-eng/grpc-web-node-http-transport': 0.15.0(@improbable-eng/grpc-web@0.15.0) - '@mysten/sui.js': 0.32.2 - '@sei-js/core': 1.5.0 '@xlabs-xyz/wallet-monitor': 0.2.16(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) bech32: 2.0.0 bullmq: 3.15.8 @@ -4713,7 +4520,7 @@ packages: koa: 2.15.3 lru-cache: 9.1.2 prom-client: 14.2.0 - winston: 3.14.2 + winston: 3.13.1 transitivePeerDependencies: - '@bull-board/ui' - '@improbable-eng/grpc-web' @@ -4784,7 +4591,6 @@ packages: - velocityjs - walrus - whiskers - dev: true /@wry/caches@1.0.1: resolution: {integrity: sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==} @@ -4827,37 +4633,6 @@ packages: optional: true /@xlabs-xyz/wallet-monitor@0.2.16(@types/node@20.16.10)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): - resolution: {integrity: sha512-Fup24DcONFy3o5lrJP3i5gc5XXj7675gWhco3JkweWTFj86c17UrXYQOhZF1Z09b7WYt4rnXZx+wQ4W19HzOoQ==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@mysten/sui.js': 0.32.2 - '@solana/spl-token': 0.3.11(@solana/web3.js@1.95.3)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - '@solana/web3.js': 1.95.3 - bluebird: 3.7.2 - bs58: 5.0.0 - ethers: 5.7.2 - google-protobuf: 3.21.4 - koa: 2.15.3 - koa-router: 12.0.1 - nice-grpc: 2.1.10 - prom-client: 14.2.0 - ts-node: 10.9.2(@types/node@20.16.10)(typescript@5.6.2) - ts-proto: 1.181.2 - winston: 3.14.2 - zod: 3.23.8 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - bufferutil - - encoding - - fastestsmallesttextencoderdecoder - - supports-color - - typescript - - utf-8-validate - dev: true - - /@xlabs-xyz/wallet-monitor@0.2.16(@types/node@22.7.4)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2): resolution: {integrity: sha512-Fup24DcONFy3o5lrJP3i5gc5XXj7675gWhco3JkweWTFj86c17UrXYQOhZF1Z09b7WYt4rnXZx+wQ4W19HzOoQ==} dependencies: '@ethersproject/bignumber': 5.7.0 @@ -4872,7 +4647,7 @@ packages: koa-router: 12.0.1 nice-grpc: 2.1.9 prom-client: 14.2.0 - ts-node: 10.9.2(@types/node@22.7.4)(typescript@5.6.2) + ts-node: 10.9.2(@types/node@20.16.10)(typescript@5.6.2) ts-proto: 1.181.0 winston: 3.13.1 zod: 3.23.8 @@ -4886,7 +4661,6 @@ packages: - supports-color - typescript - utf-8-validate - dev: false /@xpla/xpla.js@0.2.3: resolution: {integrity: sha512-Tfk7hCGWXtwr08reY3Pi6dmzIqFbzri9jcyzJdfNmdo4cN0PMwpRJuZZcPmtxiIUnNef3AN1E/6nJUD5MKniuA==} @@ -4948,6 +4722,7 @@ packages: engines: {node: '>=6.5'} dependencies: event-target-shim: 5.0.1 + dev: false /abortcontroller-polyfill@1.7.5: resolution: {integrity: sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==} @@ -5138,7 +4913,6 @@ packages: json-bigint: 1.0.0 tweetnacl: 1.0.3 vlq: 2.0.4 - dev: false /algosdk@2.9.0: resolution: {integrity: sha512-o0n0nLMbTX6SFQdMUk2/2sy50jmEmZk5OTPYSh2aAeP8DUPxrhjMPfwGsYNvaO+qk75MixC2eWpfA9vygCQ/Mg==} @@ -5543,10 +5317,6 @@ packages: /async@3.2.5: resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==} - /async@3.2.6: - resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==} - dev: true - /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} @@ -5576,12 +5346,20 @@ packages: resolution: {integrity: sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==} dev: true + /axios@0.21.4: + resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} + dependencies: + follow-redirects: 1.15.6(debug@4.3.7) + transitivePeerDependencies: + - debug + /axios@0.21.4(debug@4.3.5): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: follow-redirects: 1.15.6(debug@4.3.5) transitivePeerDependencies: - debug + dev: true /axios@0.24.0: resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==} @@ -6941,23 +6719,6 @@ packages: whatwg-mimetype: 4.0.0 dev: true - /chokidar@1.6.1: - resolution: {integrity: sha512-/6SIsjBGK5mzf1i1L8ccsH0jZuzWvMump0iJ6LD3jYxhwiLjvJ+5GrpJNxay9MGRvTAoYmzLU/z19wyxEjfv1w==} - dependencies: - anymatch: 1.3.2 - async-each: 1.0.6 - glob-parent: 2.0.0 - inherits: 2.0.4 - is-binary-path: 1.0.1 - is-glob: 2.0.1 - path-is-absolute: 1.0.1 - readdirp: 2.2.1 - optionalDependencies: - fsevents: 1.2.13 - transitivePeerDependencies: - - supports-color - dev: true - /chokidar@1.7.0: resolution: {integrity: sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==} deprecated: Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies. @@ -9588,6 +9349,7 @@ packages: /ethereumjs-wallet@0.6.5: resolution: {integrity: sha512-MDwjwB9VQVnpp/Dc1XzA6J1a3wgHQ4hSvA1uWNatdpOrtCbPVuQSKSyRnjLvS0a+KKMw2pvQ9Ybqpb3+eW8oNA==} + deprecated: 'New package name format for new versions: @ethereumjs/wallet. Please update.' requiresBuild: true dependencies: aes-js: 3.1.2 @@ -9705,6 +9467,7 @@ packages: /event-target-shim@5.0.1: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} engines: {node: '>=6'} + dev: false /eventemitter3@4.0.4: resolution: {integrity: sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==} @@ -10214,6 +9977,7 @@ packages: optional: true dependencies: debug: 4.3.5 + dev: true /follow-redirects@1.15.6(debug@4.3.7): resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} @@ -10225,7 +9989,6 @@ packages: optional: true dependencies: debug: 4.3.7(supports-color@8.1.1) - dev: true /follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} @@ -12147,7 +11910,6 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: false /jayson@4.1.2: resolution: {integrity: sha512-5nzMWDHy6f+koZOuYsArh2AXs73NfWYVlFyJJuCedr93GpY+Ku8qq10ropSXVfHK+H0T6paA88ww+/dV+1fBNA==} @@ -13792,21 +13554,12 @@ packages: dependencies: ts-error: 1.0.6 - /nice-grpc@2.1.10: - resolution: {integrity: sha512-Nujs/4wWJvE5OSxWPp3M5H+zHJAgsWMo38bMNfKQP1VDeCChp7MiKTkhJBV5JZvrBIkPhYQCLIbfvVqEoSuTuA==} - dependencies: - '@grpc/grpc-js': 1.11.3 - abort-controller-x: 0.4.3 - nice-grpc-common: 2.0.2 - dev: true - /nice-grpc@2.1.9: resolution: {integrity: sha512-shJlg1t4Wn3qTVE31gxofbTrgCX/p4tS1xRnk4bNskCYKvXNEUpJQZpjModsVk1aau69YZDViyC18K9nC7QHYA==} dependencies: '@grpc/grpc-js': 1.11.3 abort-controller-x: 0.4.3 nice-grpc-common: 2.0.2 - dev: false /nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} @@ -15267,17 +15020,6 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 - /readable-stream@4.5.2: - resolution: {integrity: sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - abort-controller: 3.0.0 - buffer: 6.0.3 - events: 3.3.0 - process: 0.11.10 - string_decoder: 1.3.0 - dev: true - /readdirp@2.2.1: resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==} engines: {node: '>=0.10'} @@ -15673,7 +15415,6 @@ packages: optionalDependencies: bufferutil: 4.0.8 utf-8-validate: 5.0.10 - dev: false /rpc-websockets@9.0.4: resolution: {integrity: sha512-yWZWN0M+bivtoNLnaDbtny4XchdAIF5Q4g/ZsC5UC61Ckbp0QczwO8fg44rV3uYmY4WHd+EZQbn90W1d8ojzqQ==} @@ -15756,11 +15497,6 @@ packages: resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==} engines: {node: '>=10'} - /safe-stable-stringify@2.5.0: - resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==} - engines: {node: '>=10'} - dev: true - /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} @@ -16481,7 +16217,7 @@ packages: hasBin: true dependencies: ajv: 5.5.2 - chokidar: 1.6.1 + chokidar: 1.7.0 colors: 1.4.0 commander: 2.20.3 diff: 3.5.0 @@ -17317,38 +17053,6 @@ packages: typescript: 5.6.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - dev: true - - /ts-node@10.9.2(@types/node@22.7.4)(typescript@5.6.2): - resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} - hasBin: true - peerDependencies: - '@swc/core': '>=1.2.50' - '@swc/wasm': '>=1.2.50' - '@types/node': '*' - typescript: '>=2.7' - peerDependenciesMeta: - '@swc/core': - optional: true - '@swc/wasm': - optional: true - dependencies: - '@cspotcode/source-map-support': 0.8.1 - '@tsconfig/node10': 1.0.11 - '@tsconfig/node12': 1.0.11 - '@tsconfig/node14': 1.0.3 - '@tsconfig/node16': 1.0.4 - '@types/node': 22.7.4 - acorn: 8.12.1 - acorn-walk: 8.3.3 - arg: 4.1.3 - create-require: 1.1.1 - diff: 4.0.2 - make-error: 1.3.6 - typescript: 5.6.2 - v8-compile-cache-lib: 3.0.1 - yn: 3.1.1 - dev: false /ts-node@8.10.2(typescript@5.6.2): resolution: {integrity: sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==} @@ -17400,17 +17104,6 @@ packages: protobufjs: 7.3.2 ts-poet: 6.9.0 ts-proto-descriptors: 1.16.0 - dev: false - - /ts-proto@1.181.2: - resolution: {integrity: sha512-knJ8dtjn2Pd0c5ZGZG8z9DMiD4PUY8iGI9T9tb8DvGdWRMkLpf0WcPO7G+7cmbZyxvNTAG6ci3fybEaFgMZIvg==} - hasBin: true - dependencies: - case-anything: 2.1.13 - protobufjs: 7.4.0 - ts-poet: 6.9.0 - ts-proto-descriptors: 1.16.0 - dev: true /tsconfig-paths@3.15.0: resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} @@ -19260,16 +18953,6 @@ packages: logform: 2.6.1 readable-stream: 3.6.2 triple-beam: 1.4.1 - dev: false - - /winston-transport@4.8.0: - resolution: {integrity: sha512-qxSTKswC6llEMZKgCQdaWgDuMJQnhuvF5f2Nk3SNXc4byfQ+voo2mX1Px9dkNOuR8p0KAjfPG29PuYUSIb+vSA==} - engines: {node: '>= 12.0.0'} - dependencies: - logform: 2.6.1 - readable-stream: 4.5.2 - triple-beam: 1.4.1 - dev: true /winston@3.13.1: resolution: {integrity: sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==} @@ -19286,24 +18969,6 @@ packages: stack-trace: 0.0.10 triple-beam: 1.4.1 winston-transport: 4.7.1 - dev: false - - /winston@3.14.2: - resolution: {integrity: sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==} - engines: {node: '>= 12.0.0'} - dependencies: - '@colors/colors': 1.6.0 - '@dabh/diagnostics': 2.0.3 - async: 3.2.6 - is-stream: 2.0.1 - logform: 2.6.1 - one-time: 1.0.0 - readable-stream: 3.6.2 - safe-stable-stringify: 2.5.0 - stack-trace: 0.0.10 - triple-beam: 1.4.1 - winston-transport: 4.8.0 - dev: true /word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} diff --git a/test/misc/chainid.js b/test/misc/chainid.js index d539e707ee..50d42954fe 100644 --- a/test/misc/chainid.js +++ b/test/misc/chainid.js @@ -34,9 +34,6 @@ const Token = artifacts.require("Token"); chai.use(bnChai(web3.utils.BN)); -const GOERLI = 5; -const FORKED_GOERLI = 2656695; - contract("Contract Storage", (accounts) => { const MINER1 = accounts[5]; const MINER2 = accounts[6]; @@ -74,9 +71,6 @@ contract("Contract Storage", (accounts) => { if (await isMainnet()) { const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address); expect(name).to.equal("meta.colony.joincolony.eth"); - } else if (chainId === GOERLI || chainId === FORKED_GOERLI) { - const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address); - expect(name).to.equal("meta.colony.joincolony.test"); } else if (await isXdai()) { const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address); expect(name).to.equal("meta.colony.joincolony.colonyxdai");