From 34865d032caef769b04f2c2c99395d431596fd83 Mon Sep 17 00:00:00 2001 From: Dmitri Makarov Date: Fri, 28 Oct 2022 14:30:31 -0400 Subject: [PATCH] chore: update Solana docs and code comments that specify "BPF" to "SBF" --- cli/src/program.rs | 4 +-- core/src/qos_service.rs | 2 +- docs/art/sdk-tools.bob | 4 +-- docs/src/cluster/bench-tps.md | 2 +- .../src/developing/backwards-compatibility.md | 2 +- docs/src/developing/clients/jsonrpc-api.md | 2 +- docs/src/developing/clients/rust-api.md | 2 +- docs/src/developing/intro/programs.md | 2 +- .../developing/on-chain-programs/debugging.md | 16 +++++----- .../developing/on-chain-programs/deploying.md | 2 +- .../on-chain-programs/developing-rust.md | 14 ++++----- docs/src/developing/on-chain-programs/faq.md | 2 +- .../developing/on-chain-programs/overview.md | 18 +++++------ .../developing/programming-model/accounts.md | 2 +- .../developing/programming-model/runtime.md | 8 ++--- .../programming-model/transactions.md | 4 +-- docs/src/history.md | 2 +- .../instruction_introspection.md | 2 +- .../proposals/comprehensive-compute-fees.md | 2 +- docs/src/proposals/embedding-move.md | 2 +- docs/src/proposals/return-data.md | 8 ++--- genesis/src/main.rs | 2 +- ledger/src/builtins.rs | 4 +-- merkle-tree/Cargo.toml | 2 +- program-runtime/src/compute_budget.rs | 4 +-- program-test/src/lib.rs | 30 +++++++++---------- programs/bpf_loader/src/lib.rs | 6 ++-- programs/bpf_loader/src/serialization.rs | 2 +- programs/bpf_loader/src/syscalls/mod.rs | 16 +++++----- .../test_elfs/src/noop_aligned/noop_aligned.c | 2 +- .../src/noop_unaligned/noop_unaligned.c | 2 +- programs/sbf/rust/128bit_dep/Cargo.toml | 2 +- programs/sbf/rust/alloc/Cargo.toml | 2 +- programs/sbf/rust/alloc/src/lib.rs | 2 +- programs/sbf/rust/call_depth/Cargo.toml | 2 +- programs/sbf/rust/call_depth/src/lib.rs | 2 +- programs/sbf/rust/caller_access/Cargo.toml | 2 +- programs/sbf/rust/curve25519/Cargo.toml | 2 +- programs/sbf/rust/custom_heap/Cargo.toml | 2 +- programs/sbf/rust/custom_heap/src/lib.rs | 2 +- programs/sbf/rust/dep_crate/Cargo.toml | 2 +- programs/sbf/rust/dep_crate/src/lib.rs | 2 +- .../sbf/rust/deprecated_loader/Cargo.toml | 2 +- .../sbf/rust/deprecated_loader/src/lib.rs | 2 +- programs/sbf/rust/dup_accounts/Cargo.toml | 2 +- programs/sbf/rust/dup_accounts/src/lib.rs | 2 +- programs/sbf/rust/error_handling/Cargo.toml | 2 +- programs/sbf/rust/error_handling/src/lib.rs | 2 +- programs/sbf/rust/external_spend/Cargo.toml | 2 +- programs/sbf/rust/external_spend/src/lib.rs | 2 +- programs/sbf/rust/finalize/Cargo.toml | 2 +- programs/sbf/rust/finalize/src/lib.rs | 2 +- .../rust/get_minimum_delegation/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 2 +- .../rust/instruction_introspection/Cargo.toml | 2 +- .../rust/instruction_introspection/src/lib.rs | 2 +- programs/sbf/rust/invoke/Cargo.toml | 2 +- programs/sbf/rust/invoke/src/instructions.rs | 2 +- programs/sbf/rust/invoke/src/lib.rs | 2 +- programs/sbf/rust/invoke/src/processor.rs | 2 +- programs/sbf/rust/invoke_and_error/Cargo.toml | 2 +- programs/sbf/rust/invoke_and_ok/Cargo.toml | 2 +- .../sbf/rust/invoke_and_return/Cargo.toml | 2 +- programs/sbf/rust/invoked/Cargo.toml | 2 +- programs/sbf/rust/invoked/src/instructions.rs | 2 +- programs/sbf/rust/invoked/src/lib.rs | 2 +- programs/sbf/rust/invoked/src/processor.rs | 2 +- programs/sbf/rust/iter/Cargo.toml | 2 +- programs/sbf/rust/iter/src/lib.rs | 2 +- programs/sbf/rust/log_data/Cargo.toml | 2 +- programs/sbf/rust/log_data/src/lib.rs | 2 +- programs/sbf/rust/many_args/Cargo.toml | 2 +- programs/sbf/rust/many_args/src/helper.rs | 2 +- programs/sbf/rust/many_args/src/lib.rs | 2 +- programs/sbf/rust/many_args_dep/Cargo.toml | 2 +- programs/sbf/rust/many_args_dep/src/lib.rs | 2 +- programs/sbf/rust/mem/Cargo.toml | 2 +- programs/sbf/rust/membuiltins/Cargo.toml | 2 +- programs/sbf/rust/noop/Cargo.toml | 2 +- programs/sbf/rust/noop/src/lib.rs | 2 +- programs/sbf/rust/panic/Cargo.toml | 2 +- programs/sbf/rust/panic/src/lib.rs | 2 +- programs/sbf/rust/param_passing/Cargo.toml | 2 +- programs/sbf/rust/param_passing/src/lib.rs | 2 +- .../sbf/rust/param_passing_dep/Cargo.toml | 2 +- .../sbf/rust/param_passing_dep/src/lib.rs | 2 +- programs/sbf/rust/rand/Cargo.toml | 2 +- programs/sbf/rust/rand/src/lib.rs | 2 +- programs/sbf/rust/realloc/Cargo.toml | 2 +- programs/sbf/rust/realloc/src/instructions.rs | 2 +- programs/sbf/rust/realloc/src/lib.rs | 2 +- programs/sbf/rust/realloc/src/processor.rs | 2 +- programs/sbf/rust/realloc_invoke/Cargo.toml | 2 +- .../rust/realloc_invoke/src/instructions.rs | 2 +- programs/sbf/rust/realloc_invoke/src/lib.rs | 2 +- .../sbf/rust/realloc_invoke/src/processor.rs | 2 +- .../sbf/rust/ro_account_modify/Cargo.toml | 2 +- programs/sbf/rust/ro_modify/Cargo.toml | 2 +- programs/sbf/rust/sanity/Cargo.toml | 2 +- programs/sbf/rust/sanity/src/lib.rs | 2 +- .../sbf/rust/secp256k1_recover/Cargo.toml | 2 +- programs/sbf/rust/sha/Cargo.toml | 2 +- .../rust/sibling_inner_instruction/Cargo.toml | 2 +- .../rust/sibling_inner_instruction/src/lib.rs | 2 +- .../sbf/rust/sibling_instruction/Cargo.toml | 2 +- .../sbf/rust/sibling_instruction/src/lib.rs | 2 +- programs/sbf/rust/simulation/Cargo.toml | 2 +- programs/sbf/rust/spoof1/Cargo.toml | 2 +- programs/sbf/rust/spoof1_system/Cargo.toml | 2 +- programs/sbf/rust/sysvar/Cargo.toml | 2 +- programs/sbf/rust/sysvar/src/lib.rs | 2 +- programs/sbf/rust/upgradeable/Cargo.toml | 2 +- programs/sbf/rust/upgradeable/src/lib.rs | 2 +- programs/sbf/rust/upgraded/Cargo.toml | 2 +- programs/sbf/rust/upgraded/src/lib.rs | 2 +- rbpf-cli/Cargo.toml | 4 +-- rbpf-cli/src/main.rs | 6 ++-- runtime/src/block_cost_limits.rs | 2 +- sdk/macro/src/lib.rs | 2 +- sdk/program/src/borsh.rs | 2 +- sdk/program/src/program_memory.rs | 12 ++++---- sdk/program/src/program_option.rs | 10 ------- sdk/program/src/program_stubs.rs | 2 +- sdk/program/src/secp256k1_recover.rs | 8 ++--- sdk/program/src/syscalls/mod.rs | 2 +- sdk/program/src/sysvar/mod.rs | 2 +- sdk/src/feature_set.rs | 4 +-- test-validator/src/lib.rs | 4 +-- validator/src/bin/solana-test-validator.rs | 6 ++-- validator/src/main.rs | 2 +- web3.js/README.md | 2 +- web3.js/src/bpf-loader.ts | 4 +-- web3.js/test/connection-subscriptions.test.ts | 2 +- web3.js/test/fixtures/noop-program/Cargo.toml | 2 +- web3.js/test/fixtures/noop-program/src/lib.rs | 2 +- 136 files changed, 206 insertions(+), 216 deletions(-) diff --git a/cli/src/program.rs b/cli/src/program.rs index 19876bdf96..8d60c5064a 100644 --- a/cli/src/program.rs +++ b/cli/src/program.rs @@ -1398,7 +1398,7 @@ fn process_show( .into()) } } else { - Err(format!("{} is not a BPF program", account_pubkey).into()) + Err(format!("{} is not an SBF program", account_pubkey).into()) } } else { Err(format!("Unable to find the account {}", account_pubkey).into()) @@ -1468,7 +1468,7 @@ fn process_dump( .into()) } } else { - Err(format!("{} is not a BPF program", account_pubkey).into()) + Err(format!("{} is not an SBF program", account_pubkey).into()) } } else { Err(format!("Unable to find the account {}", account_pubkey).into()) diff --git a/core/src/qos_service.rs b/core/src/qos_service.rs index 9b54e2a302..4c22096c18 100644 --- a/core/src/qos_service.rs +++ b/core/src/qos_service.rs @@ -392,7 +392,7 @@ struct QosServiceMetricsStats { /// accumulated estimated builtin programs Compute Units to be packed into block estimated_builtins_execute_cu: AtomicU64, - /// accumulated estimated BPF program Compute Units to be packed into block + /// accumulated estimated SBF program Compute Units to be packed into block estimated_bpf_execute_cu: AtomicU64, /// accumulated actual program Compute Units that have been packed into block diff --git a/docs/art/sdk-tools.bob b/docs/art/sdk-tools.bob index 3687a4b503..64c1affee6 100644 --- a/docs/art/sdk-tools.bob +++ b/docs/art/sdk-tools.bob @@ -3,7 +3,7 @@ | Solana Runtime | | | .----------. | .------------. .------------. | - | Program | | | BPF | | Executable | | + | Program | | | SBF | | Executable | | | Author +------>| Bytecode +-->| Account | | | | | | Verifier | | | | `----------` | `------------` `------------` | @@ -12,7 +12,7 @@ | | LoadAccounts | | V | .----------. | .------------. .-------------. | - | | | | BPF | | BPF | | + | | | | SBF | | SBF | | | Client +------>| Loader +-->| Interpreter | | | | | | | | | | `----------` | `------------` `-------------` | diff --git a/docs/src/cluster/bench-tps.md b/docs/src/cluster/bench-tps.md index e5b805fcd8..2f28878e0b 100644 --- a/docs/src/cluster/bench-tps.md +++ b/docs/src/cluster/bench-tps.md @@ -99,7 +99,7 @@ For example export RUST_LOG=solana=info,solana::banking_stage=debug ``` -- To enable BPF program logging: +- To enable SBF program logging: ```bash export RUST_LOG=solana_bpf_loader=trace diff --git a/docs/src/developing/backwards-compatibility.md b/docs/src/developing/backwards-compatibility.md index 769fbba8fa..ce60557b12 100644 --- a/docs/src/developing/backwards-compatibility.md +++ b/docs/src/developing/backwards-compatibility.md @@ -24,7 +24,7 @@ and so this document attempts to clarify and codify the process for new releases ### Release Cadence -The Solana RPC API, Rust SDK, CLI tooling, and BPF Program SDK are all updated and shipped +The Solana RPC API, Rust SDK, CLI tooling, and SBF Program SDK are all updated and shipped along with each Solana software release and should always be compatible between `PATCH` updates of a particular `MINOR` version release. diff --git a/docs/src/developing/clients/jsonrpc-api.md b/docs/src/developing/clients/jsonrpc-api.md index 02cde1f610..4a66236b98 100644 --- a/docs/src/developing/clients/jsonrpc-api.md +++ b/docs/src/developing/clients/jsonrpc-api.md @@ -4160,7 +4160,7 @@ Example: "signature": "5h6xBEauJ3PK6SWCZ1PGjBvj8vDdWG3KpwATGy1ARAXFSDwt8GFXM7W5Ncn16wmqokgpiKRLuS83KUxyZyv2sUYv", "err": null, "logs": [ - "BPF program 83astBRguLMdt2h5U1Tpdq5tjFoJ6noeGwaY3mDLVcri success" + "SBF program 83astBRguLMdt2h5U1Tpdq5tjFoJ6noeGwaY3mDLVcri success" ] } }, diff --git a/docs/src/developing/clients/rust-api.md b/docs/src/developing/clients/rust-api.md index 6deaf81443..25e99ae160 100644 --- a/docs/src/developing/clients/rust-api.md +++ b/docs/src/developing/clients/rust-api.md @@ -11,7 +11,7 @@ Solana's Rust crates are [published to crates.io][crates.io] and can be found Some important crates: - [`solana-program`] — Imported by programs running on Solana, compiled - to BPF. This crate contains many fundamental data types and is re-exported from + to SBF. This crate contains many fundamental data types and is re-exported from [`solana-sdk`], which cannot be imported from a Solana program. - [`solana-sdk`] — The basic off-chain SDK, it re-exports diff --git a/docs/src/developing/intro/programs.md b/docs/src/developing/intro/programs.md index 7c0eb737f4..d5b72ed54a 100644 --- a/docs/src/developing/intro/programs.md +++ b/docs/src/developing/intro/programs.md @@ -14,7 +14,7 @@ Both types of programs run on top of the [Sealevel runtime](https://medium.com/s - Programs can own other Accounts - Programs can only _change the data_ or _debit_ accounts they own - Any program can _read_ or _credit_ another account -- Programs are considered stateless since the primary data stored in a program account is the compiled BPF code +- Programs are considered stateless since the primary data stored in a program account is the compiled SBF code - Programs can be upgraded by their owner (see more on that below) ## Types of programs diff --git a/docs/src/developing/on-chain-programs/debugging.md b/docs/src/developing/on-chain-programs/debugging.md index d673ab23a3..b2262c4bb6 100644 --- a/docs/src/developing/on-chain-programs/debugging.md +++ b/docs/src/developing/on-chain-programs/debugging.md @@ -43,15 +43,15 @@ limited but there are many points of possible failures. The following are possible failure points and information about what errors to expect and where to get more information: -- The BPF loader may fail to parse the program, this should not happen since the +- The SBF loader may fail to parse the program, this should not happen since the loader has already _finalized_ the program's account data. - `InstructionError::InvalidAccountData` will be returned as part of the transaction error. -- The BPF loader may fail to setup the program's execution environment +- The SBF loader may fail to setup the program's execution environment - `InstructionError::Custom(0x0b9f_0001)` will be returned as part of the transaction error. "0x0b9f_0001" is the hexadecimal representation of [`VirtualMachineCreationFailed`](https://github.com/solana-labs/solana/blob/bc7133d7526a041d1aaee807b80922baa89b6f90/programs/bpf_loader/src/lib.rs#L44). -- The BPF loader may have detected a fatal error during program executions +- The SBF loader may have detected a fatal error during program executions (things like panics, memory violations, system call errors, etc...) - `InstructionError::Custom(0x0b9f_0002)` will be returned as part of the transaction error. "0x0b9f_0002" is the hexadecimal representation of @@ -71,7 +71,7 @@ logs](debugging.md#logging). For example, an access violation involving the stack will look something like this: -`BPF program 4uQeVj5tqViQh7yWWGStvkEG1Zmhx6uasJtWCJziofM failed: out of bounds memory store (insn #615), addr 0x200001e38/8` +`SBF program 4uQeVj5tqViQh7yWWGStvkEG1Zmhx6uasJtWCJziofM failed: out of bounds memory store (insn #615), addr 0x200001e38/8` ## Monitoring Compute Budget Consumption @@ -89,7 +89,7 @@ for more information. ## ELF Dump -The BPF shared object internals can be dumped to a text file to gain more +The SBF shared object internals can be dumped to a text file to gain more insight into a program's composition and what it may be doing at runtime. - [Create a dump file of a Rust program](developing-rust.md#elf-dump) @@ -97,14 +97,14 @@ insight into a program's composition and what it may be doing at runtime. ## Instruction Tracing -During execution the runtime BPF interpreter can be configured to log a trace -message for each BPF instruction executed. This can be very helpful for things +During execution the runtime SBF interpreter can be configured to log a trace +message for each SBF instruction executed. This can be very helpful for things like pin-pointing the runtime context leading up to a memory access violation. The trace logs together with the [ELF dump](#elf-dump) can provide a lot of insight (though the traces produce a lot of information). -To turn on BPF interpreter trace messages in a local cluster configure the +To turn on SBF interpreter trace messages in a local cluster configure the `solana_rbpf` level in `RUST_LOG` to `trace`. For example: `export RUST_LOG=solana_rbpf=trace` diff --git a/docs/src/developing/on-chain-programs/deploying.md b/docs/src/developing/on-chain-programs/deploying.md index 852e8a195f..2c41a8e307 100644 --- a/docs/src/developing/on-chain-programs/deploying.md +++ b/docs/src/developing/on-chain-programs/deploying.md @@ -5,7 +5,7 @@ title: "Deploying Programs" ![SDK tools](/img/sdk-tools.svg) As shown in the diagram above, a program author creates a program, compiles it -to an ELF shared object containing BPF bytecode, and uploads it to the Solana +to an ELF shared object containing SBF bytecode, and uploads it to the Solana cluster with a special _deploy_ transaction. The cluster makes it available to clients via a _program ID_. The program ID is an _address_ specified when deploying and is used to reference the program in subsequent transactions. diff --git a/docs/src/developing/on-chain-programs/developing-rust.md b/docs/src/developing/on-chain-programs/developing-rust.md index b6406902b3..537a089ce4 100644 --- a/docs/src/developing/on-chain-programs/developing-rust.md +++ b/docs/src/developing/on-chain-programs/developing-rust.md @@ -39,14 +39,14 @@ using the `no-entrypoint` feature. At a minimum, Solana Rust programs must pull in the [solana-program](https://crates.io/crates/solana-program) crate. -Solana BPF programs have some [restrictions](#restrictions) that may prevent the +Solana SBF programs have some [restrictions](#restrictions) that may prevent the inclusion of some crates as dependencies or require special handling. For example: - Crates that require the architecture be a subset of the ones supported by the official toolchain. There is no workaround for this unless that crate is - forked and BPF added to that those architecture checks. + forked and SBF added to that those architecture checks. - Crates may depend on `rand` which is not supported in Solana's deterministic program environment. To include a `rand` dependent crate refer to [Depending on Rand](#depending-on-rand). @@ -68,7 +68,7 @@ machine which can be used for unit testing: $ cargo build ``` -To build a specific program, such as SPL Token, for the Solana BPF target which +To build a specific program, such as SPL Token, for the Solana SBF target which can be deployed to the cluster: ```bash @@ -305,12 +305,12 @@ Rust's `panic!`, `assert!`, and internal panic results are printed to the ``` INFO solana_runtime::message_processor] Finalized account CGLhHSuWsp1gT4B7MY2KACqp9RUwQRhcUFfVSuxpSajZ -INFO solana_runtime::message_processor] Call BPF program CGLhHSuWsp1gT4B7MY2KACqp9RUwQRhcUFfVSuxpSajZ +INFO solana_runtime::message_processor] Call SBF program CGLhHSuWsp1gT4B7MY2KACqp9RUwQRhcUFfVSuxpSajZ INFO solana_runtime::message_processor] Program log: Panicked at: 'assertion failed: `(left == right)` left: `1`, right: `2`', rust/panic/src/lib.rs:22:5 -INFO solana_runtime::message_processor] BPF program consumed 5453 of 200000 units -INFO solana_runtime::message_processor] BPF program CGLhHSuWsp1gT4B7MY2KACqp9RUwQRhcUFfVSuxpSajZ failed: BPF program panicked +INFO solana_runtime::message_processor] SBF program consumed 5453 of 200000 units +INFO solana_runtime::message_processor] SBF program CGLhHSuWsp1gT4B7MY2KACqp9RUwQRhcUFfVSuxpSajZ failed: BPF program panicked ``` ### Custom Panic Handler @@ -369,7 +369,7 @@ for more information. ## ELF Dump -The BPF shared object internals can be dumped to a text file to gain more +The SBF shared object internals can be dumped to a text file to gain more insight into a program's composition and what it may be doing at runtime. The dump will contain both the ELF information as well as a list of all the symbols and the instructions that implement them. Some of the BPF loader's error log diff --git a/docs/src/developing/on-chain-programs/faq.md b/docs/src/developing/on-chain-programs/faq.md index 072065e548..61d2515a5c 100644 --- a/docs/src/developing/on-chain-programs/faq.md +++ b/docs/src/developing/on-chain-programs/faq.md @@ -18,7 +18,7 @@ Depth](developing/programming-model/calling-between-programs.md#call-depth) ## `CallDepthExceeded` error -This error means the BPF stack depth was exceeded. +This error means the SBF stack depth was exceeded. See [call depth](overview.md#call-depth) diff --git a/docs/src/developing/on-chain-programs/overview.md b/docs/src/developing/on-chain-programs/overview.md index cf10b6da4c..ea2cf2fe31 100644 --- a/docs/src/developing/on-chain-programs/overview.md +++ b/docs/src/developing/on-chain-programs/overview.md @@ -26,7 +26,7 @@ native instructions. ## Memory map -The virtual address memory map used by Solana BPF programs is fixed and laid out +The virtual address memory map used by Solana SBF programs is fixed and laid out as follows - Program code starts at 0x100000000 @@ -42,7 +42,7 @@ the attempted violation. ## Stack -BPF uses stack frames instead of a variable stack pointer. Each stack frame is +SBF uses stack frames instead of a variable stack pointer. Each stack frame is 4KB in size. If a program violates that stack frame size, the compiler will report the @@ -67,7 +67,7 @@ crates may include functionality that violates the stack frame restrictions even if the program doesn't use that functionality. If the program violates the stack size at runtime, an `AccessViolation` error will be reported. -BPF stack frames occupy a virtual address range starting at 0x200000000. +SBF stack frames occupy a virtual address range starting at 0x200000000. ## Call Depth @@ -126,7 +126,7 @@ added to support writable data. ## Signed division -The BPF instruction set does not support [signed +The SBF instruction set does not support [signed division](https://www.kernel.org/doc/html/latest/bpf/bpf_design_QA.html#q-why-there-is-no-bpf-sdiv-for-signed-divide-operation). Adding a signed division instruction is a consideration. @@ -156,19 +156,19 @@ loader see: ### Deployment -BPF program deployment is the process of uploading a BPF shared object into a +SBF program deployment is the process of uploading a BPF shared object into a program account's data and marking the account executable. A client breaks the -BPF shared object into smaller pieces and sends them as the instruction data of +SBF shared object into smaller pieces and sends them as the instruction data of [`Write`](https://github.com/solana-labs/solana/blob/bc7133d7526a041d1aaee807b80922baa89b6f90/sdk/program/src/loader_instruction.rs#L13) instructions to the loader where loader writes that data into the program's account data. Once all the pieces are received the client sends a [`Finalize`](https://github.com/solana-labs/solana/blob/bc7133d7526a041d1aaee807b80922baa89b6f90/sdk/program/src/loader_instruction.rs#L30) -instruction to the loader, the loader then validates that the BPF data is valid +instruction to the loader, the loader then validates that the SBF data is valid and marks the program account as _executable_. Once the program account is marked executable, subsequent transactions may issue instructions for that program to process. -When an instruction is directed at an executable BPF program the loader +When an instruction is directed at an executable SBF program the loader configures the program's execution environment, serializes the program's input parameters, calls the program's entrypoint, and reports any errors encountered. @@ -176,7 +176,7 @@ For further information see [deploying](deploying.md) ### Input Parameter Serialization -BPF loaders serialize the program input parameters into a byte array that is +SBF loaders serialize the program input parameters into a byte array that is then passed to the program's entrypoint, where the program is responsible for deserializing it on-chain. One of the changes between the deprecated loader and the current loader is that the input parameters are serialized in a way that diff --git a/docs/src/developing/programming-model/accounts.md b/docs/src/developing/programming-model/accounts.md index 67aa96ad01..84e32017e6 100644 --- a/docs/src/developing/programming-model/accounts.md +++ b/docs/src/developing/programming-model/accounts.md @@ -45,7 +45,7 @@ If an account is marked "executable" in its metadata, then it is considered a program which can be executed by including the account's public key in an instruction's [program id](transactions.md#program-id). Accounts are marked as executable during a successful program deployment process by the loader that -owns the account. When a program is deployed to the execution engine (BPF deployment), +owns the account. When a program is deployed to the execution engine (SBF deployment), the loader determines that the bytecode in the account's data is valid. If so, the loader permanently marks the program account as executable. diff --git a/docs/src/developing/programming-model/runtime.md b/docs/src/developing/programming-model/runtime.md index 301427445a..838c371de6 100644 --- a/docs/src/developing/programming-model/runtime.md +++ b/docs/src/developing/programming-model/runtime.md @@ -52,14 +52,14 @@ the transaction may perform, and operational bounds the transaction must adhere to. As the transaction is processed compute units are consumed by its -instruction's programs performing operations such as executing BPF instructions, +instruction's programs performing operations such as executing SBF instructions, calling syscalls, etc... When the transaction consumes its entire budget, or exceeds a bound such as attempting a call stack that is too deep, the runtime halts the transaction processing and returns an error. The following operations incur a compute cost: -- Executing BPF instructions +- Executing SBF instructions - Passing data between programs - Calling system calls - logging @@ -94,9 +94,9 @@ log_pubkey_units: 100, Then any transaction: -- Could execute 1,400,000 BPF instructions, if it did nothing else. +- Could execute 1,400,000 SBF instructions, if it did nothing else. - Cannot exceed 4k of stack usage. -- Cannot exceed a BPF call depth of 64. +- Cannot exceed a SBF call depth of 64. - Cannot exceed invoke stack height of 5 (4 levels of cross-program invocations). > **NOTE:** Since the compute budget is consumed incrementally as the transaction executes, diff --git a/docs/src/developing/programming-model/transactions.md b/docs/src/developing/programming-model/transactions.md index 42e6ca2d23..096e53c568 100644 --- a/docs/src/developing/programming-model/transactions.md +++ b/docs/src/developing/programming-model/transactions.md @@ -133,8 +133,8 @@ program will process this instruction. The program's account's owner specifies which loader should be used to load and execute the program, and the data contains information about how the runtime should execute the program. -In the case of [on-chain BPF programs](developing/on-chain-programs/overview.md), -the owner is the BPF Loader and the account data holds the BPF bytecode. Program +In the case of [on-chain SBF programs](developing/on-chain-programs/overview.md), +the owner is the SBF Loader and the account data holds the BPF bytecode. Program accounts are permanently marked as executable by the loader once they are successfully deployed. The runtime will reject transactions that specify programs that are not executable. diff --git a/docs/src/history.md b/docs/src/history.md index b4ea570d90..a3fd7a7c11 100644 --- a/docs/src/history.md +++ b/docs/src/history.md @@ -57,4 +57,4 @@ testnet running 150 nodes on a gigabit network and demonstrated soak tests processing an _average_ of 200 thousand transactions per second with bursts over 500 thousand. The project was also extended to support on-chain programs written in the C programming language and run concurrently in a safe execution -environment called BPF. +environment called SBF. diff --git a/docs/src/implemented-proposals/instruction_introspection.md b/docs/src/implemented-proposals/instruction_introspection.md index e0f122f90d..abed2a40d2 100644 --- a/docs/src/implemented-proposals/instruction_introspection.md +++ b/docs/src/implemented-proposals/instruction_introspection.md @@ -25,4 +25,4 @@ for it and also write the current instruction index and then the bpf program can necessary information from there. Note: custom serialization of instructions is used because bincode is about 10x slower -in native code and exceeds current BPF instruction limits. +in native code and exceeds current SBF instruction limits. diff --git a/docs/src/proposals/comprehensive-compute-fees.md b/docs/src/proposals/comprehensive-compute-fees.md index aa41cdb5cd..79e92b7b9c 100644 --- a/docs/src/proposals/comprehensive-compute-fees.md +++ b/docs/src/proposals/comprehensive-compute-fees.md @@ -50,7 +50,7 @@ A fee could be calculated based on: requested amount. After processing, the actual number of units consumed will be known, and the payer will be refunded the difference, so the payer only pays for what they used. Builtin programs will have a fixed cost - while BPF program's cost will be measured at runtime. + while SBF program's cost will be measured at runtime. 6. Precompiled programs - Precompiled programs are performing compute-intensive operations. The work incurred by a precompiled program is predictable based on the instruction's diff --git a/docs/src/proposals/embedding-move.md b/docs/src/proposals/embedding-move.md index 9826220f5c..13c352f19a 100644 --- a/docs/src/proposals/embedding-move.md +++ b/docs/src/proposals/embedding-move.md @@ -34,4 +34,4 @@ All data accounts owned by Move modules must set their owners to the loader, `MO ### Interacting with Solana programs -To invoke instructions in non-Move programs, Solana would need to extend the Move VM with a `process_instruction()` system call. It would work the same as `process_instruction()` Rust BPF programs. +To invoke instructions in non-Move programs, Solana would need to extend the Move VM with a `process_instruction()` system call. It would work the same as `process_instruction()` Rust SBF programs. diff --git a/docs/src/proposals/return-data.md b/docs/src/proposals/return-data.md index d62d4b9333..93a546103f 100644 --- a/docs/src/proposals/return-data.md +++ b/docs/src/proposals/return-data.md @@ -1,4 +1,4 @@ -# Return data from BPF programs +# Return data from SBF programs ## Problem @@ -44,7 +44,7 @@ block, any of these would cause the transaction or rpc to fail. ## Existing solution The existing solution that Solang uses, writes the return data to the callee account data. -The caller's account cannot be used, since the callee may not be the same BPF program, so +The caller's account cannot be used, since the callee may not be the same SBF program, so it will not have permission to write to the callee's account data. Another solution would be to have a single return data account which is passed @@ -136,9 +136,9 @@ strings in the [stable log](https://github.com/solana-labs/solana/blob/952928419 Solidity on Ethereum allows the contract to return an error in the return data. In this case, all the account data changes for the account should be reverted. On Solana, any non-zero exit code -for a BPF prorgram means the entire transaction fails. We do not wish to support an error return +for a SBF prorgram means the entire transaction fails. We do not wish to support an error return by returning success and then returning an error in the return data. This would mean we would have -to support reverting the account data changes; this too expensive both on the VM side and the BPF +to support reverting the account data changes; this too expensive both on the VM side and the SBF contract side. Errors will be reported via sol_log. diff --git a/genesis/src/main.rs b/genesis/src/main.rs index 8f61039810..d1f8e2a35c 100644 --- a/genesis/src/main.rs +++ b/genesis/src/main.rs @@ -374,7 +374,7 @@ fn main() -> Result<(), Box> { .takes_value(true) .number_of_values(3) .multiple(true) - .help("Install a BPF program at the given address"), + .help("Install a SBF program at the given address"), ) .arg( Arg::with_name("inflation") diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs index 64a2e46483..d8a9ffa37e 100644 --- a/ledger/src/builtins.rs +++ b/ledger/src/builtins.rs @@ -8,13 +8,13 @@ macro_rules! to_builtin { /// Builtin programs that are always available fn genesis_builtins(bpf_jit: bool) -> Vec { - // Currently JIT is not supported on the BPF VM: + // Currently JIT is not supported on the SBF VM: // !x86_64: https://github.com/qmonnet/rbpf/issues/48 // Windows: https://github.com/solana-labs/rbpf/issues/217 #[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))] let bpf_jit = { if bpf_jit { - info!("BPF JIT is not supported on this target"); + info!("SBF JIT is not supported on this target"); } false }; diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml index 58fda57133..ce51c86c02 100644 --- a/merkle-tree/Cargo.toml +++ b/merkle-tree/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" fast-math = "0.1" solana-program = { path = "../sdk/program", version = "=1.15.0" } -# This can go once the BPF toolchain target Rust 1.42.0+ +# This can go once the SBF toolchain target Rust 1.42.0+ [target.bpfel-unknown-unknown.dependencies] matches = "0.1.9" diff --git a/program-runtime/src/compute_budget.rs b/program-runtime/src/compute_budget.rs index 01ee899614..f196f493d2 100644 --- a/program-runtime/src/compute_budget.rs +++ b/program-runtime/src/compute_budget.rs @@ -48,9 +48,9 @@ pub struct ComputeBudget { pub sha256_byte_cost: u64, /// Maximum number of slices hashed per syscall pub sha256_max_slices: u64, - /// Maximum BPF to BPF call depth + /// Maximum SBF to BPF call depth pub max_call_depth: usize, - /// Size of a stack frame in bytes, must match the size specified in the LLVM BPF backend + /// Size of a stack frame in bytes, must match the size specified in the LLVM SBF backend pub stack_frame_size: usize, /// Number of compute units consumed by logging a `Pubkey` pub log_pubkey_units: u64, diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs index 990d4d203c..b5dc801a76 100644 --- a/program-test/src/lib.rs +++ b/program-test/src/lib.rs @@ -1,4 +1,4 @@ -//! The solana-program-test provides a BanksClient-based test framework BPF programs +//! The solana-program-test provides a BanksClient-based test framework SBF programs #![allow(clippy::integer_arithmetic)] // Export tokio for test clients @@ -117,7 +117,7 @@ pub fn builtin_process_instruction( // Copy indices_in_instruction into a HashSet to ensure there are no duplicates let deduplicated_indices: HashSet = instruction_account_indices.collect(); - // Serialize entrypoint parameters with BPF ABI + // Serialize entrypoint parameters with SBF ABI let (mut parameter_bytes, _regions, _account_lengths) = serialize_parameters( invoke_context.transaction_context, invoke_context @@ -423,7 +423,7 @@ fn default_shared_object_dirs() -> Vec { if let Ok(dir) = std::env::current_dir() { search_path.push(dir); } - trace!("BPF .so search path: {:?}", search_path); + trace!("SBF .so search path: {:?}", search_path); search_path } @@ -456,7 +456,7 @@ impl Default for ProgramTest { /// used to override this preference at runtime. `cargo test-bpf` will set `BPF_OUT_DIR` /// automatically. /// - /// BPF program shared objects and account data files are searched for in + /// SBF program shared objects and account data files are searched for in /// * the value of the `BPF_OUT_DIR` environment variable /// * the `tests/fixtures` sub-directory /// * the current working directory @@ -501,7 +501,7 @@ impl ProgramTest { me } - /// Override default BPF program selection + /// Override default SBF program selection pub fn prefer_bpf(&mut self, prefer_bpf: bool) { self.prefer_bpf = prefer_bpf; } @@ -516,14 +516,14 @@ impl ProgramTest { self.transaction_account_lock_limit = Some(transaction_account_lock_limit); } - /// Override the BPF compute budget + /// Override the SBF compute budget #[allow(deprecated)] #[deprecated(since = "1.8.0", note = "please use `set_compute_max_units` instead")] pub fn set_bpf_compute_max_units(&mut self, bpf_compute_max_units: u64) { self.compute_max_units = Some(bpf_compute_max_units); } - /// Execute the BPF program with JIT if true, interpreted if false + /// Execute the SBF program with JIT if true, interpreted if false pub fn use_bpf_jit(&mut self, use_bpf_jit: bool) { self.use_bpf_jit = use_bpf_jit; } @@ -578,13 +578,13 @@ impl ProgramTest { ); } - /// Add a BPF program to the test environment. + /// Add a SBF program to the test environment. /// - /// `program_name` will also be used to locate the BPF shared object in the current or fixtures + /// `program_name` will also be used to locate the SBF shared object in the current or fixtures /// directory. /// /// If `process_instruction` is provided, the natively built-program may be used instead of the - /// BPF shared object depending on the `BPF_OUT_DIR` environment variable. + /// SBF shared object depending on the `BPF_OUT_DIR` environment variable. pub fn add_program( &mut self, program_name: &str, @@ -594,7 +594,7 @@ impl ProgramTest { let add_bpf = |this: &mut ProgramTest, program_file: PathBuf| { let data = read_file(&program_file); info!( - "\"{}\" BPF program from {}{}", + "\"{}\" SBF program from {}{}", program_name, program_file.display(), std::fs::metadata(&program_file) @@ -654,7 +654,7 @@ impl ProgramTest { if valid_program_names.is_empty() { // This should be unreachable as `test-bpf` should guarantee at least one shared // object exists somewhere. - warn!("No BPF shared objects found."); + warn!("No SBF shared objects found."); return; } @@ -670,17 +670,17 @@ impl ProgramTest { let program_file = find_file(&format!("{}.so", program_name)); match (self.prefer_bpf, program_file, process_instruction) { - // If BPF is preferred (i.e., `test-bpf` is invoked) and a BPF shared object exists, + // If SBF is preferred (i.e., `test-sbf` is invoked) and a BPF shared object exists, // use that as the program data. (true, Some(file), _) => add_bpf(self, file), - // If BPF is not required (i.e., we were invoked with `test`), use the provided + // If SBF is not required (i.e., we were invoked with `test`), use the provided // processor function as is. // // TODO: figure out why tests hang if a processor panics when running native code. (false, _, Some(process)) => add_native(self, process), - // Invalid: `test-bpf` invocation with no matching BPF shared object. + // Invalid: `test-sbf` invocation with no matching SBF shared object. (true, None, _) => { warn_invalid_program_name(); panic!( diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs index e9f2bada50..b139af9d40 100644 --- a/programs/bpf_loader/src/lib.rs +++ b/programs/bpf_loader/src/lib.rs @@ -349,7 +349,7 @@ fn check_loader_id(id: &Pubkey) -> bool { || bpf_loader_upgradeable::check_id(id) } -/// Create the BPF virtual machine +/// Create the SBF virtual machine pub fn create_vm<'a, 'b>( program: &'a VerifiedExecutable, regions: Vec, @@ -1395,7 +1395,7 @@ impl Executor for BpfExecutor { ) { Ok(info) => info, Err(e) => { - ic_logger_msg!(log_collector, "Failed to create BPF VM: {}", e); + ic_logger_msg!(log_collector, "Failed to create SBF VM: {}", e); return Err(InstructionError::ProgramEnvironmentSetupFailure); } }; @@ -1427,7 +1427,7 @@ impl Executor for BpfExecutor { .write(&mut trace_buffer, &analysis) .unwrap(); let trace_string = String::from_utf8(trace_buffer).unwrap(); - trace!("BPF Program Instruction Trace:\n{}", trace_string); + trace!("SBF Program Instruction Trace:\n{}", trace_string); } drop(vm); let (_returned_from_program_id, return_data) = diff --git a/programs/bpf_loader/src/serialization.rs b/programs/bpf_loader/src/serialization.rs index 94283520f9..6110ae0496 100644 --- a/programs/bpf_loader/src/serialization.rs +++ b/programs/bpf_loader/src/serialization.rs @@ -21,7 +21,7 @@ use { }; /// Maximum number of instruction accounts that can be serialized into the -/// BPF VM. +/// SBF VM. const MAX_INSTRUCTION_ACCOUNTS: u8 = NON_DUP_MARKER; enum SerializeAccount<'a> { diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index fe44cae71c..b088e5011b 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -78,9 +78,9 @@ pub const MAX_SIGNERS: usize = 16; pub enum SyscallError { #[error("{0}: {1:?}")] InvalidString(Utf8Error, Vec), - #[error("BPF program panicked")] + #[error("SBF program panicked")] Abort, - #[error("BPF program Panicked in {0} at {1}:{2}")] + #[error("SBF program Panicked in {0} at {1}:{2}")] Panic(String, u64, u64), #[error("Cannot borrow invoke context")] InvokeContextBorrowFailed, @@ -386,7 +386,7 @@ fn translate_slice<'a, T>( .map(|value| &*value) } -/// Take a virtual pointer to a string (points to BPF VM memory space), translate it +/// Take a virtual pointer to a string (points to SBF VM memory space), translate it /// pass it to a user-defined work function fn translate_string_and_do( memory_mapping: &MemoryMapping, @@ -435,10 +435,10 @@ macro_rules! declare_syscall { } declare_syscall!( - /// Abort syscall functions, called when the BPF program calls `abort()` + /// Abort syscall functions, called when the SBF program calls `abort()` /// LLVM will insert calls to `abort()` if it detects an untenable situation, /// `abort()` is not intended to be called explicitly by the program. - /// Causes the BPF program to be halted immediately + /// Causes the SBF program to be halted immediately SyscallAbort, fn inner_call( _invoke_context: &mut InvokeContext, @@ -454,8 +454,8 @@ declare_syscall!( ); declare_syscall!( - /// Panic syscall function, called when the BPF program calls 'sol_panic_()` - /// Causes the BPF program to be halted immediately + /// Panic syscall function, called when the SBF program calls 'sol_panic_()` + /// Causes the SBF program to be halted immediately SyscallPanic, fn inner_call( invoke_context: &mut InvokeContext, @@ -480,7 +480,7 @@ declare_syscall!( ); declare_syscall!( - /// Dynamic memory allocation syscall called when the BPF program calls + /// Dynamic memory allocation syscall called when the SBF program calls /// `sol_alloc_free_()`. The allocator is expected to allocate/free /// from/to a given chunk of memory and enforce size restrictions. The /// memory chunk is given to the allocator during allocator creation and diff --git a/programs/bpf_loader/test_elfs/src/noop_aligned/noop_aligned.c b/programs/bpf_loader/test_elfs/src/noop_aligned/noop_aligned.c index b3e8125fb8..ea9847a3cf 100644 --- a/programs/bpf_loader/test_elfs/src/noop_aligned/noop_aligned.c +++ b/programs/bpf_loader/test_elfs/src/noop_aligned/noop_aligned.c @@ -1,5 +1,5 @@ /** - * @brief Example C based BPF program that prints out the parameters + * @brief Example C based SBF program that prints out the parameters * passed to it */ #include diff --git a/programs/bpf_loader/test_elfs/src/noop_unaligned/noop_unaligned.c b/programs/bpf_loader/test_elfs/src/noop_unaligned/noop_unaligned.c index a3d43946cb..dcf93204b3 100644 --- a/programs/bpf_loader/test_elfs/src/noop_unaligned/noop_unaligned.c +++ b/programs/bpf_loader/test_elfs/src/noop_unaligned/noop_unaligned.c @@ -1,5 +1,5 @@ /** - * @brief Example C based BPF program that prints out the parameters + * @brief Example C based SBF program that prints out the parameters * passed to it */ diff --git a/programs/sbf/rust/128bit_dep/Cargo.toml b/programs/sbf/rust/128bit_dep/Cargo.toml index 0a9b65a230..ce4edf6581 100644 --- a/programs/sbf/rust/128bit_dep/Cargo.toml +++ b/programs/sbf/rust/128bit_dep/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-128bit-dep" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/alloc/Cargo.toml b/programs/sbf/rust/alloc/Cargo.toml index 965960e0d9..6cb21bcca7 100644 --- a/programs/sbf/rust/alloc/Cargo.toml +++ b/programs/sbf/rust/alloc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-alloc" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/alloc/src/lib.rs b/programs/sbf/rust/alloc/src/lib.rs index 09919b12e4..82f8a8bb4c 100644 --- a/programs/sbf/rust/alloc/src/lib.rs +++ b/programs/sbf/rust/alloc/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that test dynamic memory allocation +//! Example Rust-based SBF program that test dynamic memory allocation #[macro_use] extern crate alloc; diff --git a/programs/sbf/rust/call_depth/Cargo.toml b/programs/sbf/rust/call_depth/Cargo.toml index 5b32e06ef4..3257572b01 100644 --- a/programs/sbf/rust/call_depth/Cargo.toml +++ b/programs/sbf/rust/call_depth/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-call-depth" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/call_depth/src/lib.rs b/programs/sbf/rust/call_depth/src/lib.rs index 42e32df6d6..8cf43ac9af 100644 --- a/programs/sbf/rust/call_depth/src/lib.rs +++ b/programs/sbf/rust/call_depth/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that tests call depth and stack usage +//! Example Rust-based SBF program that tests call depth and stack usage use solana_program::{ custom_heap_default, custom_panic_default, entrypoint::SUCCESS, log::sol_log_64, msg, diff --git a/programs/sbf/rust/caller_access/Cargo.toml b/programs/sbf/rust/caller_access/Cargo.toml index ef64e80859..c8b0fcee7e 100644 --- a/programs/sbf/rust/caller_access/Cargo.toml +++ b/programs/sbf/rust/caller_access/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-caller-access" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/curve25519/Cargo.toml b/programs/sbf/rust/curve25519/Cargo.toml index 3d77c7943f..91cc23084e 100644 --- a/programs/sbf/rust/curve25519/Cargo.toml +++ b/programs/sbf/rust/curve25519/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-curve25519" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/custom_heap/Cargo.toml b/programs/sbf/rust/custom_heap/Cargo.toml index fce4ab8d15..1034ed9383 100644 --- a/programs/sbf/rust/custom_heap/Cargo.toml +++ b/programs/sbf/rust/custom_heap/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-custom-heap" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/custom_heap/src/lib.rs b/programs/sbf/rust/custom_heap/src/lib.rs index a47656d846..4d0d5379e9 100644 --- a/programs/sbf/rust/custom_heap/src/lib.rs +++ b/programs/sbf/rust/custom_heap/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF that tests out using a custom heap +//! Example Rust-based SBF that tests out using a custom heap use { solana_program::{ diff --git a/programs/sbf/rust/dep_crate/Cargo.toml b/programs/sbf/rust/dep_crate/Cargo.toml index 3dc4d0853b..ba1634e7a6 100644 --- a/programs/sbf/rust/dep_crate/Cargo.toml +++ b/programs/sbf/rust/dep_crate/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-dep-crate" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/dep_crate/src/lib.rs b/programs/sbf/rust/dep_crate/src/lib.rs index ff5a3f8088..9cdf32e2fc 100644 --- a/programs/sbf/rust/dep_crate/src/lib.rs +++ b/programs/sbf/rust/dep_crate/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests dependent crates +//! Example Rust-based SBF program tests dependent crates extern crate solana_program; use { diff --git a/programs/sbf/rust/deprecated_loader/Cargo.toml b/programs/sbf/rust/deprecated_loader/Cargo.toml index ad7edd7b3b..dcfd01c6e7 100644 --- a/programs/sbf/rust/deprecated_loader/Cargo.toml +++ b/programs/sbf/rust/deprecated_loader/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-deprecated-loader" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/deprecated_loader/src/lib.rs b/programs/sbf/rust/deprecated_loader/src/lib.rs index a5aaa26243..d3c73899ae 100644 --- a/programs/sbf/rust/deprecated_loader/src/lib.rs +++ b/programs/sbf/rust/deprecated_loader/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that supports the deprecated loader +//! Example Rust-based SBF program that supports the deprecated loader #![allow(unreachable_code)] diff --git a/programs/sbf/rust/dup_accounts/Cargo.toml b/programs/sbf/rust/dup_accounts/Cargo.toml index 9acfb1c1a8..15385a778b 100644 --- a/programs/sbf/rust/dup_accounts/Cargo.toml +++ b/programs/sbf/rust/dup_accounts/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-dup-accounts" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/dup_accounts/src/lib.rs b/programs/sbf/rust/dup_accounts/src/lib.rs index 5f6d9121af..76fd6cfb3f 100644 --- a/programs/sbf/rust/dup_accounts/src/lib.rs +++ b/programs/sbf/rust/dup_accounts/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that tests duplicate accounts passed via accounts +//! Example Rust-based SBF program that tests duplicate accounts passed via accounts extern crate solana_program; use solana_program::{ diff --git a/programs/sbf/rust/error_handling/Cargo.toml b/programs/sbf/rust/error_handling/Cargo.toml index f8b54c0be0..147262ea19 100644 --- a/programs/sbf/rust/error_handling/Cargo.toml +++ b/programs/sbf/rust/error_handling/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-error-handling" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/error_handling/src/lib.rs b/programs/sbf/rust/error_handling/src/lib.rs index b1e2dc254f..ffd045ef1b 100644 --- a/programs/sbf/rust/error_handling/src/lib.rs +++ b/programs/sbf/rust/error_handling/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that exercises error handling +//! Example Rust-based SBF program that exercises error handling extern crate solana_program; use { diff --git a/programs/sbf/rust/external_spend/Cargo.toml b/programs/sbf/rust/external_spend/Cargo.toml index c66696603c..58a5dc1e5c 100644 --- a/programs/sbf/rust/external_spend/Cargo.toml +++ b/programs/sbf/rust/external_spend/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-external-spend" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/external_spend/src/lib.rs b/programs/sbf/rust/external_spend/src/lib.rs index 1ed7803e4d..a48fd47b54 100644 --- a/programs/sbf/rust/external_spend/src/lib.rs +++ b/programs/sbf/rust/external_spend/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that moves a lamport from one account to another +//! Example Rust-based SBF program that moves a lamport from one account to another extern crate solana_program; use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; diff --git a/programs/sbf/rust/finalize/Cargo.toml b/programs/sbf/rust/finalize/Cargo.toml index 2188e92d3b..80bc55a554 100644 --- a/programs/sbf/rust/finalize/Cargo.toml +++ b/programs/sbf/rust/finalize/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-finalize" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/finalize/src/lib.rs b/programs/sbf/rust/finalize/src/lib.rs index 6d06fefcde..fce7141516 100644 --- a/programs/sbf/rust/finalize/src/lib.rs +++ b/programs/sbf/rust/finalize/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF sanity program that finalizes a BPF program +//! Example Rust-based SBF sanity program that finalizes a BPF program #![allow(unreachable_code)] diff --git a/programs/sbf/rust/get_minimum_delegation/Cargo.toml b/programs/sbf/rust/get_minimum_delegation/Cargo.toml index 4105118e21..78b45116ac 100644 --- a/programs/sbf/rust/get_minimum_delegation/Cargo.toml +++ b/programs/sbf/rust/get_minimum_delegation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-get-minimum-delegation" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml b/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml index 75dbab057a..7dc6570e80 100644 --- a/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml +++ b/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-inner_instruction_alignment_check" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/inner_instruction_alignment_check/src/lib.rs b/programs/sbf/rust/inner_instruction_alignment_check/src/lib.rs index 410d1e8ffc..966d4ab766 100644 --- a/programs/sbf/rust/inner_instruction_alignment_check/src/lib.rs +++ b/programs/sbf/rust/inner_instruction_alignment_check/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF noop program +//! Example Rust-based SBF noop program use solana_program::{ account_info::AccountInfo, diff --git a/programs/sbf/rust/instruction_introspection/Cargo.toml b/programs/sbf/rust/instruction_introspection/Cargo.toml index 09470f5bb4..ebc7c88266 100644 --- a/programs/sbf/rust/instruction_introspection/Cargo.toml +++ b/programs/sbf/rust/instruction_introspection/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-instruction-introspection" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/instruction_introspection/src/lib.rs b/programs/sbf/rust/instruction_introspection/src/lib.rs index 75d74a1b5f..a449ff784e 100644 --- a/programs/sbf/rust/instruction_introspection/src/lib.rs +++ b/programs/sbf/rust/instruction_introspection/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that exercises instruction introspection +//! Example Rust-based SBF program that exercises instruction introspection extern crate solana_program; use solana_program::{ diff --git a/programs/sbf/rust/invoke/Cargo.toml b/programs/sbf/rust/invoke/Cargo.toml index 61d9492751..3145c1b298 100644 --- a/programs/sbf/rust/invoke/Cargo.toml +++ b/programs/sbf/rust/invoke/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-invoke" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/invoke/src/instructions.rs b/programs/sbf/rust/invoke/src/instructions.rs index 464ec39281..db8be12dea 100644 --- a/programs/sbf/rust/invoke/src/instructions.rs +++ b/programs/sbf/rust/invoke/src/instructions.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation pub const TEST_SUCCESS: u8 = 1; pub const TEST_PRIVILEGE_ESCALATION_SIGNER: u8 = 2; diff --git a/programs/sbf/rust/invoke/src/lib.rs b/programs/sbf/rust/invoke/src/lib.rs index 7da570fcf9..eb0dde96b8 100644 --- a/programs/sbf/rust/invoke/src/lib.rs +++ b/programs/sbf/rust/invoke/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation pub mod instructions; pub mod processor; diff --git a/programs/sbf/rust/invoke/src/processor.rs b/programs/sbf/rust/invoke/src/processor.rs index d7d8ed549a..3c3223e2b7 100644 --- a/programs/sbf/rust/invoke/src/processor.rs +++ b/programs/sbf/rust/invoke/src/processor.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation #![cfg(feature = "program")] #![allow(unreachable_code)] diff --git a/programs/sbf/rust/invoke_and_error/Cargo.toml b/programs/sbf/rust/invoke_and_error/Cargo.toml index fad8c7dab7..9e00743115 100644 --- a/programs/sbf/rust/invoke_and_error/Cargo.toml +++ b/programs/sbf/rust/invoke_and_error/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-invoke-and-error" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/invoke_and_ok/Cargo.toml b/programs/sbf/rust/invoke_and_ok/Cargo.toml index c32291b325..885a27a827 100644 --- a/programs/sbf/rust/invoke_and_ok/Cargo.toml +++ b/programs/sbf/rust/invoke_and_ok/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-invoke-and-ok" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/invoke_and_return/Cargo.toml b/programs/sbf/rust/invoke_and_return/Cargo.toml index 4410a87923..29ec6b2d68 100644 --- a/programs/sbf/rust/invoke_and_return/Cargo.toml +++ b/programs/sbf/rust/invoke_and_return/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-invoke-and-return" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/invoked/Cargo.toml b/programs/sbf/rust/invoked/Cargo.toml index 30d0bbebb3..e1d8c82b00 100644 --- a/programs/sbf/rust/invoked/Cargo.toml +++ b/programs/sbf/rust/invoked/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-invoked" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/invoked/src/instructions.rs b/programs/sbf/rust/invoked/src/instructions.rs index 9bffe66fb3..9f98da7d92 100644 --- a/programs/sbf/rust/invoked/src/instructions.rs +++ b/programs/sbf/rust/invoked/src/instructions.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation use solana_program::{ instruction::{AccountMeta, Instruction}, diff --git a/programs/sbf/rust/invoked/src/lib.rs b/programs/sbf/rust/invoked/src/lib.rs index 7da570fcf9..eb0dde96b8 100644 --- a/programs/sbf/rust/invoked/src/lib.rs +++ b/programs/sbf/rust/invoked/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation pub mod instructions; pub mod processor; diff --git a/programs/sbf/rust/invoked/src/processor.rs b/programs/sbf/rust/invoked/src/processor.rs index b26b151702..f1af6d2f4a 100644 --- a/programs/sbf/rust/invoked/src/processor.rs +++ b/programs/sbf/rust/invoked/src/processor.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that issues a cross-program-invocation +//! Example Rust-based SBF program that issues a cross-program-invocation #![cfg(feature = "program")] diff --git a/programs/sbf/rust/iter/Cargo.toml b/programs/sbf/rust/iter/Cargo.toml index 59ab6d805c..76ecfb1cca 100644 --- a/programs/sbf/rust/iter/Cargo.toml +++ b/programs/sbf/rust/iter/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-iter" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/iter/src/lib.rs b/programs/sbf/rust/iter/src/lib.rs index 3fda481a4b..9009b4f6f6 100644 --- a/programs/sbf/rust/iter/src/lib.rs +++ b/programs/sbf/rust/iter/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests loop iteration +//! Example Rust-based SBF program tests loop iteration extern crate solana_program; use solana_program::{ diff --git a/programs/sbf/rust/log_data/Cargo.toml b/programs/sbf/rust/log_data/Cargo.toml index 3a18784ade..dc6baf232a 100644 --- a/programs/sbf/rust/log_data/Cargo.toml +++ b/programs/sbf/rust/log_data/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-log-data" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/log_data/src/lib.rs b/programs/sbf/rust/log_data/src/lib.rs index 1c7bb7f3e2..66b7849f5d 100644 --- a/programs/sbf/rust/log_data/src/lib.rs +++ b/programs/sbf/rust/log_data/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that uses sol_log_data syscall +//! Example Rust-based SBF program that uses sol_log_data syscall #![cfg(feature = "program")] diff --git a/programs/sbf/rust/many_args/Cargo.toml b/programs/sbf/rust/many_args/Cargo.toml index 73b689bb94..7accb71e38 100644 --- a/programs/sbf/rust/many_args/Cargo.toml +++ b/programs/sbf/rust/many_args/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-many-args" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/many_args/src/helper.rs b/programs/sbf/rust/many_args/src/helper.rs index 86f68bb44c..df89033a6c 100644 --- a/programs/sbf/rust/many_args/src/helper.rs +++ b/programs/sbf/rust/many_args/src/helper.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests loop iteration +//! Example Rust-based SBF program tests loop iteration extern crate solana_program; use solana_program::log::*; diff --git a/programs/sbf/rust/many_args/src/lib.rs b/programs/sbf/rust/many_args/src/lib.rs index 7ec2fa6eb9..e90fd54e12 100644 --- a/programs/sbf/rust/many_args/src/lib.rs +++ b/programs/sbf/rust/many_args/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests loop iteration +//! Example Rust-based SBF program tests loop iteration mod helper; extern crate solana_program; diff --git a/programs/sbf/rust/many_args_dep/Cargo.toml b/programs/sbf/rust/many_args_dep/Cargo.toml index ba682966a2..45be21aad5 100644 --- a/programs/sbf/rust/many_args_dep/Cargo.toml +++ b/programs/sbf/rust/many_args_dep/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-many-args-dep" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/many_args_dep/src/lib.rs b/programs/sbf/rust/many_args_dep/src/lib.rs index d43d6f9a30..ec572e0cd4 100644 --- a/programs/sbf/rust/many_args_dep/src/lib.rs +++ b/programs/sbf/rust/many_args_dep/src/lib.rs @@ -1,4 +1,4 @@ -//! Solana Rust-based BPF program utility functions and types +//! Solana Rust-based SBF program utility functions and types extern crate solana_program; use solana_program::{log::sol_log_64, msg}; diff --git a/programs/sbf/rust/mem/Cargo.toml b/programs/sbf/rust/mem/Cargo.toml index 33e2ce7f68..0a1cb06150 100644 --- a/programs/sbf/rust/mem/Cargo.toml +++ b/programs/sbf/rust/mem/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-mem" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/membuiltins/Cargo.toml b/programs/sbf/rust/membuiltins/Cargo.toml index 15dfa44dd0..c00dc5455c 100644 --- a/programs/sbf/rust/membuiltins/Cargo.toml +++ b/programs/sbf/rust/membuiltins/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-membuiltins" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/noop/Cargo.toml b/programs/sbf/rust/noop/Cargo.toml index 245a4c27d8..e8a747ca49 100644 --- a/programs/sbf/rust/noop/Cargo.toml +++ b/programs/sbf/rust/noop/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-noop" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/noop/src/lib.rs b/programs/sbf/rust/noop/src/lib.rs index 193aa47830..1bd903edc1 100644 --- a/programs/sbf/rust/noop/src/lib.rs +++ b/programs/sbf/rust/noop/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF noop program +//! Example Rust-based SBF noop program extern crate solana_program; use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; diff --git a/programs/sbf/rust/panic/Cargo.toml b/programs/sbf/rust/panic/Cargo.toml index a93eb7e1d7..9a39bae6d5 100644 --- a/programs/sbf/rust/panic/Cargo.toml +++ b/programs/sbf/rust/panic/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-panic" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/panic/src/lib.rs b/programs/sbf/rust/panic/src/lib.rs index 3254bbe298..9c542f9280 100644 --- a/programs/sbf/rust/panic/src/lib.rs +++ b/programs/sbf/rust/panic/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that panics +//! Example Rust-based SBF program that panics #[cfg(all(feature = "custom-panic", target_os = "solana"))] #[no_mangle] diff --git a/programs/sbf/rust/param_passing/Cargo.toml b/programs/sbf/rust/param_passing/Cargo.toml index 5e0317da07..ae553eec87 100644 --- a/programs/sbf/rust/param_passing/Cargo.toml +++ b/programs/sbf/rust/param_passing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-param-passing" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/param_passing/src/lib.rs b/programs/sbf/rust/param_passing/src/lib.rs index d9d3995fc8..263bce70f4 100644 --- a/programs/sbf/rust/param_passing/src/lib.rs +++ b/programs/sbf/rust/param_passing/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests loop iteration +//! Example Rust-based SBF program tests loop iteration extern crate solana_program; use { diff --git a/programs/sbf/rust/param_passing_dep/Cargo.toml b/programs/sbf/rust/param_passing_dep/Cargo.toml index 1737a81084..ba7bbe1caf 100644 --- a/programs/sbf/rust/param_passing_dep/Cargo.toml +++ b/programs/sbf/rust/param_passing_dep/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-param-passing-dep" version = "1.15.0" -description = "Solana BPF program written in Rust" +description = "Solana SBF program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/param_passing_dep/src/lib.rs b/programs/sbf/rust/param_passing_dep/src/lib.rs index e5d1fd03c1..1862f54cdf 100644 --- a/programs/sbf/rust/param_passing_dep/src/lib.rs +++ b/programs/sbf/rust/param_passing_dep/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program tests loop iteration +//! Example Rust-based SBF program tests loop iteration extern crate solana_program; diff --git a/programs/sbf/rust/rand/Cargo.toml b/programs/sbf/rust/rand/Cargo.toml index 16e1cd9991..4ad7362aac 100644 --- a/programs/sbf/rust/rand/Cargo.toml +++ b/programs/sbf/rust/rand/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-rand" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/rand/src/lib.rs b/programs/sbf/rust/rand/src/lib.rs index 0130331f06..d6513b7f6a 100644 --- a/programs/sbf/rust/rand/src/lib.rs +++ b/programs/sbf/rust/rand/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that tests rand behavior +//! Example Rust-based SBF program that tests rand behavior #![allow(unreachable_code)] diff --git a/programs/sbf/rust/realloc/Cargo.toml b/programs/sbf/rust/realloc/Cargo.toml index 0cc8ba8465..39cf76096e 100644 --- a/programs/sbf/rust/realloc/Cargo.toml +++ b/programs/sbf/rust/realloc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-realloc" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/realloc/src/instructions.rs b/programs/sbf/rust/realloc/src/instructions.rs index e0f9021886..75e5cfe3db 100644 --- a/programs/sbf/rust/realloc/src/instructions.rs +++ b/programs/sbf/rust/realloc/src/instructions.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program use solana_program::{ instruction::{AccountMeta, Instruction}, diff --git a/programs/sbf/rust/realloc/src/lib.rs b/programs/sbf/rust/realloc/src/lib.rs index e2ecc2406f..30c76b478d 100644 --- a/programs/sbf/rust/realloc/src/lib.rs +++ b/programs/sbf/rust/realloc/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program pub mod instructions; pub mod processor; diff --git a/programs/sbf/rust/realloc/src/processor.rs b/programs/sbf/rust/realloc/src/processor.rs index 88d2a82403..b0b008ad01 100644 --- a/programs/sbf/rust/realloc/src/processor.rs +++ b/programs/sbf/rust/realloc/src/processor.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program #![cfg(feature = "program")] diff --git a/programs/sbf/rust/realloc_invoke/Cargo.toml b/programs/sbf/rust/realloc_invoke/Cargo.toml index a2714f9d7b..280f4f0b5e 100644 --- a/programs/sbf/rust/realloc_invoke/Cargo.toml +++ b/programs/sbf/rust/realloc_invoke/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-realloc-invoke" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/realloc_invoke/src/instructions.rs b/programs/sbf/rust/realloc_invoke/src/instructions.rs index 249b6b7d53..94ad289e55 100644 --- a/programs/sbf/rust/realloc_invoke/src/instructions.rs +++ b/programs/sbf/rust/realloc_invoke/src/instructions.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program pub const INVOKE_REALLOC_ZERO_RO: u8 = 0; pub const INVOKE_REALLOC_ZERO: u8 = 1; diff --git a/programs/sbf/rust/realloc_invoke/src/lib.rs b/programs/sbf/rust/realloc_invoke/src/lib.rs index e2ecc2406f..30c76b478d 100644 --- a/programs/sbf/rust/realloc_invoke/src/lib.rs +++ b/programs/sbf/rust/realloc_invoke/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program pub mod instructions; pub mod processor; diff --git a/programs/sbf/rust/realloc_invoke/src/processor.rs b/programs/sbf/rust/realloc_invoke/src/processor.rs index 28a4d7b042..8fc09d362c 100644 --- a/programs/sbf/rust/realloc_invoke/src/processor.rs +++ b/programs/sbf/rust/realloc_invoke/src/processor.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF realloc test program +//! Example Rust-based SBF realloc test program #![cfg(feature = "program")] diff --git a/programs/sbf/rust/ro_account_modify/Cargo.toml b/programs/sbf/rust/ro_account_modify/Cargo.toml index 9dedcecac0..b7fa79992a 100644 --- a/programs/sbf/rust/ro_account_modify/Cargo.toml +++ b/programs/sbf/rust/ro_account_modify/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-ro-account_modify" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/ro_modify/Cargo.toml b/programs/sbf/rust/ro_modify/Cargo.toml index 6c5a488e7c..9a00034a98 100644 --- a/programs/sbf/rust/ro_modify/Cargo.toml +++ b/programs/sbf/rust/ro_modify/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-ro-modify" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sanity/Cargo.toml b/programs/sbf/rust/sanity/Cargo.toml index 4dd236472a..16ff47922b 100644 --- a/programs/sbf/rust/sanity/Cargo.toml +++ b/programs/sbf/rust/sanity/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-sanity" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sanity/src/lib.rs b/programs/sbf/rust/sanity/src/lib.rs index 70de4ec749..15121743f5 100644 --- a/programs/sbf/rust/sanity/src/lib.rs +++ b/programs/sbf/rust/sanity/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF sanity program that prints out the parameters passed to it +//! Example Rust-based SBF sanity program that prints out the parameters passed to it #![allow(unreachable_code)] diff --git a/programs/sbf/rust/secp256k1_recover/Cargo.toml b/programs/sbf/rust/secp256k1_recover/Cargo.toml index fa48e9a909..b95c286ba3 100644 --- a/programs/sbf/rust/secp256k1_recover/Cargo.toml +++ b/programs/sbf/rust/secp256k1_recover/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-secp256k1-recover" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sha/Cargo.toml b/programs/sbf/rust/sha/Cargo.toml index 3ef14a1b68..210eea3e4b 100644 --- a/programs/sbf/rust/sha/Cargo.toml +++ b/programs/sbf/rust/sha/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-sha" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sibling_inner_instruction/Cargo.toml b/programs/sbf/rust/sibling_inner_instruction/Cargo.toml index 80e7a3fe38..beacef7724 100644 --- a/programs/sbf/rust/sibling_inner_instruction/Cargo.toml +++ b/programs/sbf/rust/sibling_inner_instruction/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-sibling_inner-instructions" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sibling_inner_instruction/src/lib.rs b/programs/sbf/rust/sibling_inner_instruction/src/lib.rs index aa663b839f..ab5e9b0dd9 100644 --- a/programs/sbf/rust/sibling_inner_instruction/src/lib.rs +++ b/programs/sbf/rust/sibling_inner_instruction/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that queries sibling instructions +//! Example Rust-based SBF program that queries sibling instructions #![cfg(feature = "program")] diff --git a/programs/sbf/rust/sibling_instruction/Cargo.toml b/programs/sbf/rust/sibling_instruction/Cargo.toml index 900b75cc26..cc66820aaa 100644 --- a/programs/sbf/rust/sibling_instruction/Cargo.toml +++ b/programs/sbf/rust/sibling_instruction/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-sibling-instructions" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sibling_instruction/src/lib.rs b/programs/sbf/rust/sibling_instruction/src/lib.rs index d7c6998e39..b4d18b8f7a 100644 --- a/programs/sbf/rust/sibling_instruction/src/lib.rs +++ b/programs/sbf/rust/sibling_instruction/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that queries sibling instructions +//! Example Rust-based SBF program that queries sibling instructions #![cfg(feature = "program")] diff --git a/programs/sbf/rust/simulation/Cargo.toml b/programs/sbf/rust/simulation/Cargo.toml index f69e0c9d17..d9d2870eed 100644 --- a/programs/sbf/rust/simulation/Cargo.toml +++ b/programs/sbf/rust/simulation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-simulation" version = "1.15.0" -description = "Solana BPF Program Simulation Differences" +description = "Solana SBF Program Simulation Differences" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/spoof1/Cargo.toml b/programs/sbf/rust/spoof1/Cargo.toml index 9b78f75d69..1c103997df 100644 --- a/programs/sbf/rust/spoof1/Cargo.toml +++ b/programs/sbf/rust/spoof1/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-spoof1" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/spoof1_system/Cargo.toml b/programs/sbf/rust/spoof1_system/Cargo.toml index 2b2efefda0..d706893abf 100644 --- a/programs/sbf/rust/spoof1_system/Cargo.toml +++ b/programs/sbf/rust/spoof1_system/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-spoof1-system" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sysvar/Cargo.toml b/programs/sbf/rust/sysvar/Cargo.toml index fc438a4f6f..60bf05be24 100644 --- a/programs/sbf/rust/sysvar/Cargo.toml +++ b/programs/sbf/rust/sysvar/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-sysvar" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/sysvar/src/lib.rs b/programs/sbf/rust/sysvar/src/lib.rs index 4641abaefc..bd577dd3ca 100644 --- a/programs/sbf/rust/sysvar/src/lib.rs +++ b/programs/sbf/rust/sysvar/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that tests sysvar use +//! Example Rust-based SBF program that tests sysvar use extern crate solana_program; #[allow(deprecated)] diff --git a/programs/sbf/rust/upgradeable/Cargo.toml b/programs/sbf/rust/upgradeable/Cargo.toml index f6a52486b5..7ac628b070 100644 --- a/programs/sbf/rust/upgradeable/Cargo.toml +++ b/programs/sbf/rust/upgradeable/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-upgradeable" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/upgradeable/src/lib.rs b/programs/sbf/rust/upgradeable/src/lib.rs index 636d302e46..293655e14b 100644 --- a/programs/sbf/rust/upgradeable/src/lib.rs +++ b/programs/sbf/rust/upgradeable/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF upgradeable program +//! Example Rust-based SBF upgradeable program extern crate solana_program; use solana_program::{ diff --git a/programs/sbf/rust/upgraded/Cargo.toml b/programs/sbf/rust/upgraded/Cargo.toml index b064ef1945..52589ba809 100644 --- a/programs/sbf/rust/upgraded/Cargo.toml +++ b/programs/sbf/rust/upgraded/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-upgraded" version = "1.15.0" -description = "Solana BPF test program written in Rust" +description = "Solana SBF test program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/programs/sbf/rust/upgraded/src/lib.rs b/programs/sbf/rust/upgraded/src/lib.rs index 2193829f45..fd261d8a8d 100644 --- a/programs/sbf/rust/upgraded/src/lib.rs +++ b/programs/sbf/rust/upgraded/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF upgraded program +//! Example Rust-based SBF upgraded program extern crate solana_program; use solana_program::{ diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml index 8fda2e1db0..e17380177d 100644 --- a/rbpf-cli/Cargo.toml +++ b/rbpf-cli/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "rbpf-cli" version = "1.15.0" -description = "CLI to test and analyze eBPF programs" +description = "CLI to test and analyze SBF programs" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/rbpf" homepage = "https://solana.com/" -keywords = ["BPF", "eBPF", "interpreter", "JIT"] +keywords = ["SBF", "interpreter", "JIT"] edition = "2021" publish = false diff --git a/rbpf-cli/src/main.rs b/rbpf-cli/src/main.rs index c8c94c6245..80f09b606f 100644 --- a/rbpf-cli/src/main.rs +++ b/rbpf-cli/src/main.rs @@ -53,13 +53,13 @@ fn load_accounts(path: &Path) -> Result { fn main() { solana_logger::setup(); - let matches = Command::new("Solana BPF CLI") + let matches = Command::new("Solana SBF CLI") .version(crate_version!()) .author("Solana Maintainers ") .about( - r##"CLI to test and analyze eBPF programs. + r##"CLI to test and analyze SBF programs. -The tool executes eBPF programs in a mocked environment. +The tool executes SBF programs in a mocked environment. Some features, such as sysvars syscall and CPI, are not available for the programs executed by the CLI tool. diff --git a/runtime/src/block_cost_limits.rs b/runtime/src/block_cost_limits.rs index 4906fa9fdc..cd18172753 100644 --- a/runtime/src/block_cost_limits.rs +++ b/runtime/src/block_cost_limits.rs @@ -53,7 +53,7 @@ lazy_static! { /// Number of compute units that a block is allowed. A block's compute units are /// accumulated by Transactions added to it; A transaction's compute units are /// calculated by cost_model, based on transaction's signatures, write locks, -/// data size and built-in and BPF instructions. +/// data size and built-in and SBF instructions. pub const MAX_BLOCK_UNITS: u64 = MAX_BLOCK_REPLAY_TIME_US * COMPUTE_UNIT_TO_US_RATIO * MAX_CONCURRENCY; diff --git a/sdk/macro/src/lib.rs b/sdk/macro/src/lib.rs index d0b2214a70..c9cff97aa7 100644 --- a/sdk/macro/src/lib.rs +++ b/sdk/macro/src/lib.rs @@ -379,7 +379,7 @@ pub fn pubkeys(input: TokenStream) -> TokenStream { } // The normal `wasm_bindgen` macro generates a .bss section which causes the resulting -// BPF program to fail to load, so for now this stub should be used when building for BPF +// SBF program to fail to load, so for now this stub should be used when building for SBF #[proc_macro_attribute] pub fn wasm_bindgen_stub(_attr: TokenStream, item: TokenStream) -> TokenStream { match parse_macro_input!(item as syn::Item) { diff --git a/sdk/program/src/borsh.rs b/sdk/program/src/borsh.rs index 42ed033f1c..e19d4326ef 100644 --- a/sdk/program/src/borsh.rs +++ b/sdk/program/src/borsh.rs @@ -60,7 +60,7 @@ fn get_declaration_packed_len( /// Get the worst-case packed length for the given BorshSchema /// /// Note: due to the serializer currently used by Borsh, this function cannot -/// be used on-chain in the Solana BPF execution environment. +/// be used on-chain in the Solana SBF execution environment. pub fn get_packed_len() -> usize { let schema_container = S::schema_container(); get_declaration_packed_len(&schema_container.declaration, &schema_container.definitions) diff --git a/sdk/program/src/program_memory.rs b/sdk/program/src/program_memory.rs index 9a097dc4c8..f0b023fa82 100644 --- a/sdk/program/src/program_memory.rs +++ b/sdk/program/src/program_memory.rs @@ -1,6 +1,6 @@ //! Basic low-level memory operations. //! -//! Within the BPF environment, these are implemented as syscalls and executed by +//! Within the SBF environment, these are implemented as syscalls and executed by //! the runtime in native code. /// Like C `memcpy`. @@ -13,13 +13,13 @@ /// /// # Errors /// -/// When executed within a BPF program, the memory regions spanning `n` bytes +/// When executed within a SBF program, the memory regions spanning `n` bytes /// from from the start of `dst` and `src` must be mapped program memory. If not, /// the program will abort. /// /// The memory regions spanning `n` bytes from `dst` and `src` from the start /// of `dst` and `src` must not overlap. If they do, then the program will abort -/// or, if run outside of the BPF VM, will panic. +/// or, if run outside of the SBF VM, will panic. /// /// # Safety /// @@ -52,7 +52,7 @@ pub fn sol_memcpy(dst: &mut [u8], src: &[u8], n: usize) { /// /// # Errors /// -/// When executed within a BPF program, the memory regions spanning `n` bytes +/// When executed within a SBF program, the memory regions spanning `n` bytes /// from from `dst` and `src` must be mapped program memory. If not, the program /// will abort. /// @@ -80,7 +80,7 @@ pub unsafe fn sol_memmove(dst: *mut u8, src: *mut u8, n: usize) { /// /// # Errors /// -/// When executed within a BPF program, the memory regions spanning `n` bytes +/// When executed within a SBF program, the memory regions spanning `n` bytes /// from from the start of `dst` and `src` must be mapped program memory. If not, /// the program will abort. /// @@ -119,7 +119,7 @@ pub fn sol_memcmp(s1: &[u8], s2: &[u8], n: usize) -> i32 { /// /// # Errors /// -/// When executed within a BPF program, the memory region spanning `n` bytes +/// When executed within a SBF program, the memory region spanning `n` bytes /// from from the start of `s` must be mapped program memory. If not, the program /// will abort. /// diff --git a/sdk/program/src/program_option.rs b/sdk/program/src/program_option.rs index 65eb6a84e7..4f7165a63a 100644 --- a/sdk/program/src/program_option.rs +++ b/sdk/program/src/program_option.rs @@ -960,16 +960,6 @@ impl From> for Option { } } -#[rustversion::before(1.49.0)] // Remove `Into` once the BPF toolchain upgrades to 1.49.0 or newer -impl Into> for COption { - fn into(self) -> Option { - match self { - COption::Some(value) => Some(value), - COption::None => None, - } - } -} - #[cfg(test)] mod test { use super::*; diff --git a/sdk/program/src/program_stubs.rs b/sdk/program/src/program_stubs.rs index 649f20ed4b..a0b6321c7a 100644 --- a/sdk/program/src/program_stubs.rs +++ b/sdk/program/src/program_stubs.rs @@ -1,4 +1,4 @@ -//! Implementations of syscalls used when `solana-program` is built for non-BPF targets. +//! Implementations of syscalls used when `solana-program` is built for non-SBF targets. #![cfg(not(target_os = "solana"))] diff --git a/sdk/program/src/secp256k1_recover.rs b/sdk/program/src/secp256k1_recover.rs index 82ef24cffa..5bca285c2f 100644 --- a/sdk/program/src/secp256k1_recover.rs +++ b/sdk/program/src/secp256k1_recover.rs @@ -192,7 +192,7 @@ impl Secp256k1Pubkey { /// /// This has the downside that the program must link to the [`libsecp256k1`] /// crate and parse the signature just for this check. Note that `libsecp256k1` -/// version 0.7.0 or greater is required for running on the Solana BPF target. +/// version 0.7.0 or greater is required for running on the Solana SBF target. /// /// [`libsecp256k1`]: https://docs.rs/libsecp256k1/latest/libsecp256k1 /// @@ -210,14 +210,14 @@ impl Secp256k1Pubkey { /// /// If `hash` is not 32 bytes in length this function returns /// [`Secp256k1RecoverError::InvalidHash`], though see notes -/// on BPF-specific behavior below. +/// on SBF-specific behavior below. /// /// If `recovery_id` is not in the range [0, 3] this function returns /// [`Secp256k1RecoverError::InvalidRecoveryId`]. /// /// If `signature` is not 64 bytes in length this function returns /// [`Secp256k1RecoverError::InvalidSignature`], though see notes -/// on BPF-specific behavior below. +/// on SBF-specific behavior below. /// /// If `signature` represents an "overflowing" signature this function returns /// [`Secp256k1RecoverError::InvalidSignature`]. Overflowing signatures are @@ -226,7 +226,7 @@ impl Secp256k1Pubkey { /// If `signature` is otherwise invalid this function returns /// [`Secp256k1RecoverError::InvalidSignature`]. /// -/// # BPF-specific behavior +/// # SBF-specific behavior /// /// When calling this function on-chain the caller must verify the correct /// lengths of `hash` and `signature` beforehand. diff --git a/sdk/program/src/syscalls/mod.rs b/sdk/program/src/syscalls/mod.rs index d66c9361e9..0d7d28596d 100644 --- a/sdk/program/src/syscalls/mod.rs +++ b/sdk/program/src/syscalls/mod.rs @@ -10,7 +10,7 @@ pub use definitions::*; pub const MAX_CPI_INSTRUCTION_DATA_LEN: u64 = 10 * 1024; /// Maximum CPI instruction accounts. 255 was chosen to ensure that instruction -/// accounts are always within the maximum instruction account limit for BPF +/// accounts are always within the maximum instruction account limit for SBF /// program instructions. pub const MAX_CPI_INSTRUCTION_ACCOUNTS: u8 = u8::MAX; diff --git a/sdk/program/src/sysvar/mod.rs b/sdk/program/src/sysvar/mod.rs index 46780385e2..8ed8bfa3da 100644 --- a/sdk/program/src/sysvar/mod.rs +++ b/sdk/program/src/sysvar/mod.rs @@ -225,7 +225,7 @@ pub trait Sysvar: } } -/// Implements the [`Sysvar::get`] method for both BPF and host targets. +/// Implements the [`Sysvar::get`] method for both SBF and host targets. #[macro_export] macro_rules! impl_sysvar_get { ($syscall_name:ident) => { diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index 89cedb0b36..10d64285bd 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -605,8 +605,8 @@ lazy_static! { (reject_vote_account_close_unless_zero_credit_epoch::id(), "fail vote account withdraw to 0 unless account earned 0 credits in last completed epoch"), (add_get_processed_sibling_instruction_syscall::id(), "add add_get_processed_sibling_instruction_syscall"), (bank_tranaction_count_fix::id(), "fixes Bank::transaction_count to include all committed transactions, not just successful ones"), - (disable_bpf_deprecated_load_instructions::id(), "disable ldabs* and ldind* BPF instructions"), - (disable_bpf_unresolved_symbols_at_runtime::id(), "disable reporting of unresolved BPF symbols at runtime"), + (disable_bpf_deprecated_load_instructions::id(), "disable ldabs* and ldind* SBF instructions"), + (disable_bpf_unresolved_symbols_at_runtime::id(), "disable reporting of unresolved SBF symbols at runtime"), (record_instruction_in_transaction_context_push::id(), "move the CPI stack overflow check to the end of push"), (syscall_saturated_math::id(), "syscalls use saturated math"), (check_physical_overlapping::id(), "check physical overlapping regions"), diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs index a69d9039d0..b865401698 100644 --- a/test-validator/src/lib.rs +++ b/test-validator/src/lib.rs @@ -433,9 +433,9 @@ impl TestValidatorGenesis { ) } - /// Add a BPF program to the test environment. + /// Add a SBF program to the test environment. /// - /// `program_name` will also used to locate the BPF shared object in the current or fixtures + /// `program_name` will also used to locate the SBF shared object in the current or fixtures /// directory. pub fn add_program(&mut self, program_name: &str, program_id: Pubkey) -> &mut Self { let program_path = solana_program_test::find_file(&format!("{}.so", program_name)) diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs index 1b8a05ae7b..d5077cd2d5 100644 --- a/validator/src/bin/solana-test-validator.rs +++ b/validator/src/bin/solana-test-validator.rs @@ -193,12 +193,12 @@ fn main() { .arg( Arg::with_name("bpf_program") .long("bpf-program") - .value_names(&["ADDRESS_OR_KEYPAIR", "BPF_PROGRAM.SO"]) + .value_names(&["ADDRESS_OR_KEYPAIR", "SBF_PROGRAM.SO"]) .takes_value(true) .number_of_values(2) .multiple(true) .help( - "Add a BPF program to the genesis configuration. \ + "Add a SBF program to the genesis configuration. \ If the ledger already exists then this parameter is silently ignored. \ First argument can be a pubkey string or path to a keypair", ), @@ -246,7 +246,7 @@ fn main() { Arg::with_name("no_bpf_jit") .long("no-bpf-jit") .takes_value(false) - .help("Disable the just-in-time compiler and instead use the interpreter for BPF. Windows always disables JIT."), + .help("Disable the just-in-time compiler and instead use the interpreter for SBF. Windows always disables JIT."), ) .arg( Arg::with_name("ticks_per_slot") diff --git a/validator/src/main.rs b/validator/src/main.rs index 9c63785894..dbdb84daed 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -1560,7 +1560,7 @@ pub fn main() { Arg::with_name("no_bpf_jit") .long("no-bpf-jit") .takes_value(false) - .help("Disable the just-in-time compiler and instead use the interpreter for BPF"), + .help("Disable the just-in-time compiler and instead use the interpreter for SBF"), ) .arg( Arg::with_name("poh_pinned_cpu_core") diff --git a/web3.js/README.md b/web3.js/README.md index ed4478f06a..058e22c5ec 100644 --- a/web3.js/README.md +++ b/web3.js/README.md @@ -60,7 +60,7 @@ Install the latest Solana release from https://docs.solana.com/cli/install-solan **Use `solana-test-validator` from the latest Solana release** -### BPF program development +### SBF program development **Use `cargo build-bpf` from the latest Solana release** diff --git a/web3.js/src/bpf-loader.ts b/web3.js/src/bpf-loader.ts index 75d0b4fbec..3be8da17f4 100644 --- a/web3.js/src/bpf-loader.ts +++ b/web3.js/src/bpf-loader.ts @@ -24,12 +24,12 @@ export class BpfLoader { } /** - * Load a BPF program + * Load a SBF program * * @param connection The connection to use * @param payer Account that will pay program loading fees * @param program Account to load the program into - * @param elf The entire ELF containing the BPF program + * @param elf The entire ELF containing the SBF program * @param loaderProgramId The program id of the BPF loader to use * @return true if program was loaded successfully, false if program was already loaded */ diff --git a/web3.js/test/connection-subscriptions.test.ts b/web3.js/test/connection-subscriptions.test.ts index 04ab6c33ea..f55b6a8d67 100644 --- a/web3.js/test/connection-subscriptions.test.ts +++ b/web3.js/test/connection-subscriptions.test.ts @@ -149,7 +149,7 @@ describe('Subscriptions', () => { value: { err: null, logs: [ - 'BPF program 83astBRguLMdt2h5U1Tpdq5tjFoJ6noeGwaY3mDLVcri success', + 'SBF program 83astBRguLMdt2h5U1Tpdq5tjFoJ6noeGwaY3mDLVcri success', ], signature: '5h6xBEauJ3PK6SWCZ1PGjBvj8vDdWG3KpwATGy1ARAXFSDwt8GFXM7W5Ncn16wmqokgpiKRLuS83KUxyZyv2sUYv', diff --git a/web3.js/test/fixtures/noop-program/Cargo.toml b/web3.js/test/fixtures/noop-program/Cargo.toml index d7af1925cb..a613794840 100644 --- a/web3.js/test/fixtures/noop-program/Cargo.toml +++ b/web3.js/test/fixtures/noop-program/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "solana-sbf-rust-noop" version = "1.8.0" -description = "Solana BPF noop program written in Rust" +description = "Solana SBF noop program written in Rust" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" diff --git a/web3.js/test/fixtures/noop-program/src/lib.rs b/web3.js/test/fixtures/noop-program/src/lib.rs index 038aeacac6..72d479d2bf 100644 --- a/web3.js/test/fixtures/noop-program/src/lib.rs +++ b/web3.js/test/fixtures/noop-program/src/lib.rs @@ -1,4 +1,4 @@ -//! Example Rust-based BPF program that prints out the parameters passed to it +//! Example Rust-based SBF program that prints out the parameters passed to it use solana_program::{ account_info::AccountInfo, entrypoint::ProgramResult, log::*, msg, program::set_return_data,