Add compute metering

solana-labs · Aug 19, 2020 · c3b8968 · c3b8968
1 parent e9b610b
commit c3b8968
Show file tree

Hide file tree

Showing 14 changed files with 285 additions and 128 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
@@ -26,7 +26,7 @@ solana-bpf-loader-program = { path = "../bpf_loader", version = "1.4.0" }
 solana-logger = { path = "../../logger", version = "1.4.0" }
 solana-runtime = { path = "../../runtime", version = "1.4.0" }
 solana-sdk = { path = "../../sdk", version = "1.4.0" }
-solana_rbpf = "=0.1.28"
+solana_rbpf = "=0.1.30"
 
 [[bench]]
 name = "bpf_loader"

diff --git a/programs/bpf/c/src/invoke/invoke.c b/programs/bpf/c/src/invoke/invoke.c
@@ -165,6 +165,33 @@ extern uint64_t entrypoint(const uint8_t *input) {
                                               SOL_ARRAY_SIZE(signers_seeds)));
     }
 
+    sol_log("Test multiple derived signers");
+    {
+      SolAccountMeta arguments[] = {
+          {accounts[DERIVED_KEY1_INDEX].key, true, false},
+          {accounts[DERIVED_KEY2_INDEX].key, true, true},
+          {accounts[DERIVED_KEY3_INDEX].key, false, true}};
+      uint8_t data[] = {TEST_VERIFY_NESTED_SIGNERS};
+      const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
+                                          arguments, SOL_ARRAY_SIZE(arguments),
+                                          data, SOL_ARRAY_SIZE(data)};
+      uint8_t seed1[] = {'L', 'i', 'l', '\''};
+      uint8_t seed2[] = {'B', 'i', 't', 's'};
+      const SolSignerSeed seeds1[] = {{seed1, SOL_ARRAY_SIZE(seed1)},
+                                      {seed2, SOL_ARRAY_SIZE(seed2)},
+                                      {&nonce2, 1}};
+      const SolSignerSeed seeds2[] = {
+          {(uint8_t *)accounts[DERIVED_KEY2_INDEX].key, SIZE_PUBKEY},
+          {&nonce3, 1}};
+      const SolSignerSeeds signers_seeds[] = {{seeds1, SOL_ARRAY_SIZE(seeds1)},
+                                              {seeds2, SOL_ARRAY_SIZE(seeds2)}};
+
+      sol_assert(SUCCESS == sol_invoke_signed(&instruction, accounts,
+                                              SOL_ARRAY_SIZE(accounts),
+                                              signers_seeds,
+                                              SOL_ARRAY_SIZE(signers_seeds)));
+    }
+
     sol_log("Test readonly with writable account");
     {
       SolAccountMeta arguments[] = {

diff --git a/programs/bpf/c/src/invoked/invoked.c b/programs/bpf/c/src/invoked/invoked.c
@@ -97,31 +97,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
     sol_assert(!accounts[DERIVED_KEY2_INDEX].is_signer);
     sol_assert(!accounts[DERIVED_KEY2_INDEX].is_signer);
 
-    uint8_t nonce2 = params.data[1];
-    uint8_t nonce3 = params.data[2];
-
-    SolAccountMeta arguments[] = {
-        {accounts[DERIVED_KEY1_INDEX].key, true, false},
-        {accounts[DERIVED_KEY2_INDEX].key, true, true},
-        {accounts[DERIVED_KEY3_INDEX].key, false, true}};
-    uint8_t data[] = {TEST_VERIFY_NESTED_SIGNERS};
-    const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
-                                        arguments, SOL_ARRAY_SIZE(arguments),
-                                        data, SOL_ARRAY_SIZE(data)};
-    uint8_t seed1[] = {'L', 'i', 'l', '\''};
-    uint8_t seed2[] = {'B', 'i', 't', 's'};
-    const SolSignerSeed seeds1[] = {{seed1, SOL_ARRAY_SIZE(seed1)},
-                                    {seed2, SOL_ARRAY_SIZE(seed2)},
-                                    {&nonce2, 1}};
-    const SolSignerSeed seeds2[] = {
-        {(uint8_t *)accounts[DERIVED_KEY2_INDEX].key, SIZE_PUBKEY},
-        {&nonce3, 1}};
-    const SolSignerSeeds signers_seeds[] = {{seeds1, SOL_ARRAY_SIZE(seeds1)},
-                                            {seeds2, SOL_ARRAY_SIZE(seeds2)}};
-
-    sol_assert(SUCCESS == sol_invoke_signed(
-                              &instruction, accounts, SOL_ARRAY_SIZE(accounts),
-                              signers_seeds, SOL_ARRAY_SIZE(signers_seeds)));
     break;
   }
 

diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs
@@ -163,6 +163,24 @@ fn process_instruction(
                     accounts,
                     &[&[b"You pass butter", &[nonce1]]],
                 )?;
+
+                let invoked_instruction = create_instruction(
+                    *accounts[INVOKED_PROGRAM_INDEX].key,
+                    &[
+                        (accounts[DERIVED_KEY1_INDEX].key, true, false),
+                        (accounts[DERIVED_KEY2_INDEX].key, true, true),
+                        (accounts[DERIVED_KEY3_INDEX].key, false, true),
+                    ],
+                    vec![TEST_VERIFY_NESTED_SIGNERS],
+                );
+                invoke_signed(
+                    &invoked_instruction,
+                    accounts,
+                    &[
+                        &[b"Lil'", b"Bits", &[nonce2]],
+                        &[accounts[DERIVED_KEY2_INDEX].key.as_ref(), &[nonce3]],
+                    ],
+                )?;
             }
 
             info!("Test readonly with writable account");
@@ -188,20 +206,16 @@ fn process_instruction(
                     &[
                         (accounts[ARGUMENT_INDEX].key, true, true),
                         (accounts[INVOKED_ARGUMENT_INDEX].key, true, true),
-                        (accounts[INVOKED_PROGRAM_DUP_INDEX].key, false, false),
-                        (accounts[INVOKED_PROGRAM_DUP_INDEX].key, false, false),
                     ],
                     vec![TEST_NESTED_INVOKE],
                 );
                 invoke(&instruction, accounts)?;
                 info!("2nd invoke from first program");
                 invoke(&instruction, accounts)?;
 
-                assert_eq!(accounts[ARGUMENT_INDEX].lamports(), 42 - 5 + 1 + 1 + 1 + 1);
-                assert_eq!(
-                    accounts[INVOKED_ARGUMENT_INDEX].lamports(),
-                    10 + 5 - 1 - 1 - 1 - 1
-                );
+                info!(line!(), 0, 0, 0, accounts[ARGUMENT_INDEX].lamports());
+                assert_eq!(accounts[ARGUMENT_INDEX].lamports(), 42 - 5 + 1 + 1);
+                assert_eq!(accounts[INVOKED_ARGUMENT_INDEX].lamports(), 10 + 5 - 1 - 1);
             }
 
             info!("Verify data values are retained and updated");

diff --git a/programs/bpf/rust/invoked/src/lib.rs b/programs/bpf/rust/invoked/src/lib.rs
@@ -8,13 +8,8 @@ extern crate solana_sdk;
 
 use crate::instruction::*;
 use solana_sdk::{
-    account_info::AccountInfo,
-    bpf_loader, entrypoint,
-    entrypoint::ProgramResult,
-    info,
-    program::{invoke, invoke_signed},
-    program_error::ProgramError,
-    pubkey::Pubkey,
+    account_info::AccountInfo, bpf_loader, entrypoint, entrypoint::ProgramResult, info,
+    program::invoke, program_error::ProgramError, pubkey::Pubkey,
 };
 
 entrypoint!(process_instruction);
@@ -111,34 +106,13 @@ fn process_instruction(
         }
         TEST_DERIVED_SIGNERS => {
             info!("verify derived signers");
-            const INVOKED_PROGRAM_INDEX: usize = 0;
             const DERIVED_KEY1_INDEX: usize = 1;
             const DERIVED_KEY2_INDEX: usize = 2;
             const DERIVED_KEY3_INDEX: usize = 3;
 
             assert!(accounts[DERIVED_KEY1_INDEX].is_signer);
             assert!(!accounts[DERIVED_KEY2_INDEX].is_signer);
             assert!(!accounts[DERIVED_KEY3_INDEX].is_signer);
-
-            let nonce2 = instruction_data[1];
-            let nonce3 = instruction_data[2];
-            let invoked_instruction = create_instruction(
-                *accounts[INVOKED_PROGRAM_INDEX].key,
-                &[
-                    (accounts[DERIVED_KEY1_INDEX].key, true, false),
-                    (accounts[DERIVED_KEY2_INDEX].key, true, true),
-                    (accounts[DERIVED_KEY3_INDEX].key, false, true),
-                ],
-                vec![TEST_VERIFY_NESTED_SIGNERS],
-            );
-            invoke_signed(
-                &invoked_instruction,
-                accounts,
-                &[
-                    &[b"Lil'", b"Bits", &[nonce2]],
-                    &[accounts[DERIVED_KEY2_INDEX].key.as_ref(), &[nonce3]],
-                ],
-            )?;
         }
         TEST_VERIFY_NESTED_SIGNERS => {
             info!("verify nested derived signers");

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
@@ -360,9 +360,9 @@ fn test_program_bpf_invoke() {
         let (derived_key1, nonce1) =
             Pubkey::find_program_address(&[b"You pass butter"], &invoke_program_id);
         let (derived_key2, nonce2) =
-            Pubkey::find_program_address(&[b"Lil'", b"Bits"], &invoked_program_id);
+            Pubkey::find_program_address(&[b"Lil'", b"Bits"], &invoke_program_id);
         let (derived_key3, nonce3) =
-            Pubkey::find_program_address(&[derived_key2.as_ref()], &invoked_program_id);
+            Pubkey::find_program_address(&[derived_key2.as_ref()], &invoke_program_id);
 
         let mint_pubkey = mint_keypair.pubkey();
         let account_metas = vec![

diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
@@ -15,7 +15,7 @@ num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 solana-runtime = { path = "../../runtime", version = "1.4.0" }
 solana-sdk = { path = "../../sdk", version = "1.4.0" }
-solana_rbpf = "=0.1.28"
+solana_rbpf = "=0.1.30"
 thiserror = "1.0"
 
 [dev-dependencies]