Skip to content

Commit 58e3a21

Browse files
authored
Merge pull request #5850 from BitGo/COIN-3576
fix(sdk-coin-stx): extracting memo from functionArgs
2 parents fa29e8e + d316b46 commit 58e3a21

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

modules/sdk-coin-stx/src/stx.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export class Stx extends BaseCoin {
215215
tokenName: findTokenNameByContract(txJson.payload.contractAddress, txJson.payload.contractName),
216216
};
217217
if (txJson.payload.functionArgs.length === 4) {
218-
memo = txJson.payload.functionArgs[3].buffer.toString('ascii');
218+
memo = Buffer.from(txJson.payload.functionArgs[3].value.buffer).toString();
219219
transactionRecipient['memo'] = memo;
220220
}
221221
} else {

modules/sdk-coin-stx/test/fixtures.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ export const unsignedTxExplainedTransfer = {
3434
};
3535

3636
export const txForExplainFungibleTokenTransfer =
37-
'808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b40000000302004f1813139aad38ac90ba905885ad4822bf33b7a56fff9127780c52359edee495587008204b0a7eaf39a0ba467b54a3e1896f863559349e5142f929cc4c706cd20201ae3fa80f2900c950667d827ed3b843afc94c63179dca70e6205f7d629a5f511a0ed45137c2baa16e33753c8e672dc61182869b6304fdea7daee42d8896f1a3fd00038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d00020302000000010102152fe507c09dbb23c3b7e5d166c81fc4b87692510b1a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131';
37+
'808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b4000000030201e4c98d7687eab5f11d03febc96951301eede336088b06c5a676cc6093f70e16b3f3533ccd8e6f92390a17dcc917f4e828657f17605574a5fcbb3da59f25483dc02019095c2f5217e0f168f27b605b47e9eac2da3c5ea309c42a2677addfb67c1fd471ef20187ce6b85b5b541d4b4f00d2f8ea8f7d42be84327968cb9411730b5217a00038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d00020302000000010102152fe507c09dbb23c3b7e5d166c81fc4b87692510b1a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0a020000000131';
3838

3939
export const fungibleTokenTransferTx = {
40-
id: '60f5c02136de2f2c01a24e25d7022bdf49ef28712a7ba6ac0bac9dd2215cdc59',
40+
id: '2bf5277ac7cd57741163d85b78905c97e55f05887369e3908450e4050aa4cf01',
4141
fee: '180',
4242
contractAddress: 'STAG18E45W613FZ3H4ZMF6QHH426EXM5QTSAVWYH',
4343
contractName: 'tsip6dp-token',

modules/sdk-coin-stx/test/unit/resources.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ export const FUNGIBLE_TOKEN_TRANSFER_CONSTANTS = {
184184
RECEIVER_ADDRESS: 'SN2NN1JP9AEP5BVE19RNJ6T2MP7NDGRZYST1VDF3M',
185185
TOKEN_NAME: 'tsip6dp-token',
186186
UNSIGNED_SINGLE_SIG_TX:
187-
'80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000001010215164247d6f2b425ac5771423ae6c80c754f7172b01a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131',
187+
'80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000001010215164247d6f2b425ac5771423ae6c80c754f7172b01a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0a020000000131',
188188
UNSIGNED_SINGLE_SIG_TX_WITHOUT_MEMO:
189189
'80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000001010215164247d6f2b425ac5771423ae6c80c754f7172b01a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000030100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece',
190190
SIGNED_MULTI_SIG_TX:
191-
'808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b40000000302004f1813139aad38ac90ba905885ad4822bf33b7a56fff9127780c52359edee495587008204b0a7eaf39a0ba467b54a3e1896f863559349e5142f929cc4c706cd20201ae3fa80f2900c950667d827ed3b843afc94c63179dca70e6205f7d629a5f511a0ed45137c2baa16e33753c8e672dc61182869b6304fdea7daee42d8896f1a3fd00038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d00020302000000010102152fe507c09dbb23c3b7e5d166c81fc4b87692510b1a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131',
191+
'808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b4000000030201e4c98d7687eab5f11d03febc96951301eede336088b06c5a676cc6093f70e16b3f3533ccd8e6f92390a17dcc917f4e828657f17605574a5fcbb3da59f25483dc02019095c2f5217e0f168f27b605b47e9eac2da3c5ea309c42a2677addfb67c1fd471ef20187ce6b85b5b541d4b4f00d2f8ea8f7d42be84327968cb9411730b5217a00038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d00020302000000010102152fe507c09dbb23c3b7e5d166c81fc4b87692510b1a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e0d747369703664702d746f6b656e010000000000002710021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0a020000000131',
192192
};

modules/sdk-coin-stx/test/unit/transactionBuilder/fungibleTokenTransferBuilder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { TestBitGo, TestBitGoAPI } from '@bitgo/sdk-test';
22
import { BitGoAPI } from '@bitgo/sdk-api';
33
import { coins } from '@bitgo/statics';
4-
import { bufferCVFromString, standardPrincipalCV, uintCV } from '@stacks/transactions';
4+
import { bufferCVFromString, someCV, standardPrincipalCV, uintCV } from '@stacks/transactions';
55
import should from 'should';
66
import { StacksMainnet, StacksTestnet } from '@stacks/network';
77
import { TransactionType } from '@bitgo/sdk-core';
@@ -59,7 +59,7 @@ describe('Stacks: Fungible Token Transfer Builder', () => {
5959
uintCV('10000'),
6060
standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.SENDER_ADDRESS),
6161
standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.RECEIVER_ADDRESS),
62-
bufferCVFromString('1'),
62+
someCV(bufferCVFromString('1')),
6363
]);
6464
builder.fromPubKey(testData.TX_SENDER.pub);
6565
builder.numberSignatures(1);
@@ -121,7 +121,7 @@ describe('Stacks: Fungible Token Transfer Builder', () => {
121121
uintCV('10000'),
122122
standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.SENDER_ADDRESS),
123123
standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.RECEIVER_ADDRESS),
124-
bufferCVFromString('1'),
124+
someCV(bufferCVFromString('1')),
125125
]);
126126

127127
builder.sign({ key: testData.prv1 });

0 commit comments

Comments
 (0)