Skip to content

Commit fbaeea5

Browse files
committed
Merge remote-tracking branch 'origin/main' into naren-client
2 parents 64c8069 + 6160e0a commit fbaeea5

File tree

6 files changed

+25
-32
lines changed

6 files changed

+25
-32
lines changed

.github/workflows/check.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ concurrency:
2121
# Repo env variable doesn't work for PRs from forks
2222
env:
2323
CI_IMAGE: "paritytech/ci-unified:bullseye-1.88.0-2025-06-27-v202507112050"
24+
FRAME_OMNI_BENCHER_BIN_DIR: ${{ github.workspace }}/.frame-omni-bencher-bin
2425

2526
jobs:
2627
set-image:
@@ -167,6 +168,16 @@ jobs:
167168
with:
168169
shared-key: "bulletin-cache-benchmarks"
169170
save-if: ${{ github.ref == 'refs/heads/main' }}
171+
172+
- name: Download frame-omni-bencher
173+
run: |
174+
mkdir -p $FRAME_OMNI_BENCHER_BIN_DIR
175+
cd $FRAME_OMNI_BENCHER_BIN_DIR
176+
echo "Downloading frame-omni-bencher..."
177+
curl -L -o frame-omni-bencher https://github.com/paritytech/polkadot-sdk/releases/latest/download/frame-omni-bencher
178+
chmod +x frame-omni-bencher
179+
./frame-omni-bencher --version
180+
echo "${FRAME_OMNI_BENCHER_BIN_DIR}" >> $GITHUB_PATH
170181
171182
- name: Run benchmarks (Westend parachain)
172183
run: |

.github/workflows/integration-test.yml

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
env:
2020
NODE_VERSION: 22
2121
POLKADOT_SDK_VERSION: polkadot-stable2512
22-
POLKADOT_SDK_COMMIT: 81a3af9830ea8b6ff64b066b73b04bb3b675add5
22+
POLKADOT_SDK_VERSION_WITH_BULLETIN: unstable-bulletin-support-v1
2323
POLKADOT_SDK_BIN_DIR: ${{ github.workspace }}/.polkadot-sdk-bin
2424
ZOMBIENET_VERSION: v1.3.138
2525
ZOMBIENET_BIN_DIR: ${{ github.workspace }}/.zombienet-bin
@@ -35,25 +35,13 @@ jobs:
3535
with:
3636
tool-cache: false
3737

38-
# TODO: remove when released: https://github.com/paritytech/polkadot-sdk/pull/10662
39-
- name: Install Rust toolchain
40-
uses: dtolnay/rust-toolchain@stable
41-
with:
42-
targets: wasm32-unknown-unknown
43-
components: rust-src
44-
- name: Install system dependencies
45-
run: |
46-
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list /etc/apt/sources.list.d/azure-cli.list
47-
sudo apt-get update
48-
sudo apt-get install -y protobuf-compiler libclang-dev
49-
5038
# Cache the Polkadot SDK binaries
5139
- name: Cache Polkadot SDK binaries
5240
uses: actions/cache@v3
5341
id: polkadot-sdk-cache
5442
with:
5543
path: ${{ env.POLKADOT_SDK_BIN_DIR }}
56-
key: polkadot-sdk-${{ env.POLKADOT_SDK_VERSION }}-${{ env.POLKADOT_SDK_COMMIT }}-binaries
44+
key: polkadot-sdk-${{ env.POLKADOT_SDK_VERSION }}-${{ env.POLKADOT_SDK_VERSION_WITH_BULLETIN }}-binaries
5745
# Download and extract binaries if cache missed
5846
- name: Download Polkadot SDK binaries
5947
if: steps.polkadot-sdk-cache.outputs.cache-hit != 'true'
@@ -65,17 +53,9 @@ jobs:
6553
curl -L -o polkadot-prepare-worker https://github.com/paritytech/polkadot-sdk/releases/download/${POLKADOT_SDK_VERSION}/polkadot-prepare-worker
6654
curl -L -o polkadot-execute-worker https://github.com/paritytech/polkadot-sdk/releases/download/${POLKADOT_SDK_VERSION}/polkadot-execute-worker
6755
curl -L -o chain-spec-builder https://github.com/paritytech/polkadot-sdk/releases/download/${POLKADOT_SDK_VERSION}/chain-spec-builder
68-
# TODO: remove when released: https://github.com/paritytech/polkadot-sdk/pull/10662
69-
# curl -L -o polkadot-omni-node https://github.com/paritytech/polkadot-sdk/releases/download/${POLKADOT_SDK_VERSION}/polkadot-omni-node
56+
# TODO: replace POLKADOT_SDK_VERSION_WITH_BULLETIN with POLKADOT_SDK_VERSION when released: https://github.com/paritytech/polkadot-sdk/pull/10662
57+
curl -L -o polkadot-omni-node https://github.com/paritytech/polkadot-sdk/releases/download/${POLKADOT_SDK_VERSION_WITH_BULLETIN}/polkadot-omni-node
7058
chmod +x *
71-
# TODO: remove when released: https://github.com/paritytech/polkadot-sdk/pull/10662
72-
git clone https://github.com/paritytech/polkadot-sdk.git
73-
cd polkadot-sdk
74-
git reset --hard $POLKADOT_SDK_COMMIT
75-
cargo build -p polkadot-omni-node -r
76-
cd ..
77-
cp polkadot-sdk/target/release/polkadot-omni-node .
78-
rm -R polkadot-sdk
7959
8060
# Cache the Zombienet binaries
8161
- name: Cache Zombienet
@@ -140,7 +120,7 @@ jobs:
140120
id: polkadot-sdk-cache
141121
with:
142122
path: ${{ env.POLKADOT_SDK_BIN_DIR }}
143-
key: polkadot-sdk-${{ env.POLKADOT_SDK_VERSION }}-${{ env.POLKADOT_SDK_COMMIT }}-binaries
123+
key: polkadot-sdk-${{ env.POLKADOT_SDK_VERSION }}-${{ env.POLKADOT_SDK_VERSION_WITH_BULLETIN }}-binaries
144124
- name: Cache Zombienet
145125
uses: actions/cache@v3
146126
id: zombienet-cache
@@ -149,7 +129,9 @@ jobs:
149129
key: zombienet-${{ env.ZOMBIENET_VERSION }}-binaries
150130
- name: Add binaries to PATH
151131
run: |
132+
chmod +x "${POLKADOT_SDK_BIN_DIR}"/*
152133
ls -lrt "${POLKADOT_SDK_BIN_DIR}"
134+
chmod +x "${ZOMBIENET_BIN_DIR}"/*
153135
ls -lrt "${ZOMBIENET_BIN_DIR}"
154136
echo "${POLKADOT_SDK_BIN_DIR}" >> "$GITHUB_PATH"
155137
echo "SKIP_PARACHAIN_SETUP=1" >> "$GITHUB_ENV"

examples/justfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ ipfs-start test_dir: _check-docker
234234
echo " Container: ipfs-node"
235235
echo " Waiting for container to start..."
236236
sleep 5
237+
docker exec ipfs-node ipfs --version
237238

238239
# Bitswap logging
239240
docker logs -f ipfs-node > {{ test_dir }}/ipfs-node.log 2>&1 &

runtimes/bulletin-westend/src/weights/xcm/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ impl<Call> XcmWeightInfo<Call> for BulletinWestendXcmWeight<Call> {
6767
fn reserve_asset_deposited(assets: &Assets) -> Weight {
6868
assets.weigh_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
6969
}
70-
fn receive_teleported_asset(assets: &Assets) -> Weight {
71-
assets.weigh_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
70+
fn receive_teleported_asset(_assets: &Assets) -> Weight {
71+
Weight::MAX
7272
}
7373
fn query_response(
7474
_query_id: &u64,

runtimes/bulletin-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ impl<T: frame_system::Config> WeightInfo<T> {
9797
Weight::from_parts(2_130_000, 0)
9898
}
9999

100-
pub(crate) fn receive_teleported_asset() -> Weight {
101-
// Teleportation is not supported by this runtime.
102-
Weight::MAX
103-
}
104100
/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
105101
/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
106102
/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)

scripts/cmd/cmd.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
wasm_file = f"target/{profile}/wbuild/{runtime['package']}/{runtime['package'].replace('-', '_')}.wasm"
9898
output = os.popen(
9999
f"frame-omni-bencher v1 benchmark pallet --no-csv-header --all --list --runtime={wasm_file}").read()
100+
if output == "":
101+
print(f'frame-omni-bencher not found')
102+
sys.exit(1)
100103
raw_pallets = output.split('\n')
101104

102105
all_pallets = set()
@@ -130,7 +133,7 @@
130133
print(f"No pallets [{args.pallet}] found in {args.runtime}")
131134
else:
132135
print('No runtimes found')
133-
sys.exit(0)
136+
sys.exit(1)
134137

135138
header_path = os.path.abspath('./scripts/cmd/file_header.txt')
136139

0 commit comments

Comments
 (0)