diff --git a/.idea/dictionaries/fuxing.xml b/.idea/dictionaries/fuxing.xml index 1f9632bef..c3f7e97e4 100644 --- a/.idea/dictionaries/fuxing.xml +++ b/.idea/dictionaries/fuxing.xml @@ -2,7 +2,6 @@ accounttoaccount - transferdomain accounttoutxos acindex addpoolliquidity @@ -282,6 +281,7 @@ timelock toaltstack tradeable + transferdomain tsla txcount txid diff --git a/apps/package.json b/apps/package.json index 2c94f1ed6..5b6b43534 100644 --- a/apps/package.json +++ b/apps/package.json @@ -78,7 +78,7 @@ "@types/validator": "13.7.13", "source-map-support": "0.5.21", "supertest": "6.3.3", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "ts-loader": "9.4.2", "ts-node": "10.9.1", "tsconfig-paths": "4.1.0" diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml index 352b03aaa..62c57e7a7 100644 --- a/apps/whale-api/docker-compose.yml +++ b/apps/whale-api/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: defi-blockchain: - image: defi/defichain:3.2.8 + image: defi/defichain:master-b6fc51097 ports: - "19554:19554" command: > diff --git a/package-lock.json b/package-lock.json index 4aca9089e..5adcda5a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "@types/validator": "13.7.13", "source-map-support": "0.5.21", "supertest": "6.3.3", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "ts-loader": "9.4.2", "ts-node": "10.9.1", "tsconfig-paths": "4.1.0" @@ -6804,10 +6804,11 @@ "license": "MIT" }, "node_modules/@types/archiver": { - "version": "5.3.1", - "license": "MIT", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-IctHreBuWE5dvBDz/0WeKtyVKVRs4h75IblxOACL92wU66v+HGAfEYAOyXkOFphvRJMhuXdI9huDXpX0FC6lCw==", "dependencies": { - "@types/glob": "*" + "@types/readdir-glob": "*" } }, "node_modules/@types/babel__core": { @@ -6958,6 +6959,7 @@ "version": "3.3.16", "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.16.tgz", "integrity": "sha512-ZAX2VrkTjwjk1808T8m6vMr+CFXSLiDD+tkEkLThI+v83AfzlYQZEWfZKwFyk1PWopSXkdDunmIhrF7sxt+zWg==", + "dev": true, "dependencies": { "@types/docker-modem": "*", "@types/node": "*" @@ -7013,14 +7015,6 @@ "@types/range-parser": "*" } }, - "node_modules/@types/glob": { - "version": "7.2.0", - "license": "MIT", - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, "node_modules/@types/graceful-fs": { "version": "4.1.5", "dev": true, @@ -7158,6 +7152,7 @@ }, "node_modules/@types/minimatch": { "version": "3.0.5", + "dev": true, "license": "MIT" }, "node_modules/@types/minimist": { @@ -7258,6 +7253,14 @@ "@types/react-router": "*" } }, + "node_modules/@types/readdir-glob": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.1.tgz", + "integrity": "sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", @@ -11418,16 +11421,24 @@ } }, "node_modules/docker-compose": { - "version": "0.23.19", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.23.19.tgz", - "integrity": "sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.1.tgz", + "integrity": "sha512-CVphzCi0Hmw/0CHlAzgiwhLsJjFRqnvpBYMYbf63bz6MON69ElgrfrgQTmgPtEjbifjgaptu3+Gea62vI+9jiA==", "dependencies": { - "yaml": "^1.10.2" + "yaml": "^2.2.2" }, "engines": { "node": ">= 6.0.0" } }, + "node_modules/docker-compose/node_modules/yaml": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", + "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "engines": { + "node": ">= 14" + } + }, "node_modules/docker-modem": { "version": "3.0.3", "license": "Apache-2.0", @@ -23674,33 +23685,43 @@ } }, "node_modules/testcontainers": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.1.3.tgz", - "integrity": "sha512-Kw7GZC8nD84Uuq2oxa2Ln9F5vIALWIZoQHywOGuiiVthSHzOVl4CtebO25whMf3CrVICwy8CBUimvSdVgU9N7g==", + "version": "9.9.1", + "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.9.1.tgz", + "integrity": "sha512-44iDiyK0JzK5FbqdrKjmE/8QSZhvCFxh0d/OfG+R9fkznU5KVCYeeUsPULkVRIi210X4FAitSXra1ZU591Zlqw==", "dependencies": { "@balena/dockerignore": "^1.0.2", - "@types/archiver": "^5.3.1", - "@types/dockerode": "^3.3.14", + "@types/archiver": "^5.3.2", + "@types/dockerode": "^3.3.19", "archiver": "^5.3.1", "async-lock": "^1.4.0", "byline": "^5.0.0", "debug": "^4.3.4", - "docker-compose": "^0.23.19", - "dockerode": "^3.3.4", + "docker-compose": "^0.24.1", + "dockerode": "^3.3.5", "get-port": "^5.1.1", - "node-fetch": "^2.6.9", + "node-fetch": "^2.6.11", "properties-reader": "^2.2.0", "ssh-remote-port-forward": "^1.0.4", - "tar-fs": "^2.1.1" + "tar-fs": "^2.1.1", + "tmp": "^0.2.1" }, "engines": { "node": ">= 10.16" } }, + "node_modules/testcontainers/node_modules/@types/dockerode": { + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.19.tgz", + "integrity": "sha512-7CC5yIpQi+bHXwDK43b/deYXteP3Lem9gdocVVHJPSRJJLMfbiOchQV3rDmAPkMw+n3GIVj7m1six3JW+VcwwA==", + "dependencies": { + "@types/docker-modem": "*", + "@types/node": "*" + } + }, "node_modules/testcontainers/node_modules/node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", + "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -23716,6 +23737,17 @@ } } }, + "node_modules/testcontainers/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, "node_modules/testcontainers/node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -26228,7 +26260,7 @@ "cross-fetch": "^3.1.5", "dockerode": "^3.3.5", "tar-fs": "^2.1.1", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "uuid": "^9.0.0" }, "devDependencies": { @@ -27933,7 +27965,7 @@ "source-map-support": "0.5.21", "subleveldown": "^6.0.1", "supertest": "6.3.3", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "ts-loader": "9.4.2", "ts-node": "10.9.1", "tsconfig-paths": "4.1.0" @@ -28199,7 +28231,7 @@ "cross-fetch": "^3.1.5", "dockerode": "^3.3.5", "tar-fs": "^2.1.1", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "uuid": "^9.0.0" }, "dependencies": { @@ -31403,9 +31435,11 @@ "dev": true }, "@types/archiver": { - "version": "5.3.1", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-IctHreBuWE5dvBDz/0WeKtyVKVRs4h75IblxOACL92wU66v+HGAfEYAOyXkOFphvRJMhuXdI9huDXpX0FC6lCw==", "requires": { - "@types/glob": "*" + "@types/readdir-glob": "*" } }, "@types/babel__core": { @@ -31547,6 +31581,7 @@ "version": "3.3.16", "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.16.tgz", "integrity": "sha512-ZAX2VrkTjwjk1808T8m6vMr+CFXSLiDD+tkEkLThI+v83AfzlYQZEWfZKwFyk1PWopSXkdDunmIhrF7sxt+zWg==", + "dev": true, "requires": { "@types/docker-modem": "*", "@types/node": "*" @@ -31598,13 +31633,6 @@ "@types/range-parser": "*" } }, - "@types/glob": { - "version": "7.2.0", - "requires": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, "@types/graceful-fs": { "version": "4.1.5", "dev": true, @@ -31729,7 +31757,8 @@ "version": "1.3.2" }, "@types/minimatch": { - "version": "3.0.5" + "version": "3.0.5", + "dev": true }, "@types/minimist": { "version": "1.2.2", @@ -31822,6 +31851,14 @@ "@types/react-router": "*" } }, + "@types/readdir-glob": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.1.tgz", + "integrity": "sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==", + "requires": { + "@types/node": "*" + } + }, "@types/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", @@ -36213,7 +36250,7 @@ "source-map-support": "0.5.21", "subleveldown": "^6.0.1", "supertest": "6.3.3", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "ts-loader": "9.4.2", "ts-node": "10.9.1", "tsconfig-paths": "4.1.0" @@ -36479,7 +36516,7 @@ "cross-fetch": "^3.1.5", "dockerode": "^3.3.5", "tar-fs": "^2.1.1", - "testcontainers": "^9.1.3", + "testcontainers": "^9.9.0", "uuid": "^9.0.0" }, "dependencies": { @@ -39683,9 +39720,11 @@ "dev": true }, "@types/archiver": { - "version": "5.3.1", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-IctHreBuWE5dvBDz/0WeKtyVKVRs4h75IblxOACL92wU66v+HGAfEYAOyXkOFphvRJMhuXdI9huDXpX0FC6lCw==", "requires": { - "@types/glob": "*" + "@types/readdir-glob": "*" } }, "@types/babel__core": { @@ -39827,6 +39866,7 @@ "version": "3.3.16", "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.16.tgz", "integrity": "sha512-ZAX2VrkTjwjk1808T8m6vMr+CFXSLiDD+tkEkLThI+v83AfzlYQZEWfZKwFyk1PWopSXkdDunmIhrF7sxt+zWg==", + "dev": true, "requires": { "@types/docker-modem": "*", "@types/node": "*" @@ -39878,13 +39918,6 @@ "@types/range-parser": "*" } }, - "@types/glob": { - "version": "7.2.0", - "requires": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, "@types/graceful-fs": { "version": "4.1.5", "dev": true, @@ -40009,7 +40042,8 @@ "version": "1.3.2" }, "@types/minimatch": { - "version": "3.0.5" + "version": "3.0.5", + "dev": true }, "@types/minimist": { "version": "1.2.2", @@ -40102,6 +40136,14 @@ "@types/react-router": "*" } }, + "@types/readdir-glob": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.1.tgz", + "integrity": "sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==", + "requires": { + "@types/node": "*" + } + }, "@types/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", @@ -42978,11 +43020,18 @@ } }, "docker-compose": { - "version": "0.23.19", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.23.19.tgz", - "integrity": "sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.1.tgz", + "integrity": "sha512-CVphzCi0Hmw/0CHlAzgiwhLsJjFRqnvpBYMYbf63bz6MON69ElgrfrgQTmgPtEjbifjgaptu3+Gea62vI+9jiA==", "requires": { - "yaml": "^1.10.2" + "yaml": "^2.2.2" + }, + "dependencies": { + "yaml": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", + "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==" + } } }, "docker-modem": { @@ -51441,34 +51490,52 @@ } }, "testcontainers": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.1.3.tgz", - "integrity": "sha512-Kw7GZC8nD84Uuq2oxa2Ln9F5vIALWIZoQHywOGuiiVthSHzOVl4CtebO25whMf3CrVICwy8CBUimvSdVgU9N7g==", + "version": "9.9.1", + "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.9.1.tgz", + "integrity": "sha512-44iDiyK0JzK5FbqdrKjmE/8QSZhvCFxh0d/OfG+R9fkznU5KVCYeeUsPULkVRIi210X4FAitSXra1ZU591Zlqw==", "requires": { "@balena/dockerignore": "^1.0.2", - "@types/archiver": "^5.3.1", - "@types/dockerode": "^3.3.14", + "@types/archiver": "^5.3.2", + "@types/dockerode": "^3.3.19", "archiver": "^5.3.1", "async-lock": "^1.4.0", "byline": "^5.0.0", "debug": "^4.3.4", - "docker-compose": "^0.23.19", - "dockerode": "^3.3.4", + "docker-compose": "^0.24.1", + "dockerode": "^3.3.5", "get-port": "^5.1.1", - "node-fetch": "^2.6.9", + "node-fetch": "^2.6.11", "properties-reader": "^2.2.0", "ssh-remote-port-forward": "^1.0.4", - "tar-fs": "^2.1.1" + "tar-fs": "^2.1.1", + "tmp": "^0.2.1" }, "dependencies": { + "@types/dockerode": { + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.19.tgz", + "integrity": "sha512-7CC5yIpQi+bHXwDK43b/deYXteP3Lem9gdocVVHJPSRJJLMfbiOchQV3rDmAPkMw+n3GIVj7m1six3JW+VcwwA==", + "requires": { + "@types/docker-modem": "*", + "@types/node": "*" + } + }, "node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", + "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", "requires": { "whatwg-url": "^5.0.0" } }, + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "requires": { + "rimraf": "^3.0.0" + } + }, "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -53044,11 +53111,18 @@ } }, "docker-compose": { - "version": "0.23.19", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.23.19.tgz", - "integrity": "sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.1.tgz", + "integrity": "sha512-CVphzCi0Hmw/0CHlAzgiwhLsJjFRqnvpBYMYbf63bz6MON69ElgrfrgQTmgPtEjbifjgaptu3+Gea62vI+9jiA==", "requires": { - "yaml": "^1.10.2" + "yaml": "^2.2.2" + }, + "dependencies": { + "yaml": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", + "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==" + } } }, "docker-modem": { @@ -61507,34 +61581,52 @@ } }, "testcontainers": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.1.3.tgz", - "integrity": "sha512-Kw7GZC8nD84Uuq2oxa2Ln9F5vIALWIZoQHywOGuiiVthSHzOVl4CtebO25whMf3CrVICwy8CBUimvSdVgU9N7g==", + "version": "9.9.1", + "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-9.9.1.tgz", + "integrity": "sha512-44iDiyK0JzK5FbqdrKjmE/8QSZhvCFxh0d/OfG+R9fkznU5KVCYeeUsPULkVRIi210X4FAitSXra1ZU591Zlqw==", "requires": { "@balena/dockerignore": "^1.0.2", - "@types/archiver": "^5.3.1", - "@types/dockerode": "^3.3.14", + "@types/archiver": "^5.3.2", + "@types/dockerode": "^3.3.19", "archiver": "^5.3.1", "async-lock": "^1.4.0", "byline": "^5.0.0", "debug": "^4.3.4", - "docker-compose": "^0.23.19", - "dockerode": "^3.3.4", + "docker-compose": "^0.24.1", + "dockerode": "^3.3.5", "get-port": "^5.1.1", - "node-fetch": "^2.6.9", + "node-fetch": "^2.6.11", "properties-reader": "^2.2.0", "ssh-remote-port-forward": "^1.0.4", - "tar-fs": "^2.1.1" + "tar-fs": "^2.1.1", + "tmp": "^0.2.1" }, "dependencies": { + "@types/dockerode": { + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.19.tgz", + "integrity": "sha512-7CC5yIpQi+bHXwDK43b/deYXteP3Lem9gdocVVHJPSRJJLMfbiOchQV3rDmAPkMw+n3GIVj7m1six3JW+VcwwA==", + "requires": { + "@types/docker-modem": "*", + "@types/node": "*" + } + }, "node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", + "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", "requires": { "whatwg-url": "^5.0.0" } }, + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "requires": { + "rimraf": "^3.0.0" + } + }, "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", diff --git a/packages/testcontainers/package.json b/packages/testcontainers/package.json index 3d60a4e0a..2ccdc4a32 100644 --- a/packages/testcontainers/package.json +++ b/packages/testcontainers/package.json @@ -19,7 +19,7 @@ "dockerode": "^3.3.5", "tar-fs": "^2.1.1", "uuid": "^9.0.0", - "testcontainers": "^9.1.3" + "testcontainers": "^9.9.0" }, "peerDependencies": { "@types/tar-fs": "^2.0.1", diff --git a/packages/testcontainers/src/containers/AppContainer/PlaygroundApiContainer.ts b/packages/testcontainers/src/containers/AppContainer/PlaygroundApiContainer.ts index 43cd320f9..b60e69c73 100644 --- a/packages/testcontainers/src/containers/AppContainer/PlaygroundApiContainer.ts +++ b/packages/testcontainers/src/containers/AppContainer/PlaygroundApiContainer.ts @@ -1,5 +1,4 @@ -import { GenericContainer, StartedNetwork } from 'testcontainers' -import { AbstractStartedContainer } from 'testcontainers/dist/modules/abstract-started-container' +import { GenericContainer, StartedNetwork, AbstractStartedContainer } from 'testcontainers' import { waitForCondition } from '../../utils' import { StartedNativeChainContainer } from '../NativeChainContainer' import fetch from 'cross-fetch' diff --git a/packages/testcontainers/src/containers/AppContainer/WhaleApiContainer.ts b/packages/testcontainers/src/containers/AppContainer/WhaleApiContainer.ts index 207930009..460d346a7 100644 --- a/packages/testcontainers/src/containers/AppContainer/WhaleApiContainer.ts +++ b/packages/testcontainers/src/containers/AppContainer/WhaleApiContainer.ts @@ -1,5 +1,4 @@ -import { GenericContainer, StartedNetwork } from 'testcontainers' -import { AbstractStartedContainer } from 'testcontainers/dist/modules/abstract-started-container' +import { GenericContainer, StartedNetwork, AbstractStartedContainer } from 'testcontainers' import { waitForCondition } from '../../utils' import { StartedNativeChainContainer } from '../NativeChainContainer' import fetch from 'cross-fetch' diff --git a/packages/testcontainers/src/containers/NativeChainContainer.ts b/packages/testcontainers/src/containers/NativeChainContainer.ts index 3b320d79f..80c025a91 100644 --- a/packages/testcontainers/src/containers/NativeChainContainer.ts +++ b/packages/testcontainers/src/containers/NativeChainContainer.ts @@ -1,5 +1,4 @@ -import { GenericContainer, StartedTestContainer } from 'testcontainers' -import { AbstractStartedContainer } from 'testcontainers/dist/modules/abstract-started-container' +import { GenericContainer, StartedTestContainer, AbstractStartedContainer } from 'testcontainers' import { getNetwork, MasterNodeKey, @@ -7,10 +6,10 @@ import { NetworkName, RegTestFoundationKeys } from '@defichain/jellyfish-network' -import { RestartOptions } from 'testcontainers/dist/test-container' +import { RestartOptions } from 'testcontainers/dist/src/test-container' import { NativeChainRpc } from './NativeChainRpc' import { NativeChainWaitFor } from './NativeChainWaitFor' -import { ExecResult } from 'testcontainers/dist/docker/types' +import { ExecResult } from 'testcontainers/dist/src/docker/types' /** * DeFiChain NativeChain node managed in docker @@ -23,14 +22,14 @@ export class NativeChainContainer extends GenericContainer { image: string = NativeChainContainer.image ) { super(image) - this.name = this.generateName() + this.opts.name = this.generateName() } static get image (): string { if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) { return process.env.DEFICHAIN_DOCKER_IMAGE } - return 'defi/defichain:3.2.8' // renovate.json regexManagers + return 'defi/defichain:master-b6fc51097' // renovate.json regexManagers } public static readonly PREFIX = 'defichain-testcontainers-' @@ -168,8 +167,8 @@ export class NativeChainContainer extends GenericContainer { * Create container and start it immediately waiting for NativeChain to be ready */ public async start (): Promise { - this.withExposedPorts(...(this.hasExposedPorts ? this.ports : Object.values(this.blockchainNetwork.ports))) - .withCommand(this.command.length > 0 ? this.command.concat(this.addedCmds) : this.generateCmd()) + this.withExposedPorts(...(this.hasExposedPorts ? this.opts.exposedPorts : Object.values(this.blockchainNetwork.ports))) + .withCommand(this.opts.command.length > 0 ? this.opts.command.concat(this.addedCmds) : this.generateCmd()) const config = { rpcUser: this.rpcUser,