Skip to content

Commit 6b2dea7

Browse files
pkhrypkhry
authored
Merge branch 'master' into pkhry/external_transient_storage
2 parents 2cdbab6 + c3487a5 commit 6b2dea7

File tree

1,064 files changed

+5191
-4988
lines changed

Some content is hidden

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

1,064 files changed

+5191
-4988
lines changed

‎.github/assets/revive-dev-node-polkavm-resolc.json‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1 @@
1-
{
2-
"fixtures/solidity/complex/create/create2_many/test.json::1::Y M3": "Failed",
3-
"fixtures/solidity/complex/create/create_in_library/test.json::0::Y M0": "Failed",
4-
"fixtures/solidity/complex/create/create_in_library/test.json::0::Y M3": "Failed",
5-
"fixtures/solidity/complex/create/create_many/test.json::1::Y M3": "Failed",
6-
"fixtures/solidity/complex/library_call_tuple/test.json::0::Y M0": "Failed",
7-
"fixtures/solidity/complex/library_call_tuple/test.json::0::Y M3": "Failed",
8-
"fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M0 >=0.8.1": "Failed",
9-
"fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M3 >=0.8.1": "Failed",
10-
"fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::0::Y M3": "Failed",
11-
"fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::1::Y M3": "Failed",
12-
"fixtures/solidity/simple/pointer/large_offset.sol::0::Y M0": "Failed",
13-
"fixtures/solidity/simple/pointer/large_offset.sol::0::Y M3": "Failed",
14-
"fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M0": "Failed",
15-
"fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M3": "Failed",
16-
"fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M0": "Failed",
17-
"fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M3": "Failed",
18-
"fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M0": "Failed",
19-
"fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M3": "Failed",
20-
"fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M0": "Failed",
21-
"fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M3": "Failed",
22-
"fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M0": "Failed",
23-
"fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M3": "Failed",
24-
"fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M0": "Failed",
25-
"fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M3": "Failed",
26-
"fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M0": "Failed",
27-
"fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M3": "Failed",
28-
"fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M0": "Failed",
29-
"fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M3": "Failed"
30-
}
1+
{}

‎.github/scripts/common/lib.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@ function get_s3_url_base() {
355355
frame-omni-bencher)
356356
printf "https://releases.parity.io/frame-omni-bencher"
357357
;;
358+
eth-rpc)
359+
printf "https://releases.parity.io/eth-rpc"
360+
;;
358361
*)
359362
printf "UNSUPPORTED BINARY $name"
360363
exit 1

‎.github/workflows/release-30_publish_release_draft.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ jobs:
235235
runs-on: ubuntu-latest
236236
strategy:
237237
matrix:
238-
binary: [ polkadot, polkadot-execute-worker, polkadot-prepare-worker, polkadot-parachain, polkadot-omni-node, frame-omni-bencher, chain-spec-builder ]
238+
binary: [ polkadot, polkadot-execute-worker, polkadot-prepare-worker, polkadot-parachain, polkadot-omni-node, frame-omni-bencher, chain-spec-builder, eth-rpc ]
239239
target: [ x86_64-unknown-linux-gnu, aarch64-apple-darwin ]
240240

241241
steps:

‎.github/workflows/tests-evm.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,25 @@ jobs:
3838
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3939
- name: Update the Installed Python
4040
run: apt-get update && apt-get install -y python3-pip python3
41+
- name: Download artifact by ID
42+
id: download
43+
run: |
44+
curl -L --fail --show-error \
45+
-H "Authorization: Bearer ${{ github.token }}" \
46+
-H "Accept: application/vnd.github+json" \
47+
-H "X-GitHub-Api-Version: 2022-11-28" \
48+
"https://api.github.com/repos/paritytech/revive/actions/artifacts/5198357315/zip" \
49+
-o resolc.zip
50+
unzip -q resolc.zip -d resolc
51+
chmod +x ./resolc/resolc-x86_64-unknown-linux-musl
52+
echo "resolc-path=$(pwd)/resolc/resolc-x86_64-unknown-linux-musl" >> "$GITHUB_OUTPUT"
4153
- name: Run revive differential tests
42-
uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@be448d78bd83a755fdcab96849971ecdf4eebce0
54+
uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@0e41f054405c054c37d524e5172ef8c514852e6b
4355
with:
4456
platform: ${{ matrix.platform }}
4557
cargo-command: "forklift cargo"
46-
revive-differential-tests-ref: "be448d78bd83a755fdcab96849971ecdf4eebce0"
47-
resolc-version: "0.5.0"
58+
revive-differential-tests-ref: "0e41f054405c054c37d524e5172ef8c514852e6b"
59+
resolc-path: ${{ steps.download.outputs.resolc-path }}
4860
expectations-file-path: ./.github/assets/${{ matrix.platform }}.json
4961

5062
evm-test-suite:

‎.rustfmt.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ imports_granularity = "Crate"
88
reorder_imports = true
99
# Consistency
1010
newline_style = "Unix"
11+
normalize_comments = true
12+
normalize_doc_attributes = true
1113
# Misc
1214
chain_width = 80
1315
spaces_around_ranges = false
1416
binop_separator = "Back"
1517
reorder_impl_items = false
16-
match_arm_leading_pipes = "Preserve"
18+
match_arm_leading_pipes = "Never"
1719
match_arm_blocks = false
1820
match_block_trailing_comma = true
1921
trailing_comma = "Vertical"
20-
trailing_semicolon = false
22+
trailing_semicolon = true
2123
use_field_init_shorthand = true
2224
# Format comments
2325
comment_width = 100

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ members = [
424424
"substrate/frame/revive/proc-macro",
425425
"substrate/frame/revive/rpc",
426426
"substrate/frame/revive/uapi",
427+
"substrate/frame/revive/ui-tests",
427428
"substrate/frame/root-offences",
428429
"substrate/frame/root-testing",
429430
"substrate/frame/safe-mode",
@@ -1040,6 +1041,7 @@ pallet-revive-eth-rpc = { path = "substrate/frame/revive/rpc", default-features
10401041
pallet-revive-fixtures = { path = "substrate/frame/revive/fixtures", default-features = false }
10411042
pallet-revive-proc-macro = { path = "substrate/frame/revive/proc-macro", default-features = false }
10421043
pallet-revive-uapi = { path = "substrate/frame/revive/uapi", default-features = false }
1044+
pallet-revive-ui-tests = { path = "substrate/frame/revive/ui-tests", default-features = false }
10431045
pallet-root-offences = { default-features = false, path = "substrate/frame/root-offences" }
10441046
pallet-root-testing = { path = "substrate/frame/root-testing", default-features = false }
10451047
pallet-safe-mode = { default-features = false, path = "substrate/frame/safe-mode" }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ where
105105
has_failed || !SubmitFinalityProofHelper::<T, I>::was_successful(bundled_block_number);
106106

107107
if !has_failed {
108-
return
108+
return;
109109
}
110110

111111
// let's slash registered relayer
@@ -176,7 +176,7 @@ where
176176
!SubmitParachainHeadsHelper::<T, ParachainsInstance>::was_successful(&update);
177177

178178
if !has_failed {
179-
return
179+
return;
180180
}
181181

182182
// let's slash registered relayer
@@ -465,7 +465,7 @@ mod tests {
465465
type ToPostDispatch = u64;
466466
fn validate(_who: &u64, call: &MockCall) -> (u64, TransactionValidity) {
467467
if call.data <= 1 {
468-
return (1, InvalidTransaction::Custom(1).into())
468+
return (1, InvalidTransaction::Custom(1).into());
469469
}
470470

471471
(1, Ok(ValidTransaction { priority: 1, ..Default::default() }))
@@ -493,7 +493,7 @@ mod tests {
493493
type ToPostDispatch = u64;
494494
fn validate(_who: &u64, call: &MockCall) -> (u64, TransactionValidity) {
495495
if call.data <= 2 {
496-
return (2, InvalidTransaction::Custom(2).into())
496+
return (2, InvalidTransaction::Custom(2).into());
497497
}
498498

499499
(2, Ok(ValidTransaction { priority: 2, ..Default::default() }))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn prepare_inbound_message<LaneId>(
4848

4949
// if we don't need a correct message, then we may just return some random blob
5050
if !params.is_successful_dispatch_expected {
51-
return vec![0u8; expected_size]
51+
return vec![0u8; expected_size];
5252
}
5353

5454
// else let's prepare successful message.

‎bridges/modules/beefy/src/lib.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ pub type BridgedBlockHash<T, I> = bp_runtime::HashOf<BridgedChain<T, I>>;
5858
/// Pallet initialization data.
5959
pub type InitializationDataOf<T, I> =
6060
InitializationData<BridgedBlockNumber<T, I>, bp_beefy::MmrHashOf<BridgedChain<T, I>>>;
61-
/// BEEFY commitment hasher, used by configured bridged chain.
62-
pub type BridgedBeefyCommitmentHasher<T, I> = bp_beefy::BeefyCommitmentHasher<BridgedChain<T, I>>;
6361
/// BEEFY validator id, used by configured bridged chain.
6462
pub type BridgedBeefyAuthorityId<T, I> = bp_beefy::BeefyAuthorityIdOf<BridgedChain<T, I>>;
6563
/// BEEFY validator set, used by configured bridged chain.

0 commit comments

Comments
 (0)