Skip to content

Commit 9d1b0a1

Browse files
authored
Merge pull request #7023 from BitGo/harit/jito-correct-staking-deactivate-inputs-and-outputs
fix(sdk-coin-sol): remove inputs and outputs for jito deactivate
2 parents 465f4a2 + 15b2ad1 commit 9d1b0a1

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

modules/sdk-coin-sol/src/lib/transaction.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,11 @@ export class Transaction extends BaseTransaction {
371371
}
372372
break;
373373
case InstructionBuilderTypes.StakingDeactivate:
374-
if (instruction.params.amount && instruction.params.unstakingAddress) {
374+
if (
375+
instruction.params.amount &&
376+
instruction.params.unstakingAddress &&
377+
instruction.params.stakingType !== SolStakingTypeEnum.JITO
378+
) {
375379
inputs.push({
376380
address: instruction.params.stakingAddress,
377381
value: instruction.params.amount,

modules/sdk-coin-sol/test/unit/transactionBuilder/stakingActivateBuilder.ts

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,20 @@ describe('Sol Staking Activate Builder', () => {
105105
},
106106
},
107107
]);
108-
tx.inputs.length.should.equal(1);
109-
tx.inputs[0].should.deepEqual({
110-
address: wallet.pub,
111-
value: amount,
112-
coin: 'tsol',
113-
});
114-
tx.outputs.length.should.equal(1);
115-
tx.outputs[0].should.deepEqual({
116-
address: stakeAccount.pub,
117-
value: amount,
118-
coin: 'tsol',
119-
});
108+
tx.inputs.should.deepEqual([
109+
{
110+
address: wallet.pub,
111+
value: amount,
112+
coin: 'tsol',
113+
},
114+
]);
115+
tx.outputs.should.deepEqual([
116+
{
117+
address: stakeAccount.pub,
118+
value: amount,
119+
coin: 'tsol',
120+
},
121+
]);
120122
};
121123

122124
const signBuilderNativeOrMarinade = (txBuilder: StakingActivateBuilder) => {
@@ -203,13 +205,14 @@ describe('Sol Staking Activate Builder', () => {
203205
});
204206

205207
txJson.instructionsData.should.deepEqual(expectedInstructions);
206-
tx.inputs.length.should.equal(1);
207-
tx.inputs[0].should.deepEqual({
208-
address: wallet.pub,
209-
value: amount,
210-
coin: 'tsol',
211-
});
212-
tx.outputs.length.should.equal(0);
208+
tx.inputs.should.deepEqual([
209+
{
210+
address: wallet.pub,
211+
value: amount,
212+
coin: 'tsol',
213+
},
214+
]);
215+
tx.outputs.should.deepEqual([]);
213216
};
214217

215218
describe('Succeed', () => {

modules/sdk-coin-sol/test/unit/transactionBuilder/stakingDeactivateBuilder.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ describe('Sol Staking Deactivate Builder', () => {
346346
},
347347
},
348348
]);
349+
tx.inputs.should.deepEqual([]);
350+
tx.outputs.should.deepEqual([]);
349351
},
350352
knownRawTx: testData.JITO_STAKING_DEACTIVATE_SIGNED_TX,
351353
});

0 commit comments

Comments
 (0)