Skip to content

Sync with polkadot-sdk/cb629d46ebf00aa65624013a61f9c69ebf02b0b4 #2541

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

Merged
merged 20 commits into from
Jul 16, 2025
Merged

Sync with polkadot-sdk/cb629d46ebf00aa65624013a61f9c69ebf02b0b4 #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e8ad2e5
Synced with `polkadot-sdk/75deaab1061bf740a3c3f172668922b0a5c54344`
cmichi Jun 30, 2025
7164e9e
Make dep syntax consistent
cmichi Jul 4, 2025
06da916
Use `cargo-contract-nightly`
cmichi Jul 4, 2025
9c135c4
Use `ink-node-nightly` + `cargo-contract-nightly`
cmichi Jul 4, 2025
4339575
Update codeowners
cmichi Jul 15, 2025
59014d7
Sync with `cb629d46ebf00aa65624013a61f9c69ebf02b0b4`
cmichi Jul 15, 2025
930ebca
Update `Cargo.lock`
cmichi Jul 15, 2025
1c17e56
Disable native XCM functions
cmichi Jul 15, 2025
653be08
Disable `is_contract`
cmichi Jul 15, 2025
c10d831
Disable `call_runtime`
cmichi Jul 15, 2025
c3f54d9
Use `ink-node` over `ink-node-nightly`
cmichi Jul 15, 2025
95eb1a8
Use `contract-build` from `master`
cmichi Jul 15, 2025
74a5657
Use `cargo-contract` over `cargo-contract-nightly`
cmichi Jul 15, 2025
2b795d5
Fix `warning: lifetime flowing from input to output with different sy…
cmichi Jul 15, 2025
65ee441
Set version to `6.0.0-alpha.1`
cmichi Jul 16, 2025
8a48187
Fix naming
cmichi Jul 16, 2025
108d633
Revert me: Set executable
cmichi Jul 16, 2025
b772db9
Revert "Revert me: Set executable"
cmichi Jul 16, 2025
a186240
Set crate versions, for publishing on crates.io
cmichi Jul 16, 2025
24cec41
Revert "Set crate versions, for publishing on crates.io"
cmichi Jul 16, 2025
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
2 changes: 1 addition & 1 deletion .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
RUSTC_BOOTSTRAP = "1"

[build]
rustflags = ["--cfg", "substrate_runtime"]
#rustflags = ["--cfg", "substrate_runtime"]

[registry]
protocol = "sparse"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ jobs:
--ignore solidity-abi/trait-flipper --ignore solidity-abi/trait-dyn-cross-contract-calls \
--ignore solidity-abi/fallible-setter -- \
scripts/build_and_determine_contract_size.sh {}

#bash -c "scripts/build_and_determine_contract_size.sh {} >> ${CONTRACT_SIZE_FILE} && \
#sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' ${CONTRACT_SIZE_FILE}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/measurements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
${SCRIPTS_DIR}/for_all_contracts_exec.sh --path integration-tests --ignore public/complex-storage-structures --quiet -- ${SCRIPTS_DIR}/contract_size.sh {} > ${CONTRACT_SIZES}
sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' ${CONTRACT_SIZES}

CARGO_CONTRACT_VERSION=$(cargo +nightly contract --version | egrep --only-matching "cargo-contract.* .*-x86" | sed -s 's/-x86//')
CARGO_CONTRACT_VERSION=$(cargo contract --version | egrep --only-matching "cargo-contract.* .*-x86" | sed -s 's/-x86//')
echo "CARGO_CONTRACT_VERSION=\"${CARGO_CONTRACT_VERSION}\"" > ${MEASUREMENTS_DIR}/context.out
echo "PR_NUMBER=\"${PR_NUMBER}\"" >> ${MEASUREMENTS_DIR}/context.out

Expand Down
10 changes: 5 additions & 5 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
# - The latest matching rule, if multiple, takes precedence.

# All of the core team members are global code owners.
* @cmichi @ascjones
* @cmichi @davidsemakula @AlexD10S

# CI
/.github/workflows/ @cmichi @ascjones
/.github/scripts/ @cmichi @ascjones
/.github/download-artifact/ @cmichi @ascjones
/.github/rust-info/ @cmichi @ascjones
/.github/workflows/ @cmichi @davidsemakula @AlexD10S
/.github/scripts/ @cmichi @davidsemakula @AlexD10S
/.github/download-artifact/ @cmichi @davidsemakula @AlexD10S
/.github/rust-info/ @cmichi @davidsemakula @AlexD10S
Loading
Loading