blockworks-foundation
/
sbv2-solana
mirror of https://github.com/blockworks-foundation/sbv2-solana.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: added functionTrigger and functionSetConfig

This commit is contained in:
Conner Gallagher 2023-06-13 11:58:22 -06:00
parent d36351e1ef
commit 2098883bfc
15 changed files with 924 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

336
javascript/solana.js/idl/attestation-devnet.json
View File

@ -350,15 +350,10 @@
"isMut": true,
"isSigner": true
},
{
"name": "addressLookupTable",
"isMut": true,
"isSigner": false
},
{
"name": "authority",
"isMut": true,
"isSigner": true
"isMut": false,
"isSigner": false
},
{
"name": "quote",
@ -409,11 +404,6 @@
"name": "systemProgram",
"isMut": false,
"isSigner": false
},
{
"name": "addressLookupProgram",
"isMut": false,
"isSigner": false
}
],
"args": [
@ -425,6 +415,29 @@
}
]
},
{
"name": "functionTrigger",
"accounts": [
{
"name": "function",
"isMut": true,
"isSigner": false
},
{
"name": "authority",
"isMut": false,
"isSigner": true
}
],
"args": [
{
"name": "params",
"type": {
"defined": "FunctionTriggerParams"
}
}
]
},
{
"name": "functionVerify",
"accounts": [
@ -576,7 +589,7 @@
},
{
"name": "authority",
"isMut": true,
"isMut": false,
"isSigner": true
},
{
@ -1030,14 +1043,17 @@
32
]
}
},
{
"name": "recentSlot",
"type": "u64"
}
]
}
},
{
"name": "FunctionTriggerParams",
"type": {
"kind": "struct",
"fields": []
}
},
{
"name": "FunctionVerifyParams",
"type": {
@ -1296,21 +1312,6 @@
}
],
"events": [
{
"name": "QuoteVerifyRequestEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "verifier",
"type": "publicKey",
"index": false
}
]
},
{
"name": "FunctionFundEvent",
"fields": [
@ -1321,7 +1322,7 @@
},
{
"name": "amount",
"type": "u32",
"type": "u64",
"index": false
}
]
@ -1336,6 +1337,26 @@
}
]
},
{
"name": "FunctionTriggerEvent",
"fields": [
{
"name": "function",
"type": "publicKey",
"index": false
}
]
},
{
"name": "FunctionBootedEvent",
"fields": [
{
"name": "function",
"type": "publicKey",
"index": false
}
]
},
{
"name": "FunctionVerifyEvent",
"fields": [
@ -1356,7 +1377,177 @@
},
{
"name": "amount",
"type": "u32",
"type": "u64",
"index": false
}
]
},
{
"name": "PermissionInitEvent",
"fields": [
{
"name": "permission",
"type": "publicKey",
"index": false
}
]
},
{
"name": "PermissionSetEvent",
"fields": [
{
"name": "permission",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QueueAddMrEnclaveEvent",
"fields": [
{
"name": "queue",
"type": "publicKey",
"index": false
},
{
"name": "mrEnclave",
"type": {
"array": [
"u8",
32
]
},
"index": false
}
]
},
{
"name": "QueueInitEvent",
"fields": [
{
"name": "queue",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QueueRemoveMrEnclaveEvent",
"fields": [
{
"name": "queue",
"type": "publicKey",
"index": false
},
{
"name": "mrEnclave",
"type": {
"array": [
"u8",
32
]
},
"index": false
}
]
},
{
"name": "QuoteHeartbeatEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "queue",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QuoteInitEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QuoteRotateEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QuoteOverrideEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "queue",
"type": "publicKey",
"index": false
}
]
},
{
"name": "GarbageCollectionEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "queue",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QuoteVerifyEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "queue",
"type": "publicKey",
"index": false
},
{
"name": "verifier",
"type": "publicKey",
"index": false
}
]
},
{
"name": "QuoteVerifyRequestEvent",
"fields": [
{
"name": "quote",
"type": "publicKey",
"index": false
},
{
"name": "verifier",
"type": "publicKey",
"index": false
}
]
@ -1365,118 +1556,103 @@
"errors": [
{
"code": 6000,
"name": "GenericError",
"msg": ""
"name": "GenericError"
},
{
"code": 6001,
"name": "InvalidQuoteError",
"msg": ""
"name": "InvalidQuoteError"
},
{
"code": 6002,
"name": "QuoteExpiredError",
"msg": ""
"name": "QuoteExpiredError"
},
{
"code": 6003,
"name": "InvalidNodeError",
"msg": ""
"name": "InvalidNodeError"
},
{
"code": 6004,
"name": "InsufficientQueueError",
"msg": ""
"name": "InsufficientQueueError"
},
{
"code": 6005,
"name": "QueueFullError",
"msg": ""
"name": "QueueFullError"
},
{
"code": 6006,
"name": "InvalidSignerError",
"msg": ""
"name": "InvalidSignerError"
},
{
"code": 6007,
"name": "MrEnclaveAlreadyExists",
"msg": ""
"name": "MrEnclaveAlreadyExists"
},
{
"code": 6008,
"name": "MrEnclaveDoesntExist",
"msg": ""
"name": "MrEnclaveDoesntExist"
},
{
"code": 6009,
"name": "MrEnclaveAtCapacity",
"msg": ""
"name": "MrEnclaveAtCapacity"
},
{
"code": 6010,
"name": "PermissionDenied",
"msg": ""
"name": "PermissionDenied"
},
{
"code": 6011,
"name": "InvalidConstraint",
"msg": ""
"name": "InvalidConstraint"
},
{
"code": 6012,
"name": "InvalidTimestamp",
"msg": ""
"name": "InvalidTimestamp"
},
{
"code": 6013,
"name": "InvalidMrEnclave",
"msg": ""
"name": "InvalidMrEnclave"
},
{
"code": 6014,
"name": "InvalidReportData",
"msg": ""
"name": "InvalidReportData"
},
{
"code": 6015,
"name": "InsufficientLoadAmountError",
"msg": ""
"name": "InsufficientLoadAmountError"
},
{
"code": 6016,
"name": "IncorrectObservedTimeError",
"msg": ""
"name": "IncorrectObservedTimeError"
},
{
"code": 6017,
"name": "InvalidQuoteMode",
"msg": ""
"name": "InvalidQuoteMode"
},
{
"code": 6018,
"name": "InvalidVerifierIdx",
"msg": ""
"name": "InvalidVerifierIdx"
},
{
"code": 6019,
"name": "InvalidSelfVerifyRequest",
"msg": ""
"name": "InvalidSelfVerifyRequest"
},
{
"code": 6020,
"name": "IncorrectMrEnclave",
"msg": ""
"name": "IncorrectMrEnclave"
},
{
"code": 6021,
"name": "InvalidResponder",
"msg": ""
"name": "InvalidResponder"
},
{
"code": 6022,
"name": "InvalidAddressLookupAddress",
"msg": ""
"name": "InvalidAddressLookupAddress"
},
{
"code": 6023,
"name": "InvalidQueueError"
},
{
"code": 6024,
"name": "IllegalVerifier"
}
]
}

2
javascript/solana.js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@switchboard-xyz/solana.js",
"version": "2.3.0-beta.5",
"version": "2.3.0-beta.6",
"author": "",
"license": "MIT",
"description": "A Typescript client to interact with Switchboard on Solana.",

135
javascript/solana.js/src/accounts/functionAccount.ts
View File

@ -36,7 +36,7 @@ import {
import { BN, toUtf8 } from "@switchboard-xyz/common";
/**
* Parameters for initializing an {@linkcode FunctionAccount}
* Parameters for initializing a {@linkcode FunctionAccount}
*/
export interface FunctionAccountInitParams {
name?: string;
@ -63,6 +63,20 @@ export interface FunctionAccountInitParams {
authority?: Keypair;
}
/**
* Parameters for setting a {@linkcode FunctionAccount} config
*/
export interface FunctionSetConfigParams {
name?: string;
metadata?: string;
container?: string;
containerRegistry?: string;
version?: string;
schedule?: string;
authority?: Keypair;
}
/**
* Parameters for an {@linkcode types.functionFund} instruction.
*/
@ -104,6 +118,7 @@ export interface FunctionWithdrawWalletParams
export type FunctionWithdrawParams =
| FunctionWithdrawUnwrapParams
| FunctionWithdrawWalletParams;
/**
* Parameters for an {@linkcode types.functionVerify} instruction.
*/
@ -117,6 +132,16 @@ export interface FunctionVerifyParams {
fnSigner: PublicKey;
}
/**
* Parameters for an {@linkcode types.functionTrigger} instruction.
*/
export interface FunctionTriggerParams {
authority?: Keypair;
}
/**
/**
* Account type representing a Switchboard Function.
*
@ -293,6 +318,66 @@ export class FunctionAccount extends Account<types.FunctionAccountData> {
return this.program.mint.getAssociatedAddress(this.publicKey);
}
public async setConfigInstruction(
payer: PublicKey,
params: FunctionSetConfigParams,
options?: TransactionObjectOptions
): Promise<TransactionObject> {
const functionData = await this.loadData();
if (params.authority) {
if (!params.authority.publicKey.equals(functionData.authority)) {
throw new errors.IncorrectAuthority(
functionData.authority,
params.authority.publicKey
);
}
} else {
if (!payer.equals(functionData.authority)) {
throw new errors.IncorrectAuthority(functionData.authority, payer);
}
}
const toOptionalBytes = (param: string | undefined): Uint8Array | null => {
return param ? new Uint8Array(Buffer.from(param, "utf8")) : null;
};
const setConfigIxn = types.functionSetConfig(
this.program,
{
params: {
name: toOptionalBytes(params.name),
metadata: toOptionalBytes(params.metadata),
container: toOptionalBytes(params.container),
containerRegistry: toOptionalBytes(params.containerRegistry),
version: toOptionalBytes(params.version),
schedule: toOptionalBytes(params.schedule),
},
},
{
function: this.publicKey,
authority: functionData.authority,
}
);
return new TransactionObject(
payer,
[setConfigIxn],
params?.authority ? [params.authority] : []
);
}
public async setConfig(
params?: FunctionSetConfigParams,
options?: SendTransactionObjectOptions
): Promise<TransactionSignature> {
return await this.setConfigInstruction(
this.program.walletPubkey,
params,
options
).then((txn) => this.program.signAndSend(txn, options));
}
public async fundInstruction(
payer: PublicKey,
params: FunctionFundParams,
@ -562,6 +647,54 @@ export class FunctionAccount extends Account<types.FunctionAccountData> {
).then((txn) => this.program.signAndSend(txn, options));
}
public async triggerInstruction(
payer: PublicKey,
params?: FunctionTriggerParams,
options?: TransactionObjectOptions
): Promise<TransactionObject> {
const functionData = await this.loadData();
// verify authority is correct
if (params && params?.authority) {
if (!params.authority.publicKey.equals(functionData.authority)) {
throw new errors.IncorrectAuthority(
functionData.authority,
params.authority.publicKey
);
}
} else {
if (!payer.equals(functionData.authority)) {
throw new errors.IncorrectAuthority(functionData.authority, payer);
}
}
const functionTrigger = types.functionTrigger(
this.program,
{ params: {} },
{
function: this.publicKey,
authority: functionData.authority,
}
);
return new TransactionObject(
payer,
[functionTrigger],
params?.authority ? [params.authority] : []
);
}
public async trigger(
params?: FunctionTriggerParams,
options?: SendTransactionObjectOptions
): Promise<TransactionSignature> {
return await this.triggerInstruction(
this.program.walletPubkey,
params,
options
).then((txn) => this.program.signAndSend(txn, options));
}
public static decodeAddressLookup(lookupTable: AddressLookupTableAccount) {
const addresses = lookupTable.state.addresses;
if (addresses.length !== 16) {

41
javascript/solana.js/src/generated/attestation-program/errors/custom.ts
View File

@ -22,7 +22,10 @@ export type CustomError =
| InvalidSelfVerifyRequest
| IncorrectMrEnclave
| InvalidResponder
| InvalidAddressLookupAddress;
| InvalidAddressLookupAddress
| InvalidQueueError
| IllegalVerifier
| InvalidAuthorityError;
export class GenericError extends Error {
static readonly code = 6000;
@ -254,6 +257,36 @@ export class InvalidAddressLookupAddress extends Error {
}
}
export class InvalidQueueError extends Error {
static readonly code = 6023;
readonly code = 6023;
readonly name = "InvalidQueueError";
constructor(readonly logs?: string[]) {
super("6023: ");
}
}
export class IllegalVerifier extends Error {
static readonly code = 6024;
readonly code = 6024;
readonly name = "IllegalVerifier";
constructor(readonly logs?: string[]) {
super("6024: ");
}
}
export class InvalidAuthorityError extends Error {
static readonly code = 6025;
readonly code = 6025;
readonly name = "InvalidAuthorityError";
constructor(readonly logs?: string[]) {
super("6025: ");
}
}
export function fromCode(code: number, logs?: string[]): CustomError | null {
switch (code) {
case 6000:
@ -302,6 +335,12 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
return new InvalidResponder(logs);
case 6022:
return new InvalidAddressLookupAddress(logs);
case 6023:
return new InvalidQueueError(logs);
case 6024:
return new IllegalVerifier(logs);
case 6025:
return new InvalidAuthorityError(logs);
}
return null;

2
javascript/solana.js/src/generated/attestation-program/instructions/functionInit.ts
View File

@ -40,7 +40,7 @@ export function functionInit(
const keys: Array<AccountMeta> = [
{ pubkey: accounts.function, isSigner: true, isWritable: true },
{ pubkey: accounts.addressLookupTable, isSigner: false, isWritable: true },
{ pubkey: accounts.authority, isSigner: true, isWritable: true },
{ pubkey: accounts.authority, isSigner: false, isWritable: false },
{ pubkey: accounts.quote, isSigner: false, isWritable: true },
{ pubkey: accounts.attestationQueue, isSigner: false, isWritable: false },
{ pubkey: accounts.permission, isSigner: false, isWritable: true },

49
javascript/solana.js/src/generated/attestation-program/instructions/functionSetConfig.ts Normal file
View File

@ -0,0 +1,49 @@
import { SwitchboardProgram } from "../../../SwitchboardProgram.js";
import * as types from "../types/index.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import * as borsh from "@coral-xyz/borsh"; // eslint-disable-line @typescript-eslint/no-unused-vars
import {
AccountMeta,
PublicKey,
TransactionInstruction,
} from "@solana/web3.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import { BN } from "@switchboard-xyz/common"; // eslint-disable-line @typescript-eslint/no-unused-vars
export interface FunctionSetConfigArgs {
params: types.FunctionSetConfigParamsFields;
}
export interface FunctionSetConfigAccounts {
function: PublicKey;
authority: PublicKey;
}
export const layout = borsh.struct([
types.FunctionSetConfigParams.layout("params"),
]);
export function functionSetConfig(
program: SwitchboardProgram,
args: FunctionSetConfigArgs,
accounts: FunctionSetConfigAccounts
) {
const keys: Array<AccountMeta> = [
{ pubkey: accounts.function, isSigner: false, isWritable: true },
{ pubkey: accounts.authority, isSigner: true, isWritable: false },
];
const identifier = Buffer.from([232, 132, 21, 251, 253, 189, 96, 94]);
const buffer = Buffer.alloc(1000);
const len = layout.encode(
{
params: types.FunctionSetConfigParams.toEncodable(args.params),
},
buffer
);
const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len);
const ix = new TransactionInstruction({
keys,
programId: program.attestationProgramId,
data,
});
return ix;
}

49
javascript/solana.js/src/generated/attestation-program/instructions/functionTrigger.ts Normal file
View File

@ -0,0 +1,49 @@
import { SwitchboardProgram } from "../../../SwitchboardProgram.js";
import * as types from "../types/index.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import * as borsh from "@coral-xyz/borsh"; // eslint-disable-line @typescript-eslint/no-unused-vars
import {
AccountMeta,
PublicKey,
TransactionInstruction,
} from "@solana/web3.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import { BN } from "@switchboard-xyz/common"; // eslint-disable-line @typescript-eslint/no-unused-vars
export interface FunctionTriggerArgs {
params: types.FunctionTriggerParamsFields;
}
export interface FunctionTriggerAccounts {
function: PublicKey;
authority: PublicKey;
}
export const layout = borsh.struct([
types.FunctionTriggerParams.layout("params"),
]);
export function functionTrigger(
program: SwitchboardProgram,
args: FunctionTriggerArgs,
accounts: FunctionTriggerAccounts
) {
const keys: Array<AccountMeta> = [
{ pubkey: accounts.function, isSigner: false, isWritable: true },
{ pubkey: accounts.authority, isSigner: true, isWritable: false },
];
const identifier = Buffer.from([45, 224, 218, 184, 248, 83, 239, 200]);
const buffer = Buffer.alloc(1000);
const len = layout.encode(
{
params: types.FunctionTriggerParams.toEncodable(args.params),
},
buffer
);
const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len);
const ix = new TransactionInstruction({
keys,
programId: program.attestationProgramId,
data,
});
return ix;
}

2
javascript/solana.js/src/generated/attestation-program/instructions/functionWithdraw.ts
View File

@ -35,7 +35,7 @@ export function functionWithdraw(
const keys: Array<AccountMeta> = [
{ pubkey: accounts.function, isSigner: false, isWritable: true },
{ pubkey: accounts.attestationQueue, isSigner: false, isWritable: false },
{ pubkey: accounts.authority, isSigner: true, isWritable: true },
{ pubkey: accounts.authority, isSigner: true, isWritable: false },
{ pubkey: accounts.escrow, isSigner: false, isWritable: true },
{ pubkey: accounts.receiver, isSigner: false, isWritable: true },
{ pubkey: accounts.state, isSigner: false, isWritable: true },

10
javascript/solana.js/src/generated/attestation-program/instructions/index.ts
View File

@ -27,6 +27,16 @@ export type { FunctionFundAccounts, FunctionFundArgs } from "./functionFund.js";
export { functionFund } from "./functionFund.js";
export type { FunctionInitAccounts, FunctionInitArgs } from "./functionInit.js";
export { functionInit } from "./functionInit.js";
export type {
FunctionSetConfigAccounts,
FunctionSetConfigArgs,
} from "./functionSetConfig.js";
export { functionSetConfig } from "./functionSetConfig.js";
export type {
FunctionTriggerAccounts,
FunctionTriggerArgs,
} from "./functionTrigger.js";
export { functionTrigger } from "./functionTrigger.js";
export type {
FunctionVerifyAccounts,
FunctionVerifyArgs,

195
javascript/solana.js/src/generated/attestation-program/types/FunctionSetConfigParams.ts Normal file
View File

@ -0,0 +1,195 @@
import { SwitchboardProgram } from "../../../SwitchboardProgram.js";
import * as types from "../types/index.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import * as borsh from "@coral-xyz/borsh";
import { PublicKey } from "@solana/web3.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import { BN } from "@switchboard-xyz/common"; // eslint-disable-line @typescript-eslint/no-unused-vars
export interface FunctionSetConfigParamsFields {
name: Uint8Array | null;
metadata: Uint8Array | null;
container: Uint8Array | null;
containerRegistry: Uint8Array | null;
version: Uint8Array | null;
schedule: Uint8Array | null;
}
export interface FunctionSetConfigParamsJSON {
name: Array<number> | null;
metadata: Array<number> | null;
container: Array<number> | null;
containerRegistry: Array<number> | null;
version: Array<number> | null;
schedule: Array<number> | null;
}
export class FunctionSetConfigParams {
readonly name: Uint8Array | null;
readonly metadata: Uint8Array | null;
readonly container: Uint8Array | null;
readonly containerRegistry: Uint8Array | null;
readonly version: Uint8Array | null;
readonly schedule: Uint8Array | null;
constructor(fields: FunctionSetConfigParamsFields) {
this.name = fields.name;
this.metadata = fields.metadata;
this.container = fields.container;
this.containerRegistry = fields.containerRegistry;
this.version = fields.version;
this.schedule = fields.schedule;
}
static layout(property?: string) {
return borsh.struct(
[
borsh.option(borsh.vecU8(), "name"),
borsh.option(borsh.vecU8(), "metadata"),
borsh.option(borsh.vecU8(), "container"),
borsh.option(borsh.vecU8(), "containerRegistry"),
borsh.option(borsh.vecU8(), "version"),
borsh.option(borsh.vecU8(), "schedule"),
],
property
);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
static fromDecoded(obj: any) {
return new FunctionSetConfigParams({
name:
(obj.name &&
new Uint8Array(
obj.name.buffer,
obj.name.byteOffset,
obj.name.length
)) ||
null,
metadata:
(obj.metadata &&
new Uint8Array(
obj.metadata.buffer,
obj.metadata.byteOffset,
obj.metadata.length
)) ||
null,
container:
(obj.container &&
new Uint8Array(
obj.container.buffer,
obj.container.byteOffset,
obj.container.length
)) ||
null,
containerRegistry:
(obj.containerRegistry &&
new Uint8Array(
obj.containerRegistry.buffer,
obj.containerRegistry.byteOffset,
obj.containerRegistry.length
)) ||
null,
version:
(obj.version &&
new Uint8Array(
obj.version.buffer,
obj.version.byteOffset,
obj.version.length
)) ||
null,
schedule:
(obj.schedule &&
new Uint8Array(
obj.schedule.buffer,
obj.schedule.byteOffset,
obj.schedule.length
)) ||
null,
});
}
static toEncodable(fields: FunctionSetConfigParamsFields) {
return {
name:
(fields.name &&
Buffer.from(
fields.name.buffer,
fields.name.byteOffset,
fields.name.length
)) ||
null,
metadata:
(fields.metadata &&
Buffer.from(
fields.metadata.buffer,
fields.metadata.byteOffset,
fields.metadata.length
)) ||
null,
container:
(fields.container &&
Buffer.from(
fields.container.buffer,
fields.container.byteOffset,
fields.container.length
)) ||
null,
containerRegistry:
(fields.containerRegistry &&
Buffer.from(
fields.containerRegistry.buffer,
fields.containerRegistry.byteOffset,
fields.containerRegistry.length
)) ||
null,
version:
(fields.version &&
Buffer.from(
fields.version.buffer,
fields.version.byteOffset,
fields.version.length
)) ||
null,
schedule:
(fields.schedule &&
Buffer.from(
fields.schedule.buffer,
fields.schedule.byteOffset,
fields.schedule.length
)) ||
null,
};
}
toJSON(): FunctionSetConfigParamsJSON {
return {
name: (this.name && Array.from(this.name.values())) || null,
metadata: (this.metadata && Array.from(this.metadata.values())) || null,
container:
(this.container && Array.from(this.container.values())) || null,
containerRegistry:
(this.containerRegistry &&
Array.from(this.containerRegistry.values())) ||
null,
version: (this.version && Array.from(this.version.values())) || null,
schedule: (this.schedule && Array.from(this.schedule.values())) || null,
};
}
static fromJSON(obj: FunctionSetConfigParamsJSON): FunctionSetConfigParams {
return new FunctionSetConfigParams({
name: (obj.name && Uint8Array.from(obj.name)) || null,
metadata: (obj.metadata && Uint8Array.from(obj.metadata)) || null,
container: (obj.container && Uint8Array.from(obj.container)) || null,
containerRegistry:
(obj.containerRegistry && Uint8Array.from(obj.containerRegistry)) ||
null,
version: (obj.version && Uint8Array.from(obj.version)) || null,
schedule: (obj.schedule && Uint8Array.from(obj.schedule)) || null,
});
}
toEncodable() {
return FunctionSetConfigParams.toEncodable(this);
}
}

39
javascript/solana.js/src/generated/attestation-program/types/FunctionTriggerParams.ts Normal file
View File

@ -0,0 +1,39 @@
import { SwitchboardProgram } from "../../../SwitchboardProgram.js";
import * as types from "../types/index.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import * as borsh from "@coral-xyz/borsh";
import { PublicKey } from "@solana/web3.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
import { BN } from "@switchboard-xyz/common"; // eslint-disable-line @typescript-eslint/no-unused-vars
export interface FunctionTriggerParamsFields {}
export interface FunctionTriggerParamsJSON {}
export class FunctionTriggerParams {
constructor(fields: FunctionTriggerParamsFields) {}
static layout(property?: string) {
return borsh.struct([], property);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
static fromDecoded(obj: any) {
return new FunctionTriggerParams({});
}
static toEncodable(fields: FunctionTriggerParamsFields) {
return {};
}
toJSON(): FunctionTriggerParamsJSON {
return {};
}
static fromJSON(obj: FunctionTriggerParamsJSON): FunctionTriggerParams {
return new FunctionTriggerParams({});
}
toEncodable() {
return FunctionTriggerParams.toEncodable(this);
}
}

10
javascript/solana.js/src/generated/attestation-program/types/index.ts
View File

@ -37,6 +37,16 @@ export type {
FunctionInitParamsJSON,
} from "./FunctionInitParams.js";
export { FunctionInitParams } from "./FunctionInitParams.js";
export type {
FunctionSetConfigParamsFields,
FunctionSetConfigParamsJSON,
} from "./FunctionSetConfigParams.js";
export { FunctionSetConfigParams } from "./FunctionSetConfigParams.js";
export type {
FunctionTriggerParamsFields,
FunctionTriggerParamsJSON,
} from "./FunctionTriggerParams.js";
export { FunctionTriggerParams } from "./FunctionTriggerParams.js";
export type {
FunctionVerifyParamsFields,
FunctionVerifyParamsJSON,

59
javascript/solana.js/test/attestation-function.spec.ts
View File

@ -9,7 +9,7 @@ import { setupTest, TestContext } from "./utils.js";
import * as anchor from "@coral-xyz/anchor";
import { NATIVE_MINT } from "@solana/spl-token";
import { Keypair, PublicKey, TransactionInstruction } from "@solana/web3.js";
import { BN, sleep } from "@switchboard-xyz/common";
import { BN, sleep, toUtf8 } from "@switchboard-xyz/common";
import assert from "assert";
const unixTimestamp = () => Math.floor(Date.now() / 1000);
@ -340,4 +340,61 @@ describe("Function Tests", () => {
console.log(`SAVES = ${legacyByteLength - lookupTableByteLength} bytes`);
});
it("Sets a function config", async () => {
const newName = "NEW_FUNCTION_NAME";
const newMetadata = "NEW_FUNCTION_METADATA";
const newContainer = "updatedContainerId";
const newContainerRegistry = "updated_container_registry.com";
await functionAccount.setConfig({
name: newName,
metadata: newMetadata,
container: newContainer,
containerRegistry: newContainerRegistry,
});
const myFunction = await functionAccount.loadData();
const updatedName = toUtf8(myFunction.name);
assert(
updatedName === newName,
`Function Name Mismatch: expected ${newName}, received ${updatedName}`
);
const updatedMetadata = toUtf8(myFunction.metadata);
assert(
updatedMetadata === newMetadata,
`Function Metadata Mismatch: expected ${newMetadata}, received ${updatedMetadata}`
);
const updatedContainer = toUtf8(myFunction.container);
assert(
updatedContainer === newContainer,
`Function Container Mismatch: expected ${newContainer}, received ${updatedContainer}`
);
const updatedContainerRegistry = toUtf8(myFunction.containerRegistry);
assert(
updatedContainerRegistry === newContainerRegistry,
`Function Container Registry Mismatch: expected ${newContainerRegistry}, received ${updatedContainerRegistry}`
);
});
it("Manually triggers a function", async () => {
const preFunctionData = await functionAccount.loadData();
assert(
preFunctionData.isTriggered === false,
"Function should be originally untriggered"
);
await functionAccount.trigger();
const postFunctionData = await functionAccount.loadData();
assert(
postFunctionData.isTriggered === true,
"Function should have been triggered"
);
});
});

78
rust/switchboard-solana/src/attestation_program/instructions/function_trigger.rs Normal file
View File

@ -0,0 +1,78 @@
use crate::*;
use anchor_lang::solana_program::entrypoint::ProgramResult;
use anchor_lang::solana_program::instruction::Instruction;
use anchor_lang::solana_program::program::{invoke, invoke_signed};
use anchor_lang::{Discriminator, InstructionData};
use anchor_spl::token::TokenAccount;
#[derive(Accounts)]
#[instruction(params: FunctionTriggerParams)] // rpc parameters hint
pub struct FunctionTrigger<'info> {
#[account(mut)]
pub function: AccountInfo<'info>,
#[account(signer)]
pub authority: AccountInfo<'info>,
}
#[derive(Clone, AnchorSerialize, AnchorDeserialize)]
pub struct FunctionTriggerParams {}
impl InstructionData for FunctionTriggerParams {}
impl Discriminator for FunctionTriggerParams {
const DISCRIMINATOR: [u8; 8] = [45, 224, 218, 184, 248, 83, 239, 200];
}
impl Discriminator for FunctionTrigger<'_> {
const DISCRIMINATOR: [u8; 8] = [45, 224, 218, 184, 248, 83, 239, 200];
}
impl<'info> FunctionTrigger<'info> {
pub fn get_instruction(&self, program_id: Pubkey) -> anchor_lang::Result<Instruction> {
let accounts = self.to_account_metas(None);
let mut data: Vec<u8> = FunctionTrigger::discriminator().try_to_vec()?;
let params = FunctionTriggerParams {};
let mut param_vec: Vec<u8> = params.try_to_vec()?;
data.append(&mut param_vec);
let instruction = Instruction::new_with_bytes(program_id, &data, accounts);
Ok(instruction)
}
pub fn invoke(&self, program: AccountInfo<'info>) -> ProgramResult {
let instruction = self.get_instruction(*program.key)?;
let account_infos = self.to_account_infos();
invoke(&instruction, &account_infos[..])
}
pub fn invoke_signed(
&self,
program: AccountInfo<'info>,
signer_seeds: &[&[&[u8]]],
) -> ProgramResult {
let instruction = self.get_instruction(*program.key)?;
let account_infos = self.to_account_infos();
invoke_signed(&instruction, &account_infos[..], signer_seeds)
}
fn to_account_infos(&self) -> Vec<AccountInfo<'info>> {
vec![self.function.clone(), self.authority.clone()]
}
#[allow(unused_variables)]
fn to_account_metas(&self, is_signer: Option<bool>) -> Vec<AccountMeta> {
vec![
AccountMeta {
pubkey: *self.function.key,
is_signer: self.function.is_signer,
is_writable: self.function.is_writable,
},
AccountMeta {
pubkey: *self.authority.key,
is_signer: self.authority.is_signer,
is_writable: self.authority.is_writable,
},
]
}
}

3
rust/switchboard-solana/src/attestation_program/instructions/mod.rs
View File

@ -1,2 +1,5 @@
pub mod function_verify;
pub use function_verify::*;
pub mod function_trigger;
pub use function_trigger::*;