Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump zombienet version v1.3.82 #2396

Merged
merged 7 commits into from
Nov 21, 2023
Merged

bump zombienet version v1.3.82 #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14567be
re-enable test
pepoviola Nov 19, 2023
172b3b6
bump zombienet version
pepoviola Nov 19, 2023
c90f971
move zombienet version to own file
pepoviola Nov 19, 2023
c9cf028
testing new version
pepoviola Nov 19, 2023
d1c4b41
bump zombienet version
pepoviola Nov 19, 2023
16afe84
bump zombienet version
pepoviola Nov 19, 2023
98b6b0c
Fix the `SkipIfFeeless` extension
bkchr Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ variables:
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
NEXTEST_FAILURE_OUTPUT: immediate-final
NEXTEST_SUCCESS_OUTPUT: final
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.80"
DOCKER_IMAGES_VERSION: "${CI_COMMIT_SHA}"

default:
Expand Down Expand Up @@ -199,9 +198,6 @@ default:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues

.zombienet-refs:
extends: .build-refs

include:
# check jobs
- .gitlab/pipeline/check.yml
Expand Down
5 changes: 5 additions & 0 deletions .gitlab/pipeline/zombienet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.zombienet-refs:
extends: .build-refs
variables:
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.82"

include:
# substrate tests
- .gitlab/pipeline/zombienet/substrate.yml
Expand Down
15 changes: 7 additions & 8 deletions .gitlab/pipeline/zombienet/substrate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@
tags:
- zombienet-polkadot-integration-test

# Skip this one until PolkadotJS includes `SkipCheckIfFeeless` extension
# zombienet-substrate-0000-block-building:
# extends:
# - .zombienet-substrate-common
# script:
# - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
# --local-dir="${LOCAL_DIR}/0000-block-building"
# --test="block-building.zndsl"
zombienet-substrate-0000-block-building:
extends:
- .zombienet-substrate-common
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}/0000-block-building"
--test="block-building.zndsl"

zombienet-substrate-0001-basic-warp-sync:
extends:
Expand Down
15 changes: 9 additions & 6 deletions substrate/frame/transaction-payment/skip-feeless-payment/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ pub mod pallet {
/// A [`SignedExtension`] that skips the wrapped extension if the dispatchable is feeless.
#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
#[scale_info(skip_type_params(T))]
pub struct SkipCheckIfFeeless<T: Config, S: SignedExtension>(pub S, sp_std::marker::PhantomData<T>);
pub struct SkipCheckIfFeeless<T, S>(pub S, sp_std::marker::PhantomData<T>);

impl<T: Config, S: SignedExtension> sp_std::fmt::Debug for SkipCheckIfFeeless<T, S> {
impl<T, S: Encode> sp_std::fmt::Debug for SkipCheckIfFeeless<T, S> {
#[cfg(feature = "std")]
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
write!(f, "SkipCheckIfFeeless<{:?}>", self.0.encode())
Expand All @@ -90,9 +90,8 @@ impl<T: Config, S: SignedExtension> sp_std::fmt::Debug for SkipCheckIfFeeless<T,
}
}

impl<T: Config + Send + Sync, S: SignedExtension> SkipCheckIfFeeless<T, S> {
/// utility constructor. Used only in client/factory code.
pub fn from(s: S) -> Self {
impl<T, S> From<S> for SkipCheckIfFeeless<T, S> {
fn from(s: S) -> Self {
Self(s, sp_std::marker::PhantomData)
}
}
Expand All @@ -106,7 +105,11 @@ where
type Call = S::Call;
type AdditionalSigned = S::AdditionalSigned;
type Pre = (Self::AccountId, Option<<S as SignedExtension>::Pre>);
const IDENTIFIER: &'static str = "SkipCheckIfFeeless";
// From the outside this extension should be "invisible", because it just extends the wrapped
// extension with an extra check in `pre_dispatch` and `post_dispatch`. Thus, we should forward
// the identifier of the wrapped extension to let wallets see this extension as it would only be
// the wrapped extension itself.
const IDENTIFIER: &'static str = S::IDENTIFIER;

fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
self.0.additional_signed()
Expand Down