From 68f16bf7b6dec8f08b6b38e105b5eb005433bf78 Mon Sep 17 00:00:00 2001 From: Jackson Jessup Date: Mon, 12 Dec 2022 10:45:24 -0500 Subject: [PATCH] Bugfix: extendInstruction should be 'wrap' not 'unwrap' --- .../solana.js/src/accounts/leaseAccount.ts | 8 ++--- javascript/solana.js/test/lease.spec.ts | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 javascript/solana.js/test/lease.spec.ts diff --git a/javascript/solana.js/src/accounts/leaseAccount.ts b/javascript/solana.js/src/accounts/leaseAccount.ts index 9dbf99c..47f8e43 100644 --- a/javascript/solana.js/src/accounts/leaseAccount.ts +++ b/javascript/solana.js/src/accounts/leaseAccount.ts @@ -400,11 +400,9 @@ export class LeaseAccount extends Account { const funderBalance = (await this.program.mint.getAssociatedBalance(funderAuthority)) ?? 0; if (funderBalance < params.loadAmount) { - const wrapIxns = await this.program.mint.unwrapInstructions( - payer, - params.loadAmount, - params.funderAuthority - ); + const wrapIxns = await this.program.mint.wrapInstructions(payer, { + amount: params.loadAmount, + }); ixns.push(...wrapIxns.ixns); signers.push(...wrapIxns.signers); } diff --git a/javascript/solana.js/test/lease.spec.ts b/javascript/solana.js/test/lease.spec.ts new file mode 100644 index 0000000..4957210 --- /dev/null +++ b/javascript/solana.js/test/lease.spec.ts @@ -0,0 +1,30 @@ +import 'mocha'; + +import * as sbv2 from '../src'; +import { setupTest, TestContext } from './utilts'; +import { Keypair } from '@solana/web3.js'; + +describe('Lease Tests', () => { + let ctx: TestContext; + + before(async () => { + ctx = await setupTest(); + }); + + const aggregator = Keypair.generate(); + const queue = Keypair.generate(); + + it('Creates a Lease', async () => { + const aggregatorAccount = new sbv2.AggregatorAccount( + ctx.program, + aggregator.publicKey + ); + const queueAccount = new sbv2.QueueAccount(ctx.program, queue.publicKey); + const [leaseAccount] = await sbv2.LeaseAccount.create(ctx.program, { + aggregatorAccount, + queueAccount, + loadAmount: 0.01, + }); + await leaseAccount.loadData(); + }); +});