Revert "Add return data implementation"

This reverts commit 92228c5.
identity-com · Nov 24, 2021 · 27680fc · 27680fc
1 parent 5a45a08
commit 27680fc
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 641 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/src/proposals/return-data.md b/docs/src/proposals/return-data.md
diff --git a/program-runtime/src/instruction_processor.rs b/program-runtime/src/instruction_processor.rs
@@ -631,9 +631,6 @@ impl InstructionProcessor {
             // Verify the calling program hasn't misbehaved
             invoke_context.verify_and_update(instruction, accounts, caller_write_privileges)?;
 
-            // clear the return data
-            invoke_context.set_return_data(None);
-
             // Invoke callee
             invoke_context.push(program_id, message, instruction, program_indices, accounts)?;
 

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf/c/src/invoke/invoke.c b/programs/bpf/c/src/invoke/invoke.c
@@ -8,7 +8,6 @@
 #include <sol/log.h>
 #include <sol/assert.h>
 #include <sol/deserialize.h>
-#include <sol/return_data.h>
 
 static const uint8_t TEST_SUCCESS = 1;
 static const uint8_t TEST_PRIVILEGE_ESCALATION_SIGNER = 2;
@@ -27,7 +26,6 @@ static const uint8_t TEST_WRITABLE_DEESCALATION_WRITABLE = 14;
 static const uint8_t TEST_NESTED_INVOKE_TOO_DEEP = 15;
 static const uint8_t TEST_EXECUTABLE_LAMPORTS = 16;
 static const uint8_t ADD_LAMPORTS = 17;
-static const uint8_t TEST_RETURN_DATA_TOO_LARGE = 18;
 
 static const int MINT_INDEX = 0;
 static const int ARGUMENT_INDEX = 1;
@@ -176,32 +174,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
                  sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
     }
 
-    sol_log("Test return data");
-    {
-      SolAccountMeta arguments[] = {{accounts[ARGUMENT_INDEX].key, true, true}};
-      uint8_t data[] = { SET_RETURN_DATA };
-      uint8_t buf[100];
-
-      const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
-                                          arguments, SOL_ARRAY_SIZE(arguments),
-                                          data, SOL_ARRAY_SIZE(data)};
-
-      // set some return data, so that the callee can check it is cleared
-      sol_set_return_data((uint8_t[]){1, 2, 3, 4}, 4);
-
-      sol_assert(SUCCESS ==
-                 sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
-
-      SolPubkey setter;
-
-      uint64_t ret = sol_get_return_data(data, sizeof(data), &setter);
-
-      sol_assert(ret == sizeof(RETURN_DATA_VAL));
-
-      sol_assert(sol_memcmp(data, RETURN_DATA_VAL, sizeof(RETURN_DATA_VAL)));
-      sol_assert(SolPubkey_same(&setter, accounts[INVOKED_PROGRAM_INDEX].key));
-    }
-
     sol_log("Test create_program_address");
     {
       uint8_t seed1[] = {'Y', 'o', 'u', ' ', 'p', 'a', 's', 's',
@@ -570,33 +542,27 @@ extern uint64_t entrypoint(const uint8_t *input) {
     break;
   }
   case TEST_EXECUTABLE_LAMPORTS: {
-    sol_log("Test executable lamports");
-    accounts[ARGUMENT_INDEX].executable = true;
-    *accounts[ARGUMENT_INDEX].lamports -= 1;
-    *accounts[DERIVED_KEY1_INDEX].lamports +=1;
-    SolAccountMeta arguments[] = {
-      {accounts[ARGUMENT_INDEX].key, true, false},
-      {accounts[DERIVED_KEY1_INDEX].key, true, false},
-    };
-    uint8_t data[] = {ADD_LAMPORTS, 0, 0, 0};
-    SolPubkey program_id;
-    sol_memcpy(&program_id, params.program_id, sizeof(SolPubkey));
-    const SolInstruction instruction = {&program_id,
-					arguments, SOL_ARRAY_SIZE(arguments),
-					data, SOL_ARRAY_SIZE(data)};
-    sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
-    *accounts[ARGUMENT_INDEX].lamports += 1;
-    break;
+      sol_log("Test executable lamports");
+      accounts[ARGUMENT_INDEX].executable = true;
+      *accounts[ARGUMENT_INDEX].lamports -= 1;
+      *accounts[DERIVED_KEY1_INDEX].lamports +=1;
+      SolAccountMeta arguments[] = {
+          {accounts[ARGUMENT_INDEX].key, true, false},
+          {accounts[DERIVED_KEY1_INDEX].key, true, false},
+      };
+      uint8_t data[] = {ADD_LAMPORTS, 0, 0, 0};
+      SolPubkey program_id;
+      sol_memcpy(&program_id, params.program_id, sizeof(SolPubkey));
+      const SolInstruction instruction = {&program_id,
+                                          arguments, SOL_ARRAY_SIZE(arguments),
+                                          data, SOL_ARRAY_SIZE(data)};
+      sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
+      *accounts[ARGUMENT_INDEX].lamports += 1;
+      break;
   }
   case ADD_LAMPORTS: {
-    *accounts[0].lamports += 1;
-     break;
-  }
-  case TEST_RETURN_DATA_TOO_LARGE: {
-    sol_log("Test setting return data too long");
-    // The actual buffer doesn't matter, just pass null
-    sol_set_return_data(NULL, 1027);
-    break;
+      *accounts[0].lamports += 1;
+      break;
   }
 
   default:

diff --git a/programs/bpf/c/src/invoked/instruction.h b/programs/bpf/c/src/invoked/instruction.h
@@ -16,6 +16,3 @@ const uint8_t VERIFY_PRIVILEGE_DEESCALATION = 8;
 const uint8_t VERIFY_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER = 9;
 const uint8_t VERIFY_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE = 10;
 const uint8_t WRITE_ACCOUNT = 11;
-const uint8_t SET_RETURN_DATA = 12;
-
-#define RETURN_DATA_VAL "return data test"
diff --git a/programs/bpf/c/src/invoked/invoked.c b/programs/bpf/c/src/invoked/invoked.c
@@ -14,9 +14,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
     return ERROR_INVALID_ARGUMENT;
   }
 
-  // on entry, return data must not be set
-  sol_assert(sol_get_return_data(NULL, 0, NULL) == 0);
-
   if (params.data_len == 0) {
     return SUCCESS;
   }
@@ -94,12 +91,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
     sol_log("return Ok");
     return SUCCESS;
   }
-  case SET_RETURN_DATA: {
-    sol_set_return_data((const uint8_t*)RETURN_DATA_VAL, sizeof(RETURN_DATA_VAL));
-    sol_log("set return data");
-    sol_assert(sol_get_return_data(NULL, 0, NULL) == sizeof(RETURN_DATA_VAL));
-    return SUCCESS;
-  }
   case RETURN_ERROR: {
     sol_log("return error");
     return 42;

diff --git a/programs/bpf/c/src/return_data/return_data.c b/programs/bpf/c/src/return_data/return_data.c
diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs
@@ -10,7 +10,7 @@ use solana_program::{
     entrypoint,
     entrypoint::{ProgramResult, MAX_PERMITTED_DATA_INCREASE},
     msg,
-    program::{get_return_data, invoke, invoke_signed, set_return_data},
+    program::{invoke, invoke_signed},
     program_error::ProgramError,
     pubkey::{Pubkey, PubkeyError},
     system_instruction,
@@ -394,27 +394,6 @@ fn process_instruction(
                     assert_eq!(data[i], i as u8);
                 }
             }
-
-            msg!("Test return data via invoked");
-            {
-                // this should be cleared on entry, the invoked tests for this
-                set_return_data(b"x");
-
-                let instruction = create_instruction(
-                    *accounts[INVOKED_PROGRAM_INDEX].key,
-                    &[(accounts[ARGUMENT_INDEX].key, false, true)],
-                    vec![SET_RETURN_DATA],
-                );
-                let _ = invoke(&instruction, accounts);
-
-                assert_eq!(
-                    get_return_data(),
-                    Some((
-                        *accounts[INVOKED_PROGRAM_INDEX].key,
-                        b"Set by invoked".to_vec()
-                    ))
-                );
-            }
         }
         TEST_PRIVILEGE_ESCALATION_SIGNER => {
             msg!("Test privilege escalation signer");

diff --git a/programs/bpf/rust/invoked/src/instruction.rs b/programs/bpf/rust/invoked/src/instruction.rs
@@ -18,7 +18,6 @@ pub const VERIFY_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 9;
 pub const VERIFY_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 10;
 pub const WRITE_ACCOUNT: u8 = 11;
 pub const CREATE_AND_INIT: u8 = 12;
-pub const SET_RETURN_DATA: u8 = 13;
 
 pub fn create_instruction(
     program_id: Pubkey,