BPF to WASM #52

sviatoslav-alekseev · 2023-03-17T13:57:59Z

Solana has BPF smart contracts allowing write programs in Rust and C. We need to add WASM support for smart contracts. With this change, we could write smart contracts in any language that supports WASM.

What is being done:

copied programs/bpf_loader to programs/wasm_loader
for every BPFLoader program add an identical WASMLoader
add WASM smart contract loader with wasmi library
link WASM module to BPF syscalls

…y for development

…s. Result is saved to blockchain

dragvs · 2023-05-11T13:26:01Z

cli/src/spend_utils.rs

-                    lamports_to_sol(fee),
-                    *from_pubkey,
-                ));
+                // TODO(Dev): this is only for speed up development.


Should we resolve this TODO?

Reverted this part

dragvs · 2023-05-11T13:26:25Z

cli/src/checks.rs

-                *account_pubkey,
-            ));
-        }
+        // TODO(Dev): this is only for speed up development.


Should we resolve this TODO?

Reverted this part

dragvs · 2023-05-11T13:28:24Z

program-test/src/lib.rs

-                pre_warp_slot,
-                todo!(),
-            ))
+            todo!();


Reverted this part

dragvs · 2023-05-11T13:28:50Z

programs/bpf_loader/benches/serialization.rs

@@ -129,4 +129,4 @@ fn bench_serialize_aligned(bencher: &mut Bencher) {
    bencher.iter(|| {
        let _ = serialize_parameters_aligned(&transaction_context, instruction_context).unwrap();
    });
-}
+}


Looks odd, should we revert this change?

dragvs · 2023-05-11T13:29:40Z

programs/bpf_loader/src/lib.rs

@@ -258,13 +259,13 @@ fn write_program_data(
    invoke_context: &mut InvokeContext,
 ) -> Result<(), InstructionError> {
    let transaction_context = &invoke_context.transaction_context;
-    let instruction_context = transaction_context.get_current_instruction_context()?;
+    let instruction_context = transaction_context.get_current_instruction_context().inspect_err(|x| { dbg!(x); })?;


Question whether we need to add all these inspect_err

Deleted all inspect_err

dragvs · 2023-05-11T13:30:22Z

programs/bpf_loader/src/syscalls.rs

@@ -155,7 +155,12 @@ pub fn register_syscalls(
    )?;

    // Logging
-    syscall_registry.register_syscall_by_name(b"sol_log_", SyscallLog::init, SyscallLog::call)?;


Can we revert it if it's only about formating?

fishseabowl

If possible, could you add some description to help others understand this PR? For example, what is the goal of this PR? What are the main data structures and interfaces of this PR? Thanks

fishseabowl · 2023-05-16T23:34:15Z

program-runtime/src/invoke_context.rs

@@ -963,7 +981,8 @@ impl<'a> InvokeContext<'a> {
                            err
                        });
                } else {
-                    return (entry.process_instruction)(first_instruction_account, self);
+                    return (entry.process_instruction)(first_instruction_account, self)
+                        .inspect_err(|x| { dbg!(x, entry); });


error[E0658]: use of unstable library feature 'result_option_inspect'
--> program-runtime/src/invoke_context.rs:985:26
|
985 | .inspect_err(|x| { dbg!(x, entry); });
| ^^^^^^^^^^^
|
= note: see issue #91345 rust-lang/rust#91345 for more information

Deleted all inspect_err

fishseabowl · 2023-05-16T23:34:42Z

program-runtime/src/invoke_context.rs

                    return (entry.process_instruction)(first_instruction_account, self)
+                        .inspect_err(|x| { dbg!(x, &entry, &first_instruction_account); })


error[E0658]: use of unstable library feature 'result_option_inspect'
--> program-runtime/src/invoke_context.rs:975:26
|
975 | ... .inspect_err(|x| { dbg!(x, &entry, &first_instruction_account); })
| ^^^^^^^^^^^
|
= note: see issue #91345 rust-lang/rust#91345 for more information

Deleted all inspect_err

sviatoslav-alekseev · 2023-05-17T11:24:20Z

If possible, could you add some description to help others understand this PR? For example, what is the goal of this PR? What are the main data structures and interfaces of this PR? Thanks

@fishseabowl Here is a description for this PR:
#52 (comment)

fishseabowl · 2023-05-17T19:35:18Z

Hi sviatoslav-alekseev, I got some warnings when I compiled your PR 52, I don't think it's because of this PR, but can you fix it?

warning: the type `[iovec; 64]` does not permit being left uninitialized
  --> streamer/src/recvmmsg.rs:78:52
   |
78 | ...= unsafe { mem::MaybeUninit::uninit().assume_init() };
   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |               |
   |               this code causes undefined behavior when executed
   |               help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
   |
   = note: raw pointers must be initialized
   = note: `#[warn(invalid_value)]` on by default

warning: the type `iovec` does not permit being left uninitialized
   --> streamer/src/sendmmsg.rs:137:34
    |
137 | ...unsafe { std::mem::MaybeUninit::uninit().assume_init() }; size];
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |             |
    |             this code causes undefined behavior when executed
    |             help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
    |
    = note: raw pointers must be initialized

warning: unreachable expression
   --> core/src/cluster_info_vote_listener.rs:618:13
    |
617 |             todo!(),
    |             ------- any code following this expression is unreachable
618 |             &root_bank,
    |             ^^^^^^^^^^ unreachable expression
    |
    = note: `#[warn(unreachable_code)]` on by default

warning: unused variable: `root_bank`
   --> core/src/cluster_info_vote_listener.rs:604:9
    |
604 |         root_bank: &Bank,
    |         ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_root_bank`
    |
    = note: `#[warn(unused_variables)]` on by default

warning: unused variable: `bank_forks`
   --> core/src/cluster_info_vote_listener.rs:605:9
    |
605 |         bank_forks: Arc<RwLock<BankForks>>,
    |         ^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_bank_forks`

warning: unused variable: `subscriptions`
   --> core/src/cluster_info_vote_listener.rs:606:9
    |
606 |         subscriptions: &RpcSubscriptions,
    |         ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_subscriptions`

warning: unused variable: `gossip_verified_vote_hash_sender`
   --> core/src/cluster_info_vote_listener.rs:607:9
    |
607 |         gossip_verified_vote_hash_sender: &GossipVerifiedVoteHashSender,
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_gossip_verified_vote_hash_sender`

warning: unused variable: `verified_vote_sender`
   --> core/src/cluster_info_vote_listener.rs:608:9
    |
608 |         verified_vote_sender: &VerifiedVoteSender,
    |         ^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_verified_vote_sender`

warning: unused variable: `replay_votes_receiver`
   --> core/src/cluster_info_vote_listener.rs:609:9
    |
609 |         replay_votes_receiver: &ReplayVoteReceiver,
    |         ^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_replay_votes_receiver`

warning: unused variable: `bank_notification_sender`
   --> core/src/cluster_info_vote_listener.rs:610:9
    |
610 |         bank_notification_sender: &Option<BankNotificationSender>,
    |         ^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_bank_notification_sender`

warning: unused variable: `cluster_confirmed_slot_sender`
   --> core/src/cluster_info_vote_listener.rs:611:9
    |
611 |         cluster_confirmed_slot_sender: &Option<GossipDuplicateConfirmedS...
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_cluster_confirmed_slot_sender`

warning: unused variable: `total_weight`
   --> core/src/cluster_info_vote_listener.rs:612:9
    |
612 |         total_weight: u64,
    |         ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_total_weight`

warning: associated function `listen_and_confirm_votes` is never used
   --> core/src/cluster_info_vote_listener.rs:601:8
    |
601 |     fn listen_and_confirm_votes(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `#[warn(dead_code)]` on by default

warning: the following packages contain code that will be rejected by a future version of Rust: bindgen v0.59.1, fs_extra v1.2.0, nalgebra v0.27.1, nom v6.1.2
note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`

sviatoslav-alekseev · 2023-05-18T08:49:49Z

Rebased on the master branch. New PR #57

I will try to fix current discussions there.

Fix sbf_tools loading

5bf6ac9

sviatoslav-alekseev self-assigned this Mar 17, 2023

sviatoslav-alekseev added 6 commits March 28, 2023 18:58

Add Wasm Loader crate. Add WasmExecutor. Import wasmi.

3934795

Add logs and comments for DEV

7df36c5

Starting to rework create_executor function

90cafcf

Add engine to WasmExecutor

84ca675

Added read_and_verify_wasm. Trying to locate validation error

60cc746

Working WASM execution

54ec3c3

sviatoslav-alekseev force-pushed the bpf-to-wasm branch from 7c11948 to 54ec3c3 Compare April 5, 2023 14:02

sviatoslav-alekseev added 15 commits April 6, 2023 13:03

Revert changes in wasmi Func

29e5f0d

Add debug to LogCollector

5ac0c1f

Add +nightly to cargo build

03dc964

Bing sol_log_ syscall to debug print

8158b5b

Add airdrop and leader wait for deploy command. To be reverted, onl…

03b5f98

…y for development

Working serialization and deserialization of smart contract parameter…

862ea0d

…s. Result is saved to blockchain

Mute and fix warnings

6ae69c4

Start to adding wasmi Trap to handle syscall errors

99e34ca

Fix compilation issue with Mute warnings commit

05cff80

Remove syscall warnings

4029f1f

Working syscall mapping from WASM to BPF

a24a969

Revert error unwrap in MessageProcessor

b88850e

Revert skipping warning

d862531

Revert removing of bench

d0f1f07

Remove unused comments, imports. Cleanup

fd641ad

sviatoslav-alekseev force-pushed the bpf-to-wasm branch from f235a11 to fd641ad Compare April 27, 2023 16:35

Remove debug prints

67da40f

sviatoslav-alekseev requested a review from dragvs April 28, 2023 12:57

dragvs requested changes May 15, 2023

View reviewed changes

fishseabowl reviewed May 15, 2023

View reviewed changes

Fix PR discussions

ce959c1

Fix newline

0ad2201

fishseabowl reviewed May 16, 2023

View reviewed changes

sviatoslav-alekseev added 2 commits May 17, 2023 13:01

Remove rest inspect_err

8e3db44

Revert newline and sol_log_ formatting

71acecb

sviatoslav-alekseev force-pushed the bpf-to-wasm branch from f4f8dc4 to 71acecb Compare May 17, 2023 08:35

sviatoslav-alekseev mentioned this pull request May 17, 2023

WASM support for Domichain SDK #55

Closed

sviatoslav-alekseev closed this May 18, 2023

sviatoslav-alekseev deleted the bpf-to-wasm branch May 18, 2023 08:53

sviatoslav-alekseev mentioned this pull request May 19, 2023

BPF to wasm - rebased #57

Merged

sviatoslav-alekseev mentioned this pull request May 26, 2023

WASM support for Domichain SDK (rebased) #61

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BPF to WASM #52

BPF to WASM #52

sviatoslav-alekseev commented Mar 17, 2023 •

edited

Loading

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

dragvs May 11, 2023

sviatoslav-alekseev May 17, 2023

fishseabowl left a comment

fishseabowl May 16, 2023

sviatoslav-alekseev May 17, 2023

fishseabowl May 16, 2023

sviatoslav-alekseev May 17, 2023

sviatoslav-alekseev commented May 17, 2023

fishseabowl commented May 17, 2023

sviatoslav-alekseev commented May 18, 2023

		return (entry.process_instruction)(first_instruction_account, self)
		.inspect_err(\|x\| { dbg!(x, &entry, &first_instruction_account); })

BPF to WASM #52

BPF to WASM #52

Conversation

sviatoslav-alekseev commented Mar 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fishseabowl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sviatoslav-alekseev commented May 17, 2023

fishseabowl commented May 17, 2023

sviatoslav-alekseev commented May 18, 2023

sviatoslav-alekseev commented Mar 17, 2023 •

edited

Loading