Skip to content

Commit 42607ad

Browse files
tdimitrovtdimitrov
committed
Merge branch 'master' into tsv-disabling
2 parents 913232a + 0284e21 commit 42607ad

File tree

417 files changed

+3257
-2485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+3257
-2485
lines changed

‎.github/workflows/check-licenses.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Checkout sources
1717
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
18-
- uses: actions/setup-node@v3.8.1
18+
- uses: actions/setup-node@v4.0.0
1919
with:
2020
node-version: "18.x"
2121
registry-url: "https://npm.pkg.github.com"

‎.github/workflows/check-markdown.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout sources
1616
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1717

18-
- uses: actions/setup-node@v3.8.1
18+
- uses: actions/setup-node@v4.0.0
1919
with:
2020
node-version: "18.x"
2121
registry-url: "https://npm.pkg.github.com"

‎Cargo.lock‎

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

‎bridges/bin/runtime-common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
1111
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
1212
hash-db = { version = "0.16.0", default-features = false }
1313
log = { version = "0.4.20", default-features = false }
14-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
14+
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
1515
static_assertions = { version = "1.1", optional = true }
1616

1717
# Bridge dependencies

‎bridges/bin/runtime-common/src/mock.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ impl pallet_balances::Config for TestRuntime {
190190
type MaxReserves = ConstU32<50>;
191191
type ReserveIdentifier = [u8; 8];
192192
type RuntimeHoldReason = RuntimeHoldReason;
193+
type RuntimeFreezeReason = RuntimeFreezeReason;
193194
type FreezeIdentifier = ();
194195
type MaxHolds = ConstU32<0>;
195196
type MaxFreezes = ConstU32<0>;

‎bridges/modules/grandpa/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
1212
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
1313
finality-grandpa = { version = "0.16.2", default-features = false }
1414
log = { version = "0.4.20", default-features = false }
15-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
15+
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
1616

1717
# Bridge Dependencies
1818

‎bridges/modules/messages/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
1010
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
1111
log = { version = "0.4.20", default-features = false }
1212
num-traits = { version = "0.2", default-features = false }
13-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
13+
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
1414

1515
# Bridge dependencies
1616

‎bridges/modules/messages/src/mock.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ impl pallet_balances::Config for TestRuntime {
130130
type MaxReserves = ();
131131
type ReserveIdentifier = ();
132132
type RuntimeHoldReason = RuntimeHoldReason;
133+
type RuntimeFreezeReason = RuntimeFreezeReason;
133134
type FreezeIdentifier = ();
134135
type MaxHolds = ConstU32<0>;
135136
type MaxFreezes = ConstU32<0>;

‎bridges/modules/parachains/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
99
[dependencies]
1010
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
1111
log = { version = "0.4.20", default-features = false }
12-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
12+
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
1313

1414
# Bridge Dependencies
1515

‎bridges/modules/relayers/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
99
[dependencies]
1010
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
1111
log = { version = "0.4.20", default-features = false }
12-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
12+
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
1313

1414
# Bridge dependencies
1515

0 commit comments

Comments
 (0)