Skip to content

Commit 98c49ab

Browse files
committed
Merge branch 'develop' into ag_constants
2 parents 97326f8 + 5f0b75e commit 98c49ab

34 files changed

Lines changed: 1328 additions & 368 deletions

File tree

.cargo-deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ ignore = [
1818
{ id = "RUSTSEC-2024-0384", reason = "`instant` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
1919
{ id = "RUSTSEC-2024-0388", reason = "`derivative` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
2020
{ id = "RUSTSEC-2024-0421", reason = "`idna` has a security vulnerability but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
21+
{ id = "RUSTSEC-2024-0436", reason = "`paste` is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
22+
{ id = "RUSTSEC-2025-0009", reason = "`ring` has a security vulnerability but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
23+
{ id = "RUSTSEC-2025-0010", reason = "`ring` 0.16.20 is unmaintained but a Substrate dependency. Re-verify upon next polkadot-sdk updates." },
2124
]
2225
yanked = "deny"
2326

Cargo.lock

Lines changed: 19 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chainspecs/spiritnet/spiritnet.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"id": "kilt",
44
"chainType": "Live",
55
"bootNodes": [
6-
"/dns4/hetzner-1.kilt.io/tcp/30333/p2p/12D3KooWKU8ehzuKAzHEMCy4i4kpJtgCFBCYYhqcub4Y1HR8FRoT",
7-
"/dns4/hetzner-2.kilt.io/tcp/30333/p2p/12D3KooWDJzJ7TRNKvE2DWXMSSsoKR5TgxsnNy3W1eCBPveX6g9i",
6+
"/dns4/boot-1.kilt.io/tcp/30333/p2p/12D3KooWSoH5HHwhMmiwLNrQWnFqUkjiLiN7pJfSdjqBzbNJbJTu",
7+
"/dns4/boot-2.kilt.io/tcp/30333/p2p/12D3KooWDJzJ7TRNKvE2DWXMSSsoKR5TgxsnNy3W1eCBPveX6g9i",
88
"/dns/kilt.boot.stake.plus/tcp/30332/wss/p2p/12D3KooWHZ6ftYNVQDm5gbHvtGgkPStaBBQBje8rrtxdH1jJonkW",
99
"/dns/kilt.boot.stake.plus/tcp/31332/wss/p2p/12D3KooWMgyhbAKBkEqvKP5bPGTCJZ4nYziJhQep9aHRAkZW8xyy",
1010
"/dns4/boot.helikon.io/tcp/8570/p2p/12D3KooWGaE81VE2rzD5TbeRqpTgQwh2sWXMVfMJLBMHQH8AfoXu",

integration-tests/chopsticks/src/tests/switchPallet/fullFlow/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export const testCases: TestConfiguration[] = [
175175
foreign: {
176176
transfer: [{ section: 'polkadotXcm', method: 'Sent' }],
177177
receive: {
178-
foreign: ['foreignAssets', { section: 'messageQueue', method: 'Processed' }],
178+
foreign: ['foreignAssets'],
179179
native: [
180180
{ section: 'balances', method: 'Burned' },
181181
{ section: 'balances', method: 'Minted' },

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/failingOnReceiver/__snapshots__/index.test.ts.snap

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,6 @@ exports[`Switch KILTs while receiver can not handle them > V4 LIVE > Switch on n
2828
]
2929
`;
3030

31-
exports[`Switch KILTs while receiver can not handle them > V4 LIVE > Switch on receiver chain: {"section":"messageQueue","method":"Processed"} 1`] = `
32-
[
33-
{
34-
"data": {
35-
"id": "(hash)",
36-
"origin": {
37-
"Sibling": "(rounded 2100)",
38-
},
39-
"success": false,
40-
"weightUsed": {
41-
"proofSize": "(rounded 24000)",
42-
"refTime": "(rounded 1500000000)",
43-
},
44-
},
45-
"method": "Processed",
46-
"section": "messageQueue",
47-
},
48-
]
49-
`;
50-
5131
exports[`Switch KILTs while receiver can not handle them > V4 LIVE > assetSwitchPool1 Finalization 1`] = `
5232
[
5333
{

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/failingOnReceiver/config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ export const testCases: TestConfiguration[] = [
7171
tx: tx.switchPallet.switchV4(),
7272
events: {
7373
sender: ['assetSwitchPool1'],
74-
receiver: [
75-
{
76-
section: 'messageQueue',
77-
method: 'Processed',
78-
},
79-
],
74+
receiver: [],
8075
},
8176
},
8277
sovereignAccount: mainChains.kilt.chainInfo.sovereignAccountOnSiblingChains,

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/noSwitchPair/__snapshots__/index.test.ts.snap

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`Switch eKILTs while no pair set > V4 LIVE > Switch eKILTs on receiver chain: {"section":"messageQueue","method":"Processed"} 1`] = `
4-
[
5-
{
6-
"data": {
7-
"id": "(hash)",
8-
"origin": {
9-
"Sibling": 1000,
10-
},
11-
"success": false,
12-
"weightUsed": {
13-
"proofSize": 0,
14-
"refTime": 200000000,
15-
},
16-
},
17-
"method": "Processed",
18-
"section": "messageQueue",
19-
},
20-
]
21-
`;
22-
233
exports[`Switch eKILTs while no pair set > V4 LIVE > Switch eKILTs on sender chain: {"section":"polkadotXcm","method":"Sent"} 1`] = `
244
[
255
{

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/noSwitchPair/config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@ export const testCases: TestConfiguration[] = [
8484
method: 'Sent',
8585
},
8686
],
87-
receiver: [
88-
{
89-
section: 'messageQueue',
90-
method: 'Processed',
91-
},
92-
],
87+
receiver: [],
9388
},
9489
},
9590
},

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/otherReserveLocation/__snapshots__/index.test.ts.snap

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`Switch other reserve location > V4 LIVE > Switch eKILTs from untrusted location receiver: {"section":"messageQueue","method":"ProcessingFailed"} 1`] = `
4-
[
5-
{
6-
"data": {
7-
"error": "Unsupported",
8-
"id": "(hash)",
9-
"origin": "Parent",
10-
},
11-
"method": "ProcessingFailed",
12-
"section": "messageQueue",
13-
},
14-
]
15-
`;
16-
173
exports[`Switch other reserve location > V4 LIVE > Switch eKILTs from untrusted location sender: {"section":"xcmPallet","method":"Sent"} 1`] = `
184
[
195
{

integration-tests/chopsticks/src/tests/switchPallet/switchConfig/otherReserveLocation/config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ export const testCases: TestConfiguration[] = [
6363
method: 'Sent',
6464
},
6565
],
66-
receiver: [
67-
{
68-
section: 'messageQueue',
69-
method: 'ProcessingFailed',
70-
},
71-
],
66+
receiver: [],
7267
},
7368
},
7469
},

0 commit comments

Comments
 (0)