Merge remote-tracking branch 'origin/master' into sigurpol-dap-satellite

Author: sigurpol

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

@@ -1,30 +1 @@
-{
-  "fixtures/solidity/complex/create/create2_many/test.json::1::Y M3": "Failed",
-  "fixtures/solidity/complex/create/create_in_library/test.json::0::Y M0": "Failed",
-  "fixtures/solidity/complex/create/create_in_library/test.json::0::Y M3": "Failed",
-  "fixtures/solidity/complex/create/create_many/test.json::1::Y M3": "Failed",
-  "fixtures/solidity/complex/library_call_tuple/test.json::0::Y M0": "Failed",
-  "fixtures/solidity/complex/library_call_tuple/test.json::0::Y M3": "Failed",
-  "fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M0 >=0.8.1": "Failed",
-  "fixtures/solidity/complex/solidity_by_example/applications/iterable_mapping/test.json::0::Y M3 >=0.8.1": "Failed",
-  "fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::0::Y M3": "Failed",
-  "fixtures/solidity/simple/internal_function_pointers/sum_oddness.sol::1::Y M3": "Failed",
-  "fixtures/solidity/simple/pointer/large_offset.sol::0::Y M0": "Failed",
-  "fixtures/solidity/simple/pointer/large_offset.sol::0::Y M3": "Failed",
-  "fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M0": "Failed",
-  "fixtures/solidity/simple/try_catch/unbalanced_gas_limit.sol::0::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::59::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::60::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::61::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::75::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::197::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::202::Y M3": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M0": "Failed",
-  "fixtures/solidity/simple/yul_instructions/revert.sol::207::Y M3": "Failed"
-}
+{}

.github/scripts/common/lib.sh

@@ -355,6 +355,9 @@ function get_s3_url_base() {
       frame-omni-bencher)
         printf "https://releases.parity.io/frame-omni-bencher"
         ;;
+      eth-rpc)
+        printf "https://releases.parity.io/eth-rpc"
+        ;;
       *)
         printf "UNSUPPORTED BINARY $name"
         exit 1

.github/workflows/release-30_publish_release_draft.yml

@@ -235,7 +235,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        binary: [ polkadot, polkadot-execute-worker, polkadot-prepare-worker, polkadot-parachain, polkadot-omni-node, frame-omni-bencher, chain-spec-builder ]
+        binary: [ polkadot, polkadot-execute-worker, polkadot-prepare-worker, polkadot-parachain, polkadot-omni-node, frame-omni-bencher, chain-spec-builder, eth-rpc ]
         target: [ x86_64-unknown-linux-gnu, aarch64-apple-darwin ]
 
     steps:

.github/workflows/tests-evm.yml

@@ -38,13 +38,25 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Update the Installed Python
         run: apt-get update && apt-get install -y python3-pip python3
+      - name: Download artifact by ID
+        id: download
+        run: |
+          curl -L --fail --show-error \
+            -H "Authorization: Bearer ${{ github.token }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "https://api.github.com/repos/paritytech/revive/actions/artifacts/5198357315/zip" \
+            -o resolc.zip
+          unzip -q resolc.zip -d resolc
+          chmod +x ./resolc/resolc-x86_64-unknown-linux-musl
+          echo "resolc-path=$(pwd)/resolc/resolc-x86_64-unknown-linux-musl" >> "$GITHUB_OUTPUT"
       - name: Run revive differential tests
-        uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@be448d78bd83a755fdcab96849971ecdf4eebce0
+        uses: paritytech/revive-differential-tests/.github/actions/run-differential-tests@0e41f054405c054c37d524e5172ef8c514852e6b
         with:
           platform: ${{ matrix.platform }}
           cargo-command: "forklift cargo"
-          revive-differential-tests-ref: "be448d78bd83a755fdcab96849971ecdf4eebce0"
-          resolc-version: "0.5.0"
+          revive-differential-tests-ref: "0e41f054405c054c37d524e5172ef8c514852e6b"
+          resolc-path: ${{ steps.download.outputs.resolc-path }}
           expectations-file-path: ./.github/assets/${{ matrix.platform }}.json
 
   evm-test-suite:

bridges/modules/beefy/src/lib.rs

@@ -58,8 +58,6 @@ pub type BridgedBlockHash<T, I> = bp_runtime::HashOf<BridgedChain<T, I>>;
 /// Pallet initialization data.
 pub type InitializationDataOf<T, I> =
 	InitializationData<BridgedBlockNumber<T, I>, bp_beefy::MmrHashOf<BridgedChain<T, I>>>;
-/// BEEFY commitment hasher, used by configured bridged chain.
-pub type BridgedBeefyCommitmentHasher<T, I> = bp_beefy::BeefyCommitmentHasher<BridgedChain<T, I>>;
 /// BEEFY validator id, used by configured bridged chain.
 pub type BridgedBeefyAuthorityId<T, I> = bp_beefy::BeefyAuthorityIdOf<BridgedChain<T, I>>;
 /// BEEFY validator set, used by configured bridged chain.

bridges/modules/beefy/src/mock.rs

@@ -17,8 +17,8 @@
 use crate as beefy;
 use crate::{
 	utils::get_authorities_mmr_root, BridgedBeefyAuthoritySet, BridgedBeefyAuthoritySetInfo,
-	BridgedBeefyCommitmentHasher, BridgedBeefyMmrLeafExtra, BridgedBeefySignedCommitment,
-	BridgedMmrHash, BridgedMmrHashing, BridgedMmrProof,
+	BridgedBeefyMmrLeafExtra, BridgedBeefySignedCommitment, BridgedMmrHash, BridgedMmrHashing,
+	BridgedMmrProof,
 };
 
 use bp_beefy::{BeefyValidatorSignatureOf, ChainWithBeefy, Commitment, MmrDataOrHash};
@@ -33,7 +33,7 @@ use sp_runtime::{
 };
 
 pub use sp_consensus_beefy::ecdsa_crypto::{AuthorityId as BeefyId, Pair as BeefyPair};
-use sp_core::crypto::Wraps;
+use sp_consensus_beefy::test_utils::BeefySignerAuthority;
 use sp_runtime::traits::Keccak256;
 
 pub type TestAccountId = u64;
@@ -44,7 +44,6 @@ pub type TestBridgedAuthoritySetInfo = BridgedBeefyAuthoritySetInfo<TestRuntime,
 pub type TestBridgedValidatorSet = BridgedBeefyAuthoritySet<TestRuntime, ()>;
 pub type TestBridgedCommitment = BridgedBeefySignedCommitment<TestRuntime, ()>;
 pub type TestBridgedValidatorSignature = BeefyValidatorSignatureOf<TestBridgedChain>;
-pub type TestBridgedCommitmentHasher = BridgedBeefyCommitmentHasher<TestRuntime, ()>;
 pub type TestBridgedMmrHashing = BridgedMmrHashing<TestRuntime, ()>;
 pub type TestBridgedMmrHash = BridgedMmrHash<TestRuntime, ()>;
 pub type TestBridgedBeefyMmrLeafExtra = BridgedBeefyMmrLeafExtra<TestRuntime, ()>;
@@ -105,7 +104,6 @@ impl Chain for TestBridgedChain {
 }
 
 impl ChainWithBeefy for TestBridgedChain {
-	type CommitmentHasher = Keccak256;
 	type MmrHashing = Keccak256;
 	type MmrHash = <Keccak256 as Hash>::Output;
 	type BeefyMmrLeafExtra = ();
@@ -184,12 +182,11 @@ pub fn sign_commitment(
 	let random_validators =
 		rand::seq::index::sample(&mut rand::thread_rng(), total_validators, signature_count);
 
-	let commitment_hash = TestBridgedCommitmentHasher::hash(&commitment.encode());
 	let mut signatures = vec![None; total_validators];
 	for validator_idx in random_validators.iter() {
 		let validator = &validator_pairs[validator_idx];
 		signatures[validator_idx] =
-			Some(validator.as_inner_ref().sign_prehashed(commitment_hash.as_fixed_bytes()).into());
+			Some(BeefySignerAuthority::sign(validator, &commitment.encode()));
 	}
 
 	TestBridgedCommitment { commitment, signatures }

bridges/primitives/beefy/src/lib.rs

@@ -52,11 +52,6 @@ use sp_std::prelude::*;
 /// primitives. Some of types can be configured in low-level pallets, but are constrained
 /// when BEEFY+MMR bundle is used.
 pub trait ChainWithBeefy: Chain {
-	/// The hashing algorithm used to compute the digest of the BEEFY commitment.
-	///
-	/// Corresponds to the hashing algorithm, used by `sc_consensus_beefy::BeefyKeystore`.
-	type CommitmentHasher: sp_runtime::traits::Hash;
-
 	/// The hashing algorithm used to build the MMR.
 	///
 	/// The same algorithm is also used to compute merkle roots in BEEFY
@@ -84,7 +79,7 @@ pub trait ChainWithBeefy: Chain {
 	/// A way to identify a BEEFY validator.
 	///
 	/// Corresponds to the `BeefyId` field of the `pallet-beefy` configuration.
-	type AuthorityId: BeefyAuthorityId<Self::CommitmentHasher> + Parameter;
+	type AuthorityId: BeefyAuthorityId + Parameter;
 
 	/// A way to convert validator id to its raw representation in the BEEFY merkle tree.
 	///
@@ -105,8 +100,6 @@ pub type BeefyValidatorSignatureOf<C> =
 /// Signed BEEFY commitment used by given Substrate chain.
 pub type BeefySignedCommitmentOf<C> =
 	SignedCommitment<BlockNumberOf<C>, BeefyValidatorSignatureOf<C>>;
-/// Hash algorithm, used to compute the digest of the BEEFY commitment before signing it.
-pub type BeefyCommitmentHasher<C> = <C as ChainWithBeefy>::CommitmentHasher;
 /// Hash algorithm used in Beefy MMR construction by given Substrate chain.
 pub type MmrHashingOf<C> = <C as ChainWithBeefy>::MmrHashing;
 /// Hash type, used in MMR construction by given Substrate chain.

prdoc/pr_10763.prdoc

@@ -0,0 +1,21 @@
+title: Make some BEEFY keystore logic more generic
+doc:
+- audience: Node Dev
+  description: |-
+    This PR:
+    1. makes some BEEFY keystore methods more generic:
+    - `sign()`
+    - `public_keys()`
+       This is done by implementing the specific logic in the `BeefyAuthorityId`.
+    2. Removes the `BeefyAuthorityId::SignatureHasher` since for some algorithms it doesn't make sense to have a hasher.
+
+    Also since now the `BeefyAuthorityId` implements both the signing and the verification logic, we should have better consistency.
+
+    Related to https://github.com/paritytech/polkadot-sdk/pull/8707#discussion_r2673377834
+crates:
+- name: sp-consensus-beefy
+  bump: major
+- name: sc-consensus-beefy
+  bump: patch
+- name: pallet-beefy
+  bump: patch

prdoc/pr_10907.prdoc

@@ -0,0 +1,8 @@
+title: Update the resolc and retester versions
+doc:
+- audience: Runtime Dev
+  description: |-
+    ## Summary
+
+    This PR allows us to use nightly versions of the resolc compiler in the differential tests CI which include fixes not yet available in the published version of the compiler. It also bumps the commit hash of differential tests used to a version that allows for gas limits to be specified manually to circumvent the issue observed in https://github.com/paritytech/contract-issues/issues/259
+crates: []

substrate/client/consensus/beefy/src/fisherman.rs

@@ -23,7 +23,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::RuntimeAppPublic;
 use sp_blockchain::HeaderBackend;
 use sp_consensus_beefy::{
-	check_double_voting_proof, AuthorityIdBound, BeefyApi, BeefySignatureHasher, DoubleVotingProof,
+	check_double_voting_proof, AuthorityIdBound, BeefyApi, DoubleVotingProof,
 	OpaqueKeyOwnershipProof, ValidatorSetId,
 };
 use sp_runtime::{
@@ -131,7 +131,7 @@ where
 			(active_rounds.validators(), active_rounds.validator_set_id());
 		let offender_id = proof.offender_id();
 
-		if !check_double_voting_proof::<_, _, BeefySignatureHasher>(&proof) {
+		if !check_double_voting_proof::<_, _>(&proof) {
 			debug!(target: LOG_TARGET, "🥩 Skipping report for bad equivocation {:?}", proof);
 			return Ok(());
 		}