Compare commits
7 Commits
6a1c128e85
...
fd78344ab5
Author | SHA1 | Date |
---|---|---|
Matthew Callens | fd78344ab5 | |
Armani Ferrante | aa0d8adc94 | |
Armani Ferrante | 6e3396701e | |
Armani Ferrante | 676ad1d583 | |
Matthew Callens | 449991acff | |
Paul | b68b9a6fde | |
Paul | 9c41642dff |
File diff suppressed because it is too large
Load Diff
|
@ -15,6 +15,6 @@ cpi = ["no-entrypoint"]
|
|||
[dependencies]
|
||||
anchor-lang = { path = "../../../../../../lang" }
|
||||
anchor-spl = { path = "../../../../../../spl" }
|
||||
solana-program = "1.7.1"
|
||||
solana-program = "1.10.29"
|
||||
#anchor-lang = "0.4.4"
|
||||
#anchor-spl = "0.4.4"
|
||||
|
|
|
@ -18,4 +18,4 @@ anchor-spl = { path = "../../../../../../spl" }
|
|||
#anchor-lang = "0.4.4"
|
||||
#anchor-spl = "0.4.4"
|
||||
lockup = { path = "../lockup", features = ["cpi"] }
|
||||
solana-program = "1.7.1"
|
||||
solana-program = "1.10.29"
|
||||
|
|
|
@ -239,7 +239,7 @@ mod registry {
|
|||
ctx.accounts.token_program.clone(),
|
||||
token::Burn {
|
||||
mint: ctx.accounts.pool_mint.to_account_info(),
|
||||
to: balances.spt.to_account_info(),
|
||||
from: balances.spt.to_account_info(),
|
||||
authority: ctx.accounts.member_signer.to_account_info(),
|
||||
},
|
||||
member_signer,
|
||||
|
@ -535,12 +535,14 @@ mod registry {
|
|||
let mut remaining_accounts: &[AccountInfo] = ctx.remaining_accounts;
|
||||
let cpi_program = ctx.accounts.lockup_program.clone();
|
||||
let mut bumps = std::collections::BTreeMap::new();
|
||||
let mut reallocs = std::collections::BTreeSet::new();
|
||||
let cpi_accounts = {
|
||||
let accs = CreateVesting::try_accounts(
|
||||
ctx.accounts.lockup_program.key,
|
||||
&mut remaining_accounts,
|
||||
&[],
|
||||
&mut bumps,
|
||||
&mut reallocs,
|
||||
)?;
|
||||
lockup::cpi::accounts::CreateVesting {
|
||||
vesting: accs.vesting.to_account_info(),
|
||||
|
|
|
@ -6,7 +6,7 @@ const utils = require("./utils");
|
|||
|
||||
describe("Lockup and Registry", () => {
|
||||
// Read the provider from the configured environmnet.
|
||||
const provider = anchor.Provider.env();
|
||||
const provider = anchor.AnchorProvider.env();
|
||||
|
||||
// Configure the client to use the provider.
|
||||
anchor.setProvider(provider);
|
||||
|
|
Loading…
Reference in New Issue