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.

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

Create migration notes in Rust docs for v22 #1248

Merged
merged 28 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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
13 changes: 12 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

complete:
if: always()
needs: [fmt, check-git-rev-deps, semver-checks, build-and-test, docs, readme]
needs: [fmt, check-git-rev-deps, semver-checks, build-and-test, docs, readme, migration-docs]
runs-on: ubuntu-latest
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
Expand Down Expand Up @@ -168,6 +168,17 @@ jobs:
- run: make readme
- run: git add -N . && git diff HEAD --exit-code

migration-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
- run: rustup update
- run: |
version="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "soroban-sdk") | .version | split("\\.";"")[0] | "v"+.')"
git grep "${version}" -- soroban-sdk/src/_migrating.rs \
|| (echo "The _migrating ${version} section is missing." && exit 1)

publish-dry-run:
if: github.event_name == 'push' || startsWith(github.head_ref, 'release/')
strategy:
Expand Down
Binary file added CCW.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export RUSTFLAGS=-Dwarnings
CARGO_DOC_ARGS?=--open

doc: fmt
cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils,hazmat
# cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils,hazmat
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
cargo +nightly-2024-10-10 doc -p soroban-sdk --no-deps --all-features $(CARGO_DOC_ARGS)

Expand Down
223 changes: 223 additions & 0 deletions soroban-sdk/src/_migrating.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
//! # Migrating from v21 to v22
//!
//! 1. [`Env::register`] and [`Env::register_at`] replace [`Env::register_contract`] and [`Env::register_contract_wasm`].
//!
//! [`register`] registers both native contracts previously registered with
//! [`register_contract`] and WASM contracts previously registered with
leighmcculloch marked this conversation as resolved.
Show resolved Hide resolved
//! [`register_contract_wasm`]. It accepts a tuple that is passed to the
//! contracts constructor. Pass `()` if the contract has no constructor.
//!
//! ```
//! use soroban_sdk::{contract, contractimpl, Env};
//!
//! #[contract]
//! pub struct Contract;
//!
//! #[contractimpl]
//! impl Contract {
//! // ..
//! }
//!
//! #[test]
//! fn test() {
//! # }
//! # #[cfg(feature = "testutils")]
//! # fn main() {
//! let env = Env::default();
//! let address = env.register(
//! Contract, // 👈 👀 The contract being registered, or a WASM `&[u8]`.
//! (), // 👈 👀 The constructor arguments, or ().
//! );
//! // ..
//! }
//! # #[cfg(not(feature = "testutils"))]
//! # fn main() { }
//! ```
//!
//! [`register_at`] registers both native contracts previously registered
//! with [`register_contract`] and WASM contracts previously registered with
//! [`register_contract_wasm`], and allows setting the address that the
//! contract is registered at. It accepts a tuple that is passed to the
//! contracts constructor. Pass `()` if the contract has no constructor.
//!
//! ```
//! use soroban_sdk::{contract, contractimpl, Env, testutils::Address as _};
//!
//! #[contract]
//! pub struct Contract;
//!
//! #[contractimpl]
//! impl Contract {
//! pub __constructor(x: u32) { }
//! }
//!
//! #[test]
//! fn test() {
//! # }
//! # #[cfg(feature = "testutils")]
//! # fn main() {
//! let env = Env::default();
//! let address = Address::generate(&env);
//! env.register(
leighmcculloch marked this conversation as resolved.
Show resolved Hide resolved
//! address, // 👈 👀 The address to register the contract at.
//! Contract, // 👈 👀 The contract being registered, or a WASM `&[u8]`.
//! (), // 👈 👀 The constructor arguments, or ().
//! );
//! // ..
//! }
//! # #[cfg(not(feature = "testutils"))]
//! # fn main() { }
//! ```
//!
//! 2. [`DeployerWithAddress::deploy_v2`] replaces [`DeployerWithAddress::deploy`].
//!
//! [`deploy_v2`] is the same as [`deploy`], except it accepts a list of
//! arguments to be passed to the contracts constructor that will be called
//! when it is deployed. For deploying existing contracts that do not have
//! constructors, pass `()`.
//!
//! ```
//! use soroban_sdk::{contract, contractimpl, BytesN, Env};
//!
//! #[contract]
//! pub struct Contract;
//!
//! #[contractimpl]
//! impl Contract {
//! pub fn exec(env: Env, wasm_hash: BytesN<32>) {
//! let salt = [0u8; 32];
//! let deployer = env.deployer().with_current_contract(salt);
//! // Pass `()` for contracts that have no contstructor, or have a
//! // constructor and require no arguments. Pass arguments in a
//! // tuple if any required.
//! let contract_address = deployer.deploy_v2(wasm_hash, ());
//! }
//! }
//!
//! #[test]
//! fn test() {
//! # }
//! # #[cfg(feature = "testutils")]
//! # fn main() {
//! let env = Env::default();
//! let contract_address = env.register(Contract, ());
//! let contract = ContractClient::new(&env, &contract_address);
//! // Upload the contract code before deploying its instance.
//! const WASM: &[u8] = include_bytes!("../doctest_fixtures/contract.wasm");
//! let wasm_hash = env.deployer().upload_contract_wasm(WASM);
//! contract.exec(&wasm_hash);
//! }
//! # #[cfg(not(feature = "testutils"))]
//! # fn main() { }
//! ```
//!
//! 2. Deprecated [`fuzz_catch_panic`]. Use [`Env::try_invoke_contract`] and the `try_` client functions instead.
//!
//! The `fuzz_catch_panic` function could be used in fuzz tests to catch a contract panic. Improved behavior can be found by invoking a contract with the `try_` variant of the invoke function contract clients.
//!
//! ```
//! #![no_main]
//! use libfuzzer_sys::fuzz_target;
//! use soroban_sdk::testutils::arbitrary::*;
//! use soroban_sdk::Env;
//!
//! #[contract]
//! pub struct Contract;
//!
//! #[contracterror]
//! #[derive(Debug, PartialEq)]
//! pub enum Error {
//! Overflow = 1,
//! }
//!
//! #[contractimpl]
//! impl Contract {
//! fn add(x: u32, y: u32) -> Result<(), Self::Error> {
//! x.checked_add(y).ok_or(Error::Overflow)
//! }
//! }
//!
//! #[derive(Arbitrary, Debug)]
//! pub struct Input {
//! pub x: u32,
//! pub y: u32,
//! }
//!
//! fuzz_target!(|input: Input| {
//! let env = Env::default();
//! let id = env.register(Contract, ());
//! let client = ContractClient::new(&env, &id);
//!
//! let result = client.try_add(&input.x, &input.y);
//! match result {
//! // Returned if the function succeeds, and the value returned is
//! // the type expected.
//! Ok(Ok(())) => {}
//! // Returned if the function succeeds, and the value returned is
//! // NOT the type expected.
//! Ok(Err(_)) => panic!("unexpected type"),
//! // Returned if the function fails, and the error returned is
//! // recognised as part of the contract errors enum.
//! Err(Ok(_)) => {}
//! // Returned if the function fails, and the error returned is NOT
//! // recognised, or the contract panic'd.
//! Err(Err(_)) => panic!("unexpected error"),
//! }
//! });
//! ```
//!
//! 3. Events in test snapshots are now reduced to only contract events and system events. Diagnostic events will no longer appear in test snapshots.
//!
//! This will cause all test snapshots to change when upgrading to this major version of the SDK. The change should be isolated to events and should omit only diagnostic events.
//!
//! [`Env::register`]: crate::Env::register
//! [`register`]: crate::Env::register
//! [`Env::register_at`]: crate::Env::register_at
//! [`register_at`]: crate::Env::register_at
//! [`Env::register_contract`]: crate::Env::register_contract
//! [`register_contract`]: crate::Env::register_contract
//! [`Env::register_contract_wasm`]: crate::Env::register_contract_wasm
//! [`register_contract_wasm`]: crate::Env::register_contract_wasm
//! [`DeployerWithAddress::deploy_v2`]: crate::deploy::DeployerWithAddress::deploy_v2
//! [`deploy_v2`]: crate::deploy::DeployerWithAddress::deploy_v2
//! [`DeployerWithAddress::deploy`]: crate::deploy::DeployerWithAddress::deploy
//! [`deploy`]: crate::deploy::DeployerWithAddress::deploy
//! [`fuzz_catch_panic`]: crate::testutils::arbitrary::fuzz_catch_panic
//! [`Env::try_invoke_contract`]: crate::Env::try_invoke_contract
//!
//! # Migrating from v20 to v21
//!
//! 1. [`CustomAccountInterface::__check_auth`] function `signature_payload` parameter changes from type [`BytesN<32>`] to [`Hash<32>`].
//!
//! The two types are interchangeable. [`Hash<32>`] contains a [`BytesN<32>`] and can only be constructed in contexts where the value has been generated by a secure cryptographic function.
//!
//! To convert from a [`Hash<32>`] to a [`BytesN<32>`], use [`Hash<32>::to_bytes`] or [`Into::into`].
//!
//! Current implementations of the interface will see a build error, and should change [`BytesN<32>`] to [`Hash<32>`].
//!
//! ```
//! use soroban_sdk::auth::CustomAccountInterface;
//!
//! #[contract]
//! pub struct Contract;
//!
//! #[contractimpl]
//! impl CustomAccountInterface for Contract {
//! type Signature = ();
//! type Error: Into<Error> = u32;
//!
//! fn __check_auth(
//! env: Env,
//! signature_payload: Hash<32>, // 👈 👀
//! signatures: Self::Signature,
//! auth_contexts: Vec<Context>,
//! ) -> Result<(), Self::Error> {
//! // ...
//! }
//! }
//! ```
//!
//! [`CustomAccountInterface::__check_auth`]: crate::auth::CustomAccountInterface::__check_auth
//! [`BytesN<32>`]: crate::BytesN
//! [`Hash<32>`]: crate::crypto::Hash
//! [`Hash<32>::to_bytes`]: crate::crypto::Hash::to_bytes
3 changes: 3 additions & 0 deletions soroban-sdk/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
#![cfg_attr(feature = "docs", feature(doc_cfg))]
#![allow(dead_code)]

#[cfg(feature = "docs")]
pub mod _migrating;

#[cfg(all(target_family = "wasm", feature = "testutils"))]
compile_error!("'testutils' feature is not supported on 'wasm' target");

Expand Down
Loading