Skip to content

Commit

Permalink
fix: expected service to be a string with ip address and port (#1980)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shumkov
shumkov authored Jul 19, 2024
1 parent 811817a commit 2b4ccfa
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 43 deletions.
24 changes: 12 additions & 12 deletions .pnp.cjs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed .yarn/cache/@dashevo-dashcore-lib-npm-0.21.2-db85f9aff6-61e640fd3d.zip
View file
Binary file not shown.
Binary file added .yarn/cache/@dashevo-dashcore-lib-npm-0.21.3-8c8abba924-28e2731ac6.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/bench-suite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": ""
},
"dependencies": {
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/wallet-lib": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/dapi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"dependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dashd-rpc": "^19.0.0",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/dash-spv/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@dashevo/dark-gravity-wave": "^1.1.1",
"@dashevo/dash-util": "^2.0.3",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"levelup": "^4.4.0",
"memdown": "^5.1.0",
"wasm-x11-hash": "~0.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/configs/defaults/getLocalConfigFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function getLocalConfigFactory(getBaseConfig) {
},
core: {
docker: {
image: 'dashpay/dashd:21.0.0-devpr6115.db828177',
image: 'dashpay/dashd:21.0.0-rc.2',
commandArgs: [],
},
p2p: {
Expand Down
7 changes: 3 additions & 4 deletions packages/dashmate/configs/defaults/getTestnetConfigFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
},
core: {
docker: {
image: 'dashpay/dashd:21.0.0-devpr6115.db828177',
image: 'dashpay/dashd:21.0.0-rc.2',
commandArgs: [],
},
p2p: {
Expand Down Expand Up @@ -112,10 +112,9 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
port: 36660,
},
genesis: {
genesis_time: '2024-03-07T13:26:00.000Z',
chain_id: 'dash-testnet-39',
genesis_time: '2024-07-17T17:15:00.000Z',
chain_id: 'dash-testnet-47',
validator_quorum_type: 6,
initial_core_chain_locked_height: 984306,
},
},
},
Expand Down
16 changes: 12 additions & 4 deletions packages/dashmate/configs/getConfigFileMigrationsFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)

if (name !== base.getName()) {
options.platform.drive.tenderdash.genesis.chain_id = testnet.get('platform.drive.tenderdash.genesis.chain_id');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = testnet.get('platform.drive.tenderdash.genesis.initial_core_chain_locked_height');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = 14000;
options.platform.drive.tenderdash.genesis.genesis_time = testnet.get('platform.drive.tenderdash.genesis.genesis_time');
}
}
Expand All @@ -360,7 +360,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)

if (options.network === NETWORK_TESTNET && name !== base.getName()) {
options.platform.drive.tenderdash.genesis.chain_id = testnet.get('platform.drive.tenderdash.genesis.chain_id');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = testnet.get('platform.drive.tenderdash.genesis.initial_core_chain_locked_height');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = 1400;
options.platform.drive.tenderdash.genesis.genesis_time = testnet.get('platform.drive.tenderdash.genesis.genesis_time');
}
});
Expand All @@ -372,7 +372,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
.forEach(([name, options]) => {
if (options.network === NETWORK_TESTNET && name !== base.getName()) {
options.platform.drive.tenderdash.genesis.chain_id = testnet.get('platform.drive.tenderdash.genesis.chain_id');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = testnet.get('platform.drive.tenderdash.genesis.initial_core_chain_locked_height');
options.platform.drive.tenderdash.genesis.initial_core_chain_locked_height = 1400;
options.platform.drive.tenderdash.genesis.genesis_time = testnet.get('platform.drive.tenderdash.genesis.genesis_time');
}
});
Expand Down Expand Up @@ -690,8 +690,16 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
},
'1.0.0-beta.4': (configFile) => {
Object.entries(configFile.configs)
.forEach(([, options]) => {
.forEach(([name, options]) => {
// Update Core image
options.core.docker.image = getDefaultConfigByNameOrGroup(name, options.group)
.get('core.docker.image');

options.core.devnet.llmq = base.get('core.devnet.llmq');

if (options.network === NETWORK_TESTNET) {
options.platform.drive.tenderdash.genesis = testnet.get('platform.drive.tenderdash.genesis');
}
});
return configFile;
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dashd-rpc": "^19.0.0",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/docker-compose": "^0.24.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dapi-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dash-spv": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
"bs58": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dash-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/grpc-common": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-test-suite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"homepage": "https://github.com/dashevo/platform-test-suite#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/feature-flags-contract": "workspace:*",
"@dashevo/grpc-common": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet-lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"homepage": "https://github.com/dashevo/wallet-lib#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
"@yarnpkg/pnpify": "^4.0.0-rc.42",
Expand Down
2 changes: 1 addition & 1 deletion packages/wasm-dpp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@babel/cli": "^7.23.0",
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@dashevo/dashcore-lib": "~0.21.2",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dpns-contract": "workspace:*",
"@types/bs58": "^4.0.1",
"@types/node": "^14.6.0",
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@dashevo/bench-suite@workspace:packages/bench-suite"
dependencies:
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/wallet-lib": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
Expand Down Expand Up @@ -1469,7 +1469,7 @@ __metadata:
"@babel/core": "npm:^7.23.3"
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dash-spv": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/grpc-common": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
assert-browserify: "npm:^2.0.0"
Expand Down Expand Up @@ -1551,7 +1551,7 @@ __metadata:
"@dashevo/bls": "npm:~1.2.9"
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dashd-rpc": "npm:^19.0.0"
"@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
"@dashevo/grpc-common": "workspace:*"
Expand Down Expand Up @@ -1600,7 +1600,7 @@ __metadata:
dependencies:
"@dashevo/dark-gravity-wave": "npm:^1.1.1"
"@dashevo/dash-util": "npm:^2.0.3"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
chai: "npm:^4.3.10"
eslint: "npm:^8.53.0"
eslint-config-airbnb-base: "npm:^15.0.0"
Expand All @@ -1624,9 +1624,9 @@ __metadata:
languageName: node
linkType: hard

"@dashevo/dashcore-lib@npm:~0.21.2":
version: 0.21.2
resolution: "@dashevo/dashcore-lib@npm:0.21.2"
"@dashevo/dashcore-lib@npm:~0.21.3":
version: 0.21.3
resolution: "@dashevo/dashcore-lib@npm:0.21.3"
dependencies:
"@dashevo/bls": "npm:~1.2.9"
"@dashevo/x11-hash-js": "npm:^1.0.2"
Expand All @@ -1640,7 +1640,7 @@ __metadata:
ripemd160: "npm:^2.0.2"
tsd: "npm:^0.28.1"
unorm: "npm:^1.6.0"
checksum: 61e640fd3df3a958b2c4aaa23b9b2ecd8785f9e63a6b343bab2de52433a0a47c3a3ab319404f76f8c7c053ed0e3d7de3a266cfb3be0c9ccc281df42dddbc9b5a
checksum: 28e2731ac66c34a7b5e160d270b810456dce3a3e1b5227649845aca510f38f441574d154ed8f0a79b26724124f311a87c8f57d53bfb5fd816223e571484fcc2a
languageName: node
linkType: hard

Expand Down Expand Up @@ -1780,7 +1780,7 @@ __metadata:
resolution: "@dashevo/platform-test-suite@workspace:packages/platform-test-suite"
dependencies:
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/feature-flags-contract": "workspace:*"
"@dashevo/grpc-common": "workspace:*"
Expand Down Expand Up @@ -1884,7 +1884,7 @@ __metadata:
dependencies:
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dash-spv": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/grpc-common": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
"@yarnpkg/pnpify": "npm:^4.0.0-rc.42"
Expand Down Expand Up @@ -1944,7 +1944,7 @@ __metadata:
"@babel/core": "npm:^7.23.3"
"@babel/preset-env": "npm:^7.23.3"
"@dashevo/bls": "npm:~1.2.9"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dpns-contract": "workspace:*"
"@types/bs58": "npm:^4.0.1"
"@types/node": "npm:^14.6.0"
Expand Down Expand Up @@ -6241,7 +6241,7 @@ __metadata:
"@dashevo/bls": "npm:~1.2.9"
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/grpc-common": "workspace:*"
Expand Down Expand Up @@ -6318,7 +6318,7 @@ __metadata:
"@babel/eslint-parser": "npm:^7.23.3"
"@dashevo/bls": "npm:~1.2.9"
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dashcore-lib": "npm:~0.21.2"
"@dashevo/dashcore-lib": "npm:~0.21.3"
"@dashevo/dashd-rpc": "npm:^19.0.0"
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/docker-compose": "npm:^0.24.4"
Expand Down

0 comments on commit 2b4ccfa

Please sign in to comment.