Skip to content

Commit ce3b258

Browse files
rflechtnerrflechtner
authored
Merge branch 'develop' into rf-refactor-ctype-fetching
2 parents a0455f1 + 63ab8c7 commit ce3b258

File tree

16 files changed

+49
-47
lines changed

16 files changed

+49
-47
lines changed

‎dc.build.node.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ version: '3.2'
22

33
services:
44
dev-node:
5-
image: local/mashnet-node
5+
image: local/standalone-node
66
build:
7-
context: https://github.com/KILTprotocol/mashnet-node.git
7+
context: https://github.com/KILTprotocol/kilt-node.git
88
cache_from:
9-
- kiltprotocol/mashnet-node
10-
- local/mashnet-node
9+
- kiltprotocol/standalone-node
10+
- local/standalone-node

‎docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# allows running tests and integration tests in a dockerized environment
22
# `docker-compose run sdk` will run integration tests using the latest
3-
# mashnet-node image on dockerhub. The src/ directory is mounted, so rebuilding
3+
# standalone-node image on dockerhub. The src/ directory is mounted, so rebuilding
44
# is not required to integrate changes in this directory.
55
# `docker-compose run sdk yarn test:integration:run Attestation` would run specific tests.
6-
# In order to test against the current state of the develop branch, you can build a mashnet-node
6+
# In order to test against the current state of the develop branch, you can build a standalone-node
77
# image locally by telling docker-compose to use the override file `dc.build.node.yml` like so:
88
# `docker-compose -f docker-compose.yml -f dc.build.node.yml run sdk`. Alternatively you could
99
# rename `dc.build.node.yml` to `docker-compose.override.yml`, in which case docker-compose
@@ -13,7 +13,7 @@ version: '3.2'
1313

1414
services:
1515
dev-node:
16-
image: kiltprotocol/mashnet-node:develop
16+
image: kiltprotocol/standalone-node:develop
1717
command: '--dev --ws-port 9944 --ws-external'
1818

1919
sdk:

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"test:integration": "jest -c tests/integration/jest.config.integration.js",
2727
"build:esm-tests": "rimraf tests/integration/dist && tsc -p tests/integration/tsconfig.esm.json && echo '{\"type\":\"module\"}' > tests/integration/dist/package.json",
2828
"test:integration:esm": "yarn build:esm-tests && yarn node --experimental-vm-modules $(yarn bin jest) -c tests/integration/jest.config.integration.esm.js",
29-
"test:integration:latest-develop": "TESTCONTAINERS_NODE_IMG=kiltprotocol/mashnet-node:latest-develop yarn test:integration",
29+
"test:integration:latest-develop": "TESTCONTAINERS_NODE_IMG=kiltprotocol/standalone-node:latest-develop yarn test:integration",
3030
"test:watch": "yarn test --watch",
3131
"test:bundle": "tsc -p tests/bundle/tsconfig.json && yarn ./tests/bundle playwright test --config playwright.config.ts",
3232
"test:ci:bundle": "yarn test:ci:bundle:preparation && yarn test:bundle",

‎packages/asset-credentials/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"@kiltprotocol/did": "workspace:*",
4242
"@kiltprotocol/types": "workspace:*",
4343
"@kiltprotocol/utils": "workspace:*",
44-
"@polkadot/api": "^10.4.0",
45-
"@polkadot/types": "^10.4.0",
44+
"@polkadot/api": "^10.7.3",
45+
"@polkadot/types": "^10.7.3",
4646
"@polkadot/util": "^12.0.0",
4747
"@polkadot/util-crypto": "^12.0.0"
4848
}

‎packages/augment-api/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"bugs": "https://github.com/KILTprotocol/sdk-js/issues",
4141
"homepage": "https://github.com/KILTprotocol/sdk-js#readme",
4242
"devDependencies": {
43-
"@polkadot/api": "^10.4.0",
44-
"@polkadot/typegen": "^10.4.0",
43+
"@polkadot/api": "^10.7.3",
44+
"@polkadot/typegen": "^10.7.3",
4545
"@types/node": "^16.11.7",
4646
"glob": "^7.1.1",
4747
"rimraf": "^3.0.2",

‎packages/chain-helpers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"@kiltprotocol/type-definitions": "workspace:*",
4040
"@kiltprotocol/types": "workspace:*",
4141
"@kiltprotocol/utils": "workspace:*",
42-
"@polkadot/api": "^10.4.0",
42+
"@polkadot/api": "^10.7.3",
4343
"@polkadot/api-derive": "^10.0.0",
44-
"@polkadot/types": "^10.4.0",
44+
"@polkadot/types": "^10.7.3",
4545
"@polkadot/util": "^12.0.0",
4646
"@polkadot/util-crypto": "^12.0.0"
4747
}

‎packages/config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@kiltprotocol/types": "workspace:*",
40-
"@polkadot/api": "^10.4.0",
40+
"@polkadot/api": "^10.7.3",
4141
"typescript-logging": "^1.0.0"
4242
}
4343
}

‎packages/credentials/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"@kiltprotocol/sr25519-jcs-2023": "0.1.0-rc.1",
4646
"@kiltprotocol/types": "workspace:*",
4747
"@kiltprotocol/utils": "workspace:*",
48-
"@polkadot/api": "^10.4.0",
48+
"@polkadot/api": "^10.7.3",
4949
"@polkadot/keyring": "^12.0.0",
50-
"@polkadot/types": "^10.4.0",
50+
"@polkadot/types": "^10.7.3",
5151
"@polkadot/util": "^12.0.0",
5252
"@polkadot/util-crypto": "^12.0.0",
5353
"json-pointer": "^0.6.2"

‎packages/did/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"@kiltprotocol/config": "workspace:*",
4141
"@kiltprotocol/types": "workspace:*",
4242
"@kiltprotocol/utils": "workspace:*",
43-
"@polkadot/api": "^10.4.0",
43+
"@polkadot/api": "^10.7.3",
4444
"@polkadot/keyring": "^12.0.0",
45-
"@polkadot/types": "^10.4.0",
45+
"@polkadot/types": "^10.7.3",
4646
"@polkadot/util": "^12.0.0",
4747
"@polkadot/util-crypto": "^12.0.0",
4848
"multibase": "^4.0.6"

‎packages/did/src/DidDetails/FullDidDetails.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { parse } from '../Did.utils.js'
3131
import { resolve } from '../DidResolver/DidResolver.js'
3232

3333
// Must be in sync with what's implemented in impl did::DeriveDidCallAuthorizationVerificationKeyRelationship for Call
34-
// in https://github.com/KILTprotocol/mashnet-node/blob/develop/runtimes/spiritnet/src/lib.rs
34+
// in https://github.com/KILTprotocol/kilt-node/blob/develop/runtimes/spiritnet/src/lib.rs
3535
// TODO: Should have an RPC or something similar to avoid inconsistencies in the future.
3636
const methodMapping: Record<
3737
string,

‎packages/types/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"bugs": "https://github.com/KILTprotocol/sdk-js/issues",
3131
"homepage": "https://github.com/KILTprotocol/sdk-js#readme",
3232
"dependencies": {
33-
"@polkadot/api": "^10.4.0",
33+
"@polkadot/api": "^10.7.3",
3434
"@polkadot/keyring": "^12.0.0",
35-
"@polkadot/types": "^10.4.0",
35+
"@polkadot/types": "^10.7.3",
3636
"@polkadot/util": "^12.0.0",
3737
"@polkadot/util-crypto": "^12.0.0"
3838
},

‎packages/utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@kiltprotocol/es256k-jcs-2023": "0.1.0-rc.1",
4040
"@kiltprotocol/sr25519-jcs-2023": "0.1.0-rc.1",
4141
"@kiltprotocol/types": "workspace:*",
42-
"@polkadot/api": "^10.4.0",
42+
"@polkadot/api": "^10.7.3",
4343
"@polkadot/keyring": "^12.0.0",
4444
"@polkadot/util": "^12.0.0",
4545
"@polkadot/util-crypto": "^12.0.0",

‎tests/integration/Delegation.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ describe('revocation', () => {
285285

286286
// Delegation removal can only be done by either the delegation owner themselves via DID call
287287
// or the deposit owner as a regular signed call.
288-
// Change introduced in https://github.com/KILTprotocol/mashnet-node/pull/304
288+
// Change introduced in https://github.com/KILTprotocol/kilt-node/pull/304
289289
const removeTx = await delegationA.getRemoveTx()
290290
const authorizedRemoveTx = await Did.authorizeTx(
291291
delegator.id,

‎tests/integration/Did.spec.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1413,31 +1413,33 @@ describe('Runtime constraints', () => {
14131413
)
14141414
}, 30_000)
14151415

1416-
it('should not be possible to create a DID with a service that is too long', async () => {
1416+
// TODO: these tests do not actually test anything; they just make an assertion about the value of a runtime const.
1417+
// This does not really make sense; and even if we wanted it, it would be better to just make a snapshot on the value.
1418+
it.skip('should not be possible to create a DID with a service that is too long', async () => {
14171419
const serviceId = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
14181420
const limit = api.consts.did.maxServiceIdLength.toNumber()
14191421
expect(serviceId.length).toBeGreaterThan(limit)
14201422
})
14211423

1422-
it('should not be possible to create a DID with a service that has too many types', async () => {
1424+
it.skip('should not be possible to create a DID with a service that has too many types', async () => {
14231425
const types = ['type-1', 'type-2']
14241426
const limit = api.consts.did.maxNumberOfTypesPerService.toNumber()
14251427
expect(types.length).toBeGreaterThan(limit)
14261428
})
14271429

1428-
it('should not be possible to create a DID with a service that has too many URIs', async () => {
1430+
it.skip('should not be possible to create a DID with a service that has too many URIs', async () => {
14291431
const uris = ['x:url-1', 'x:url-2', 'x:url-3']
14301432
const limit = api.consts.did.maxNumberOfUrlsPerService.toNumber()
14311433
expect(uris.length).toBeGreaterThan(limit)
14321434
})
14331435

1434-
it('should not be possible to create a DID with a service that has a type that is too long', async () => {
1436+
it.skip('should not be possible to create a DID with a service that has a type that is too long', async () => {
14351437
const type = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
14361438
const limit = api.consts.did.maxServiceTypeLength.toNumber()
14371439
expect(type.length).toBeGreaterThan(limit)
14381440
})
14391441

1440-
it('should not be possible to create a DID with a service that has a URI that is too long', async () => {
1442+
it.skip('should not be possible to create a DID with a service that has a URI that is too long', async () => {
14411443
const uri =
14421444
'a:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
14431445
const limit = api.consts.did.maxServiceUrlLength.toNumber()

‎tests/integration/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function getStartedTestContainer(
3838
hostPort?: number
3939
): Promise<StartedTestContainer> {
4040
const image =
41-
process.env.TESTCONTAINERS_NODE_IMG || 'kiltprotocol/mashnet-node'
41+
process.env.TESTCONTAINERS_NODE_IMG || 'kiltprotocol/standalone-node'
4242
console.log(`using testcontainer with image ${image}`)
4343
const strategies = [
4444
['--dev', '--ws-external', `--ws-port=${WS_PORT}`],

‎yarn.lock

+17-17
Original file line numberDiff line numberDiff line change
@@ -1941,8 +1941,8 @@ __metadata:
19411941
"@kiltprotocol/did": "workspace:*"
19421942
"@kiltprotocol/types": "workspace:*"
19431943
"@kiltprotocol/utils": "workspace:*"
1944-
"@polkadot/api": ^10.4.0
1945-
"@polkadot/types": ^10.4.0
1944+
"@polkadot/api": ^10.7.3
1945+
"@polkadot/types": ^10.7.3
19461946
"@polkadot/util": ^12.0.0
19471947
"@polkadot/util-crypto": ^12.0.0
19481948
rimraf: ^3.0.2
@@ -1955,10 +1955,10 @@ __metadata:
19551955
resolution: "@kiltprotocol/augment-api@workspace:packages/augment-api"
19561956
dependencies:
19571957
"@kiltprotocol/type-definitions": "workspace:*"
1958-
"@polkadot/api": ^10.4.0
1958+
"@polkadot/api": ^10.7.3
19591959
"@polkadot/api-base": ^10.0.0
19601960
"@polkadot/rpc-core": ^10.0.0
1961-
"@polkadot/typegen": ^10.4.0
1961+
"@polkadot/typegen": ^10.7.3
19621962
"@polkadot/types": ^10.0.0
19631963
"@polkadot/types-codec": ^10.0.0
19641964
"@types/node": ^16.11.7
@@ -1979,9 +1979,9 @@ __metadata:
19791979
"@kiltprotocol/type-definitions": "workspace:*"
19801980
"@kiltprotocol/types": "workspace:*"
19811981
"@kiltprotocol/utils": "workspace:*"
1982-
"@polkadot/api": ^10.4.0
1982+
"@polkadot/api": ^10.7.3
19831983
"@polkadot/api-derive": ^10.0.0
1984-
"@polkadot/types": ^10.4.0
1984+
"@polkadot/types": ^10.7.3
19851985
"@polkadot/util": ^12.0.0
19861986
"@polkadot/util-crypto": ^12.0.0
19871987
rimraf: ^3.0.2
@@ -1994,7 +1994,7 @@ __metadata:
19941994
resolution: "@kiltprotocol/config@workspace:packages/config"
19951995
dependencies:
19961996
"@kiltprotocol/types": "workspace:*"
1997-
"@polkadot/api": ^10.4.0
1997+
"@polkadot/api": ^10.7.3
19981998
rimraf: ^3.0.2
19991999
typescript: ^4.8.3
20002000
typescript-logging: ^1.0.0
@@ -2015,9 +2015,9 @@ __metadata:
20152015
"@kiltprotocol/sr25519-jcs-2023": 0.1.0-rc.1
20162016
"@kiltprotocol/types": "workspace:*"
20172017
"@kiltprotocol/utils": "workspace:*"
2018-
"@polkadot/api": ^10.4.0
2018+
"@polkadot/api": ^10.7.3
20192019
"@polkadot/keyring": ^12.0.0
2020-
"@polkadot/types": ^10.4.0
2020+
"@polkadot/types": ^10.7.3
20212021
"@polkadot/util": ^12.0.0
20222022
"@polkadot/util-crypto": ^12.0.0
20232023
"@types/json-pointer": ^1.0.34
@@ -2037,9 +2037,9 @@ __metadata:
20372037
"@kiltprotocol/config": "workspace:*"
20382038
"@kiltprotocol/types": "workspace:*"
20392039
"@kiltprotocol/utils": "workspace:*"
2040-
"@polkadot/api": ^10.4.0
2040+
"@polkadot/api": ^10.7.3
20412041
"@polkadot/keyring": ^12.0.0
2042-
"@polkadot/types": ^10.4.0
2042+
"@polkadot/types": ^10.7.3
20432043
"@polkadot/util": ^12.0.0
20442044
"@polkadot/util-crypto": ^12.0.0
20452045
multibase: ^4.0.6
@@ -2160,9 +2160,9 @@ __metadata:
21602160
version: 0.0.0-use.local
21612161
resolution: "@kiltprotocol/types@workspace:packages/types"
21622162
dependencies:
2163-
"@polkadot/api": ^10.4.0
2163+
"@polkadot/api": ^10.7.3
21642164
"@polkadot/keyring": ^12.0.0
2165-
"@polkadot/types": ^10.4.0
2165+
"@polkadot/types": ^10.7.3
21662166
"@polkadot/util": ^12.0.0
21672167
"@polkadot/util-crypto": ^12.0.0
21682168
rimraf: ^3.0.2
@@ -2178,7 +2178,7 @@ __metadata:
21782178
"@kiltprotocol/es256k-jcs-2023": 0.1.0-rc.1
21792179
"@kiltprotocol/sr25519-jcs-2023": 0.1.0-rc.1
21802180
"@kiltprotocol/types": "workspace:*"
2181-
"@polkadot/api": ^10.4.0
2181+
"@polkadot/api": ^10.7.3
21822182
"@polkadot/keyring": ^12.0.0
21832183
"@polkadot/util": ^12.0.0
21842184
"@polkadot/util-crypto": ^12.0.0
@@ -2326,7 +2326,7 @@ __metadata:
23262326
languageName: node
23272327
linkType: hard
23282328

2329-
"@polkadot/api@npm:10.7.3, @polkadot/api@npm:^10.4.0":
2329+
"@polkadot/api@npm:10.7.3, @polkadot/api@npm:^10.7.3":
23302330
version: 10.7.3
23312331
resolution: "@polkadot/api@npm:10.7.3"
23322332
dependencies:
@@ -2427,7 +2427,7 @@ __metadata:
24272427
languageName: node
24282428
linkType: hard
24292429

2430-
"@polkadot/typegen@npm:^10.4.0":
2430+
"@polkadot/typegen@npm:^10.7.3":
24312431
version: 10.7.3
24322432
resolution: "@polkadot/typegen@npm:10.7.3"
24332433
dependencies:
@@ -2514,7 +2514,7 @@ __metadata:
25142514
languageName: node
25152515
linkType: hard
25162516

2517-
"@polkadot/types@npm:10.7.3, @polkadot/types@npm:^10.0.0, @polkadot/types@npm:^10.4.0":
2517+
"@polkadot/types@npm:10.7.3, @polkadot/types@npm:^10.0.0, @polkadot/types@npm:^10.7.3":
25182518
version: 10.7.3
25192519
resolution: "@polkadot/types@npm:10.7.3"
25202520
dependencies:

0 commit comments

Comments
 (0)