From 8deeb5bc74b74f7992462537650ff13507629ea4 Mon Sep 17 00:00:00 2001 From: Sean Date: Fri, 21 Oct 2022 15:14:30 -0400 Subject: [PATCH] fix(roles): updated test --- programs/mesh/src/lib.rs | 2 +- programs/program-manager/src/lib.rs | 2 +- programs/squads-mpl/src/lib.rs | 3 +- programs/txmeta/src/lib.rs | 2 +- sdk/lib/idl/mesh.json | 794 +++++++++++++++++++++++++++ sdk/lib/idl/roles.json | 263 +++++++++ sdk/lib/idl/squads_mpl.json | 40 +- sdk/lib/idl/txmeta.json | 22 + sdk/lib/target/idl/squads_mpl.json | 40 +- sdk/lib/target/types/squads_mpl.d.ts | 40 +- sdk/lib/target/types/squads_mpl.js | 40 +- tests/squads-mpl.ts | 3 +- 12 files changed, 1166 insertions(+), 85 deletions(-) create mode 100644 sdk/lib/idl/mesh.json create mode 100644 sdk/lib/idl/roles.json create mode 100644 sdk/lib/idl/txmeta.json diff --git a/programs/mesh/src/lib.rs b/programs/mesh/src/lib.rs index 084ea53..fc5d211 100644 --- a/programs/mesh/src/lib.rs +++ b/programs/mesh/src/lib.rs @@ -6,7 +6,7 @@ pub mod state; use errors::*; pub mod errors; -declare_id!("SMPLVC8MxZ5Bf5EfF7PaMiTCxoBAcmkbM2vkrvMK8ho"); +declare_id!("5mt41y2huXBXb8HSkMiNexABuk8GVEmrgZqEgauGtV4y"); #[program] pub mod mesh { diff --git a/programs/program-manager/src/lib.rs b/programs/program-manager/src/lib.rs index e548b68..0535152 100644 --- a/programs/program-manager/src/lib.rs +++ b/programs/program-manager/src/lib.rs @@ -4,7 +4,7 @@ use squads_mpl::state::*; use squads_mpl::errors::*; pub mod state; -declare_id!("SMPLKTQhrgo22hFCVq2VGX1KAktTWjeizkhrdB1eauK"); +declare_id!("8Y5Qbdb67Ka4LcPCziyhLrGbYN2ftZ1BG11Q5PiHenLP"); #[program] pub mod program_manager { diff --git a/programs/squads-mpl/src/lib.rs b/programs/squads-mpl/src/lib.rs index 062df3b..2f8f767 100644 --- a/programs/squads-mpl/src/lib.rs +++ b/programs/squads-mpl/src/lib.rs @@ -7,7 +7,7 @@ pub mod state; use errors::*; pub mod errors; -declare_id!("SMPLecH534NA9acpos4G6x7uf3LWbCAwZQE9e8ZekMu"); +declare_id!("84Ue9gKQUsStFJQCNQpsqvbceo7fKYSSCCMXxMZ5PkiW"); #[program] pub mod squads_mpl { @@ -185,6 +185,7 @@ pub mod squads_mpl { // instructions, whereas authorities 1 or greater refer to a vault, // upgrade authority, or other. pub fn create_transaction(ctx: Context, authority_index: u32) -> Result<()> { + msg!("Creating transaction from payer {:?}", ctx.accounts.creator.key()); let ms = &mut ctx.accounts.multisig; let authority_bump = match authority_index { 1.. => { diff --git a/programs/txmeta/src/lib.rs b/programs/txmeta/src/lib.rs index 722b75c..cca6154 100644 --- a/programs/txmeta/src/lib.rs +++ b/programs/txmeta/src/lib.rs @@ -1,5 +1,5 @@ use anchor_lang::prelude::*; -declare_id!("SMPL5bz5ERMdweouWrXtk3jmb6FnjZkWf7pHDsE6Zwz"); +declare_id!("5o4wQhxotU8rVz6iK1VowzyX53z3HuznvhvYYCMZn875"); #[program] pub mod txmeta { diff --git a/sdk/lib/idl/mesh.json b/sdk/lib/idl/mesh.json new file mode 100644 index 0000000..c2019b0 --- /dev/null +++ b/sdk/lib/idl/mesh.json @@ -0,0 +1,794 @@ +{ + "version": "0.0.1", + "name": "mesh", + "instructions": [ + { + "name": "create", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "externalAuthority", + "type": "publicKey" + }, + { + "name": "threshold", + "type": "u16" + }, + { + "name": "createKey", + "type": "publicKey" + }, + { + "name": "members", + "type": { + "vec": "publicKey" + } + } + ] + }, + { + "name": "addMember", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + }, + { + "name": "rent", + "isMut": false, + "isSigner": false + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "newMember", + "type": "publicKey" + } + ] + }, + { + "name": "removeMember", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "oldMember", + "type": "publicKey" + } + ] + }, + { + "name": "removeMemberAndChangeThreshold", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "oldMember", + "type": "publicKey" + }, + { + "name": "newThreshold", + "type": "u16" + } + ] + }, + { + "name": "addMemberAndChangeThreshold", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + }, + { + "name": "rent", + "isMut": false, + "isSigner": false + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "newMember", + "type": "publicKey" + }, + { + "name": "newThreshold", + "type": "u16" + } + ] + }, + { + "name": "changeThreshold", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "newThreshold", + "type": "u16" + } + ] + }, + { + "name": "addAuthority", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [] + }, + { + "name": "setExternalExecute", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "setting", + "type": "bool" + } + ] + }, + { + "name": "createTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "authorityIndex", + "type": "u32" + } + ] + }, + { + "name": "activateTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [] + }, + { + "name": "addInstruction", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "instruction", + "isMut": true, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "incomingInstruction", + "type": { + "defined": "IncomingInstruction" + } + }, + { + "name": "authorityIndex", + "type": { + "option": "u32" + } + }, + { + "name": "authorityBump", + "type": { + "option": "u8" + } + }, + { + "name": "authorityType", + "type": { + "defined": "MsAuthorityType" + } + } + ] + }, + { + "name": "approveTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [] + }, + { + "name": "rejectTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [] + }, + { + "name": "cancelTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [] + }, + { + "name": "executeTransaction", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "accountList", + "type": "bytes" + } + ] + }, + { + "name": "executeInstruction", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "instruction", + "isMut": true, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + } + ], + "args": [] + }, + { + "name": "changeExternalAuthority", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "externalAuthority", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "newAuthority", + "type": "publicKey" + } + ] + } + ], + "accounts": [ + { + "name": "Ms", + "type": { + "kind": "struct", + "fields": [ + { + "name": "threshold", + "type": "u16" + }, + { + "name": "authorityIndex", + "type": "u16" + }, + { + "name": "transactionIndex", + "type": "u32" + }, + { + "name": "msChangeIndex", + "type": "u32" + }, + { + "name": "bump", + "type": "u8" + }, + { + "name": "createKey", + "type": "publicKey" + }, + { + "name": "allowExternalExecute", + "type": "bool" + }, + { + "name": "keys", + "type": { + "vec": "publicKey" + } + }, + { + "name": "externalAuthority", + "type": "publicKey" + } + ] + } + }, + { + "name": "MsTransaction", + "type": { + "kind": "struct", + "fields": [ + { + "name": "creator", + "type": "publicKey" + }, + { + "name": "ms", + "type": "publicKey" + }, + { + "name": "transactionIndex", + "type": "u32" + }, + { + "name": "authorityIndex", + "type": "u32" + }, + { + "name": "authorityBump", + "type": "u8" + }, + { + "name": "status", + "type": { + "defined": "MsTransactionStatus" + } + }, + { + "name": "instructionIndex", + "type": "u8" + }, + { + "name": "bump", + "type": "u8" + }, + { + "name": "approved", + "type": { + "vec": "publicKey" + } + }, + { + "name": "rejected", + "type": { + "vec": "publicKey" + } + }, + { + "name": "cancelled", + "type": { + "vec": "publicKey" + } + }, + { + "name": "executedIndex", + "type": "u8" + } + ] + } + }, + { + "name": "MsInstruction", + "type": { + "kind": "struct", + "fields": [ + { + "name": "programId", + "type": "publicKey" + }, + { + "name": "keys", + "type": { + "vec": { + "defined": "MsAccountMeta" + } + } + }, + { + "name": "data", + "type": "bytes" + }, + { + "name": "instructionIndex", + "type": "u8" + }, + { + "name": "bump", + "type": "u8" + }, + { + "name": "authorityType", + "type": { + "defined": "MsAuthorityType" + } + }, + { + "name": "authorityIndex", + "type": { + "option": "u32" + } + }, + { + "name": "authorityBump", + "type": { + "option": "u8" + } + }, + { + "name": "executed", + "type": "bool" + } + ] + } + } + ], + "types": [ + { + "name": "MsAccountMeta", + "type": { + "kind": "struct", + "fields": [ + { + "name": "pubkey", + "type": "publicKey" + }, + { + "name": "isSigner", + "type": "bool" + }, + { + "name": "isWritable", + "type": "bool" + } + ] + } + }, + { + "name": "IncomingInstruction", + "type": { + "kind": "struct", + "fields": [ + { + "name": "programId", + "type": "publicKey" + }, + { + "name": "keys", + "type": { + "vec": { + "defined": "MsAccountMeta" + } + } + }, + { + "name": "data", + "type": "bytes" + } + ] + } + }, + { + "name": "MsTransactionStatus", + "type": { + "kind": "enum", + "variants": [ + { + "name": "Draft" + }, + { + "name": "Active" + }, + { + "name": "ExecuteReady" + }, + { + "name": "Executed" + }, + { + "name": "Rejected" + }, + { + "name": "Cancelled" + } + ] + } + }, + { + "name": "MsAuthorityType", + "type": { + "kind": "enum", + "variants": [ + { + "name": "Default" + }, + { + "name": "Custom" + } + ] + } + } + ], + "errors": [ + { + "code": 6000, + "name": "KeyNotInMultisig" + }, + { + "code": 6001, + "name": "InvalidTransactionState" + }, + { + "code": 6002, + "name": "InvalidNumberOfAccounts" + }, + { + "code": 6003, + "name": "InvalidInstructionAccount" + }, + { + "code": 6004, + "name": "InvalidAuthorityIndex" + }, + { + "code": 6005, + "name": "InvalidAuthorityType" + }, + { + "code": 6006, + "name": "TransactionAlreadyExecuted" + }, + { + "code": 6007, + "name": "CannotRemoveSoloMember" + }, + { + "code": 6008, + "name": "InvalidThreshold" + }, + { + "code": 6009, + "name": "DeprecatedTransaction" + }, + { + "code": 6010, + "name": "InstructionFailed" + }, + { + "code": 6011, + "name": "MaxMembersReached" + }, + { + "code": 6012, + "name": "EmptyMembers" + }, + { + "code": 6013, + "name": "PartialExecution" + }, + { + "code": 6014, + "name": "InvalidExternalAuthority" + } + ] +} \ No newline at end of file diff --git a/sdk/lib/idl/roles.json b/sdk/lib/idl/roles.json new file mode 100644 index 0000000..fc830d9 --- /dev/null +++ b/sdk/lib/idl/roles.json @@ -0,0 +1,263 @@ +{ + "version": "0.1.0", + "name": "roles", + "instructions": [ + { + "name": "addUser", + "accounts": [ + { + "name": "user", + "isMut": true, + "isSigner": false + }, + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "payer", + "isMut": true, + "isSigner": true + }, + { + "name": "rent", + "isMut": false, + "isSigner": false + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + }, + { + "name": "squadsProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "originKey", + "type": "publicKey" + }, + { + "name": "role", + "type": { + "defined": "Role" + } + } + ] + }, + { + "name": "createProxy", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "user", + "isMut": false, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + }, + { + "name": "squadsProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "authorityIndex", + "type": "u32" + } + ] + }, + { + "name": "addProxy", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "instruction", + "isMut": true, + "isSigner": false + }, + { + "name": "user", + "isMut": false, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + }, + { + "name": "squadsProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "incomingInstruction", + "type": { + "defined": "IncomingInstruction" + } + } + ] + }, + { + "name": "activateProxy", + "accounts": [ + { + "name": "multisig", + "isMut": false, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "user", + "isMut": false, + "isSigner": false + }, + { + "name": "creator", + "isMut": true, + "isSigner": true + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false + }, + { + "name": "squadsProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [] + }, + { + "name": "executeTxProxy", + "accounts": [ + { + "name": "multisig", + "isMut": true, + "isSigner": false + }, + { + "name": "transaction", + "isMut": true, + "isSigner": false + }, + { + "name": "user", + "isMut": false, + "isSigner": false + }, + { + "name": "member", + "isMut": true, + "isSigner": true + }, + { + "name": "squadsProgram", + "isMut": false, + "isSigner": false + } + ], + "args": [ + { + "name": "accountList", + "type": "bytes" + } + ] + } + ], + "accounts": [ + { + "name": "User", + "type": { + "kind": "struct", + "fields": [ + { + "name": "role", + "type": { + "defined": "Role" + } + }, + { + "name": "originKey", + "type": "publicKey" + }, + { + "name": "bump", + "type": "u8" + } + ] + } + } + ], + "types": [ + { + "name": "Role", + "type": { + "kind": "enum", + "variants": [ + { + "name": "Initiate" + }, + { + "name": "Vote" + }, + { + "name": "Execute" + }, + { + "name": "InitiateAndExecute" + }, + { + "name": "InitiateAndVote" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/sdk/lib/idl/squads_mpl.json b/sdk/lib/idl/squads_mpl.json index 84a11b8..da103c7 100644 --- a/sdk/lib/idl/squads_mpl.json +++ b/sdk/lib/idl/squads_mpl.json @@ -586,49 +586,49 @@ } ] } - } - ], - "types": [ + }, { - "name": "MsAccountMeta", + "name": "IncomingInstruction", "type": { "kind": "struct", "fields": [ { - "name": "pubkey", + "name": "programId", "type": "publicKey" }, { - "name": "isSigner", - "type": "bool" + "name": "keys", + "type": { + "vec": { + "defined": "MsAccountMeta" + } + } }, { - "name": "isWritable", - "type": "bool" + "name": "data", + "type": "bytes" } ] } - }, + } + ], + "types": [ { - "name": "IncomingInstruction", + "name": "MsAccountMeta", "type": { "kind": "struct", "fields": [ { - "name": "programId", + "name": "pubkey", "type": "publicKey" }, { - "name": "keys", - "type": { - "vec": { - "defined": "MsAccountMeta" - } - } + "name": "isSigner", + "type": "bool" }, { - "name": "data", - "type": "bytes" + "name": "isWritable", + "type": "bool" } ] } diff --git a/sdk/lib/idl/txmeta.json b/sdk/lib/idl/txmeta.json new file mode 100644 index 0000000..6131ada --- /dev/null +++ b/sdk/lib/idl/txmeta.json @@ -0,0 +1,22 @@ +{ + "version": "0.1.0", + "name": "txmeta", + "instructions": [ + { + "name": "trackMeta", + "accounts": [ + { + "name": "member", + "isMut": true, + "isSigner": true + } + ], + "args": [ + { + "name": "meta", + "type": "string" + } + ] + } + ] +} \ No newline at end of file diff --git a/sdk/lib/target/idl/squads_mpl.json b/sdk/lib/target/idl/squads_mpl.json index 68d3cbc..d446077 100644 --- a/sdk/lib/target/idl/squads_mpl.json +++ b/sdk/lib/target/idl/squads_mpl.json @@ -586,49 +586,49 @@ } ] } - } - ], - "types": [ + }, { - "name": "MsAccountMeta", + "name": "IncomingInstruction", "type": { "kind": "struct", "fields": [ { - "name": "pubkey", + "name": "programId", "type": "publicKey" }, { - "name": "isSigner", - "type": "bool" + "name": "keys", + "type": { + "vec": { + "defined": "MsAccountMeta" + } + } }, { - "name": "isWritable", - "type": "bool" + "name": "data", + "type": "bytes" } ] } - }, + } + ], + "types": [ { - "name": "IncomingInstruction", + "name": "MsAccountMeta", "type": { "kind": "struct", "fields": [ { - "name": "programId", + "name": "pubkey", "type": "publicKey" }, { - "name": "keys", - "type": { - "vec": { - "defined": "MsAccountMeta" - } - } + "name": "isSigner", + "type": "bool" }, { - "name": "data", - "type": "bytes" + "name": "isWritable", + "type": "bool" } ] } diff --git a/sdk/lib/target/types/squads_mpl.d.ts b/sdk/lib/target/types/squads_mpl.d.ts index c4b0ab3..2388761 100644 --- a/sdk/lib/target/types/squads_mpl.d.ts +++ b/sdk/lib/target/types/squads_mpl.d.ts @@ -586,49 +586,49 @@ export declare type SquadsMpl = { } ]; }; - } - ]; - "types": [ + }, { - "name": "MsAccountMeta"; + "name": "incomingInstruction"; "type": { "kind": "struct"; "fields": [ { - "name": "pubkey"; + "name": "programId"; "type": "publicKey"; }, { - "name": "isSigner"; - "type": "bool"; + "name": "keys"; + "type": { + "vec": { + "defined": "MsAccountMeta"; + }; + }; }, { - "name": "isWritable"; - "type": "bool"; + "name": "data"; + "type": "bytes"; } ]; }; - }, + } + ]; + "types": [ { - "name": "IncomingInstruction"; + "name": "MsAccountMeta"; "type": { "kind": "struct"; "fields": [ { - "name": "programId"; + "name": "pubkey"; "type": "publicKey"; }, { - "name": "keys"; - "type": { - "vec": { - "defined": "MsAccountMeta"; - }; - }; + "name": "isSigner"; + "type": "bool"; }, { - "name": "data"; - "type": "bytes"; + "name": "isWritable"; + "type": "bool"; } ]; }; diff --git a/sdk/lib/target/types/squads_mpl.js b/sdk/lib/target/types/squads_mpl.js index 02adc63..659407a 100644 --- a/sdk/lib/target/types/squads_mpl.js +++ b/sdk/lib/target/types/squads_mpl.js @@ -589,49 +589,49 @@ exports.IDL = { } ] } - } - ], - "types": [ + }, { - "name": "MsAccountMeta", + "name": "incomingInstruction", "type": { "kind": "struct", "fields": [ { - "name": "pubkey", + "name": "programId", "type": "publicKey" }, { - "name": "isSigner", - "type": "bool" + "name": "keys", + "type": { + "vec": { + "defined": "MsAccountMeta" + } + } }, { - "name": "isWritable", - "type": "bool" + "name": "data", + "type": "bytes" } ] } - }, + } + ], + "types": [ { - "name": "IncomingInstruction", + "name": "MsAccountMeta", "type": { "kind": "struct", "fields": [ { - "name": "programId", + "name": "pubkey", "type": "publicKey" }, { - "name": "keys", - "type": { - "vec": { - "defined": "MsAccountMeta" - } - } + "name": "isSigner", + "type": "bool" }, { - "name": "data", - "type": "bytes" + "name": "isWritable", + "type": "bool" } ] } diff --git a/tests/squads-mpl.ts b/tests/squads-mpl.ts index 5db55d8..75e4a2f 100644 --- a/tests/squads-mpl.ts +++ b/tests/squads-mpl.ts @@ -1200,8 +1200,9 @@ describe("Programs", function(){ try { await provider.sendAndConfirm(approveIxTx, [userWithRole], {skipPreflight: true}); }catch(e){ - console.log(e); + // console.log(e); } + expect(txState.status).to.have.property("active"); }); });