gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BPF programs can support up to 5 arguments (#2528)

Browse Source
This commit is contained in:
Jack May
2019-01-23 09:55:08 -08:00
committed by GitHub
parent 73930b5eac
commit a0bc8b8af3
4 changed files with 75 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
programs/bpf/c/src/move_funds/move_funds.c
View File

@ -13,22 +13,21 @@
extern bool entrypoint(const uint8_t *input) {
SolKeyedAccount ka[NUM_KA];
const uint8_t *data;
uint64_t data_len;
SolParameters params = (SolParameters) { .ka = ka };
if (!sol_deserialize(input, ka, NUM_KA, NULL, &data, &data_len, NULL)) {
if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(ka))) {
return false;
}
if (!ka[0].is_signer) {
if (!params.ka[0].is_signer) {
sol_log("Transaction not signed by key 0");
return false;
}
int64_t tokens = *(int64_t *)data;
if (*ka[0].tokens >= tokens) {
*ka[0].tokens -= tokens;
*ka[2].tokens += tokens;
int64_t tokens = *(int64_t *)params.data;
if (*params.ka[0].tokens >= tokens) {
*params.ka[0].tokens -= tokens;
*params.ka[2].tokens += tokens;
// sol_log_64(0, 0, *ka[0].tokens, *ka[2].tokens, tokens);
} else {
// sol_log_64(0, 0, 0xFF, *ka[0].tokens, tokens);

21
programs/bpf/c/src/noop++/noop++.cc
View File

@ -6,26 +6,17 @@
extern bool entrypoint(const uint8_t *input) {
SolKeyedAccount ka[1];
uint64_t ka_len;
const uint8_t *data;
uint64_t data_len;
SolClusterInfo info;
SolParameters params = (SolParameters) { .ka = ka };
sol_log(__FILE__);
if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &data, &data_len, &info)) {
if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(ka))) {
return false;
}
sol_log("Tick height:");
sol_log_64(info.tick_height, 0, 0, 0, 0);
sol_log("Program identifier:");
sol_log_key(info.program_id);
// Log the provided account keys and instruction input data. In the case of
// the no-op program, no account keys or input data are expected but real
// Log the provided input parameters. In the case of the no-op
// program, no account keys or input data are expected but real
// programs will have specific requirements so they can do their work.
sol_log("Account keys and instruction input data:");
sol_log_params(ka, ka_len, data, data_len);
sol_log_params(&params);
return true;
}

18
programs/bpf/c/src/noop/noop.c
View File

@ -6,26 +6,18 @@
extern bool entrypoint(const uint8_t *input) {
SolKeyedAccount ka[1];
uint64_t ka_len;
const uint8_t *data;
uint64_t data_len;
SolClusterInfo info;
SolParameters params = (SolParameters) { .ka = ka };
sol_log(__FILE__);
if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &data, &data_len, &info)) {
if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(ka))) {
return false;
}
sol_log("Tick height:");
sol_log_64(info.tick_height, 0, 0, 0, 0);
sol_log("Program identifier:");
sol_log_key(info.program_id);
// Log the provided account keys and instruction input data. In the case of
// the no-op program, no account keys or input data are expected but real
// Log the provided input parameters. In the case of the no-op
// program, no account keys or input data are expected but real
// programs will have specific requirements so they can do their work.
sol_log("Account keys and instruction input data:");
sol_log_params(ka, ka_len, data, data_len);
sol_log_params(&params);
return true;
}