Skip to content

Commit 1e85dce

Browse files
noel-bitgonoel-bitgo
committed
fix(sdk-coin-sol): update tests
CR-1224
1 parent 90628d4 commit 1e85dce

File tree

4 files changed

+40
-34
lines changed

4 files changed

+40
-34
lines changed

‎modules/sdk-coin-sol/test/resources/sol.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,12 @@ export const TOKEN_TRANSFER_UNSIGNED_TX_WITH_DURABLE_NONCE =
328328
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAUJAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dv+hKJ+pxZaLwHGEyk2Svp5PfAC5ZEi/wYI1tPTHHhbpXS8VwMObd6fTnfCKrnxvwQ5LFhipVbiG+aiTNM1eFsqRgbUvftkOrrDa1Lcb60U4NhZ2ExcX6TCVgQX7ejidUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA0QOJ+87lKPIIYR3MxzSzEJJUDLK41Y0QDy6qLO202l4Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCp4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEDBAMBBwAEBAAAAAUACQOAlpgAAAAAAAgEAgYDAAoM4JMEAAAAAAAJ';
329329
export const TOKEN_TRANSFER_UNSIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE =
330330
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAYKAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dv+hKJ+pxZaLwHGEyk2Svp5PfAC5ZEi/wYI1tPTHHhbpXS8VwMObd6fTnfCKrnxvwQ5LFhipVbiG+aiTNM1eFsqRgbUvftkOrrDa1Lcb60U4NhZ2ExcX6TCVgQX7ejidUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA0QOJ+87lKPIIYR3MxzSzEJJUDLK41Y0QDy6qLO202l4FSlNamSkhBk0k6HFg2jh8fDW13bySu4HkH6hAQQVEjQan1RcZLFaO4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQQEAwEIAAQEAAAABQAJA4CWmAAAAAAACQQCBgMACgzgkwQAAAAAAAkHAAl0ZXN0IG1lbW8=';
331+
export const TOKEN_TRANSFER_UNSIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE_OLD =
332+
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAUJAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dv+hKJ+pxZaLwHGEyk2Svp5PfAC5ZEi/wYI1tPTHHhbpXS8VwMObd6fTnfCKrnxvwQ5LFhipVbiG+aiTNM1eFsqRgbUvftkOrrDa1Lcb60U4NhZ2ExcX6TCVgQX7ejidUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANEDifvO5SjyCGEdzMc0sxCSVAyyuNWNEA8uqizttNpeBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCp4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEDBAMBBwAEBAAAAAgEAgUDAAoM4JMEAAAAAAAJBgAJdGVzdCBtZW1v';
331333
export const TOKEN_TRANSFER_SIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE =
332334
'AV6dvFclQvoTuCoia6uKVEUuUnV6Vzuzoyrbn9r/hvlDupmR6Y+zRtKCyIoAu7Yn4SDswSP5ihpsRl+sla53rQABAAYKAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dv+hKJ+pxZaLwHGEyk2Svp5PfAC5ZEi/wYI1tPTHHhbpXS8VwMObd6fTnfCKrnxvwQ5LFhipVbiG+aiTNM1eFsqRgbUvftkOrrDa1Lcb60U4NhZ2ExcX6TCVgQX7ejidUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA0QOJ+87lKPIIYR3MxzSzEJJUDLK41Y0QDy6qLO202l4FSlNamSkhBk0k6HFg2jh8fDW13bySu4HkH6hAQQVEjQan1RcZLFaO4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQQEAwEIAAQEAAAABQAJA4CWmAAAAAAACQQCBgMACgzgkwQAAAAAAAkHAAl0ZXN0IG1lbW8=';
335+
export const TOKEN_TRANSFER_SIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE_OLD =
336+
'AWXUzSg3U+F7AyOZHUAok7yDRYTL2V9xUk2WVb9I8O6kwhqTve90XGImCUhc7B94Msub4ff064kOF+OCcO1x2AYBAAUJAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dv+hKJ+pxZaLwHGEyk2Svp5PfAC5ZEi/wYI1tPTHHhbpXS8VwMObd6fTnfCKrnxvwQ5LFhipVbiG+aiTNM1eFsqRgbUvftkOrrDa1Lcb60U4NhZ2ExcX6TCVgQX7ejidUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANEDifvO5SjyCGEdzMc0sxCSVAyyuNWNEA8uqizttNpeBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCp4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEDBAMBBwAEBAAAAAgEAgUDAAoM4JMEAAAAAAAJBgAJdGVzdCBtZW1v';
333337
export const MULTI_TOKEN_TRANSFER_SIGNED =
334338
'AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3ze/GxXO/llr/+TQNQ6DxajOJxj3pDjqMtZYHLuX9VU3suEklG4rJF80eXXbIHxvBgFfnDrW+ZfS7uCRIclINAgEGEAqDJI0awkVCvpm9Tq3GFbER6BjpF+XPZ/XXk+Rqv3dWReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EY19xOQg+B6cqXSn9ODw0NMlw+NO0os7hLyaFGBpYImEtH0Sg4vrCpHy4umerSfCk0dyFwuoF61EaGbvQkMX7yTN7ajWa08Nplu4ugENukXhibq406iJdXhn9fMg/aoOJV9JIdjofHGJF6n5KCAOgVlwmMSlvINuY1ey055UWp6W/6Eon6nFlovAcYTKTZK+nk98ALlkSL/BgjW09MceFuo4/riy2WY4iZMJR1N1Z9eZfhUSAuUDEaMBjMCqQa8ampGBtS9+2Q6usNrUtxvrRTg2FnYTFxfpMJWBBft6OJ1a+Z/3SC/6IvIX4xpRUpsHc/EW8GbStZS1PYslY6VK9TAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAANEDifvO5SjyCGEdzMc0sxCSVAyyuNWNEA8uqizttNpeBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCp4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEJCgMGDgEEBAAAAAsACQOAlpgAAAAAAA8EAgwIAAoM4JMEAAAAAAAJDwQCDAQACgzgkwQAAAAAAAkPBAIMBwAKDOCTBAAAAAAACQ8EAgwJAAoM4JMEAAAAAAAJDwQCDAMACgzgkwQAAAAAAAkPBAIMBQAKDOCTBAAAAAAACQ0ACXRlc3QgbWVtbw==';
335339
export const MULTI_ASSET_TOKEN_TRANSFER_UNSIGNED =
@@ -341,7 +345,7 @@ export const MULTI_TOKEN_TRANSFER_UNSIGNED_WITH_UNIQUE_CREATE_ATA_AND_MEMO_AND_D
341345
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAgNAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6dJP1r3FCCofxhWCBv6dIPMrDQrI7IXh1M2k+lzW80KTW/6Eon6nFlovAcYTKTZK+nk98ALlkSL/BgjW09MceFuldLxXAw5t3p9Od8IqufG/BDksWGKlVuIb5qJM0zV4WypGBtS9+2Q6usNrUtxvrRTg2FnYTFxfpMJWBBft6OJ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+FkDBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAANEDifvO5SjyCGEdzMc0sxCSVAyyuNWNEA8uqizttNpeBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAan1RcZLFxRIYzJTD1K8X9Y2u4Im6H9ROPb2YoAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQcFAwIKAAQEAAAABwAJA4CWmAAAAAAABgcAAQQIBQwLAAwEAwgEAAoM4JMEAAAAAAAJDAQDCAQACgzgkwQAAAAAAAkMBAMIBAAKDOCTBAAAAAAACQkACXRlc3QgbWVtbw==';
342346

343347
export const MULTI_TOKEN_TRANSFER_UNSIGNED_WITH_MULTI_CREATE_ATA_AND_MEMO_AND_DURABLE_NONCE =
344-
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAcQAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6c2OtUqiAY5oPhxdb4JRUq7kZNuFpmM/AJNk1vd/+P9XUk/WvcUIKh/GFYIG/p0g8ysNCsjsheHUzaT6XNbzQpNQ5atdI+MFzJL5dUqw4NRdw+mkmCd1N2pvGbKpLfgPC5M3tqNZrTw2mW7i6AQ26ReGJurjTqIl1eGf18yD9qg4m/6Eon6nFlovAcYTKTZK+nk98ALlkSL/BgjW09MceFuldLxXAw5t3p9Od8IqufG/BDksWGKlVuIb5qJM0zV4Wyjj+uLLZZjiJkwlHU3Vn15l+FRIC5QMRowGMwKpBrxqakYG1L37ZDq6w2tS3G+tFODYWdhMXF+kwlYEF+3o4nVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMlyWPTiSJ8bs9ECkUjg2DC1oTmdr/EIQEjnvY2+n4WdEDifvO5SjyCGEdzMc0sxCSVAyyuNWNEA8uqizttNpeBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0Gp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAan1RcZLFxRIYzJTD1K8X9Y2u4Im6H9ROPb2YoAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQgJAwUNAAQEAAAACgcAAggLCQ8OAAoHAAMECwkPDgAKBwABBwsJDw4ADwQGCwgACgzgkwQAAAAAAAkPBAYLBAAKDOCTBAAAAAAACQ8EBgsHAAoM4JMEAAAAAAAJDAAJdGVzdCBtZW1v';
348+
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAgRAGymKVqOJEQemBHH67uu8ISJV4rtwTejLrjw7VSeW6c2OtUqiAY5oPhxdb4JRUq7kZNuFpmM/AJNk1vd/+P9XUk/WvcUIKh/GFYIG/p0g8ysNCsjsheHUzaT6XNbzQpNQ5atdI+MFzJL5dUqw4NRdw+mkmCd1N2pvGbKpLfgPC5M3tqNZrTw2mW7i6AQ26ReGJurjTqIl1eGf18yD9qg4m/6Eon6nFlovAcYTKTZK+nk98ALlkSL/BgjW09MceFuldLxXAw5t3p9Od8IqufG/BDksWGKlVuIb5qJM0zV4Wyjj+uLLZZjiJkwlHU3Vn15l+FRIC5QMRowGMwKpBrxqakYG1L37ZDq6w2tS3G+tFODYWdhMXF+kwlYEF+3o4nVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMlyWPTiSJ8bs9ECkUjg2DC1oTmdr/EIQEjnvY2+n4WQMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA0QOJ+87lKPIIYR3MxzSzEJJUDLK41Y0QDy6qLO202l4FSlNamSkhBk0k6HFg2jh8fDW13bySu4HkH6hAQQVEjQan1RcZLFaO4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAAAG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqeMy2vkvq+zotj/3pEAF5f39mvoVh1a2HFqV+QSzuNCBCQkDBQ4ABAQAAAALAAkDgJaYAAAAAAAKBwACCAwJEA8ACgcAAwQMCRAPAAoHAAEHDAkQDwAQBAYMCAAKDOCTBAAAAAAACRAEBgwEAAoM4JMEAAAAAAAJEAQGDAcACgzgkwQAAAAAAAkNAAl0ZXN0IG1lbW8=';
345349

346350
export const SINGLE_TOKEN_TRANSFER_WITH_ATA_CREATION =
347351
'AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAYJQlxb88UapZ0T6mWzABhtX/lDiPrAaUMbsl4vmXpBgd4Ya1unhtoJ3Rc6KaGQND1nozFD8KFn3Y4g9AH/pAefh3YVdbX/1crWlQ+Gw+N/Z/AQevfYXSftzGWYuTBFDxo/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMlyWPTiSJ8bs9ECkUjg2DC1oTmdr/EIQEjnvY2+n4WaR1+rfN0q5fmLy3KefW6kwPonSxd9hYC4DVZ3FlWyrI0QOJ+87lKPIIYR3MxzSzEJJUDLK41Y0QDy6qLO202l4Gp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpEHPqtGYOjjqVfHgg1S32M4qMe2AQO/kDy1+CEYQwkisCBAcAAQUGAwgHAAgEAgYBAAoMECcAAAAAAAAJ';

‎modules/sdk-coin-sol/test/unit/sol.ts‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ describe('SOL:', function () {
945945
'fee',
946946
'memo',
947947
],
948-
id: '335sxAuVj5ucXqVWW82QwpFLArPbdD3gXfXr4KrxkLkUpmLB3Nwz2G82z2TqiDD7mNAAbHkcAqD5ycDZp1vVKtjf',
948+
id: '2ticU4ZkEqdTHULr6LobTgWBhim6E7wSscDhM4gzyuGUmQyUwLYhoqaifuvwmNzzEf1T5aefVcgMQkSHdJ5nsrfZ',
949949
type: 'Send',
950950
changeOutputs: [],
951951
changeAmount: '0',
@@ -1883,30 +1883,31 @@ describe('SOL:', function () {
18831883
should.equal(tokenTxnJson.numSignatures, testData.SolInputData.durableNonceSignatures);
18841884

18851885
const instructionsData = tokenTxnJson.instructionsData as InstructionParams[];
1886-
should.equal(instructionsData.length, 3);
1886+
should.equal(instructionsData.length, 4);
18871887
should.equal(instructionsData[0].type, 'NonceAdvance');
18881888

18891889
const destinationUSDTTokenAccount = await getAssociatedTokenAccountAddress(
18901890
usdtMintAddress,
18911891
testData.keys.destinationPubKey
18921892
);
1893-
should.equal(instructionsData[1].type, 'CreateAssociatedTokenAccount');
1894-
should.equal((instructionsData[1] as AtaInit).params.mintAddress, usdtMintAddress);
1895-
should.equal((instructionsData[1] as AtaInit).params.ataAddress, destinationUSDTTokenAccount);
1896-
should.equal((instructionsData[1] as AtaInit).params.ownerAddress, testData.keys.destinationPubKey);
1897-
should.equal((instructionsData[1] as AtaInit).params.tokenName, 'tsol:usdt');
1898-
should.equal((instructionsData[1] as AtaInit).params.payerAddress, testData.wrwUser.walletAddress0);
1893+
should.equal(instructionsData[1].type, 'SetPriorityFee');
1894+
should.equal(instructionsData[2].type, 'CreateAssociatedTokenAccount');
1895+
should.equal((instructionsData[2] as AtaInit).params.mintAddress, usdtMintAddress);
1896+
should.equal((instructionsData[2] as AtaInit).params.ataAddress, destinationUSDTTokenAccount);
1897+
should.equal((instructionsData[2] as AtaInit).params.ownerAddress, testData.keys.destinationPubKey);
1898+
should.equal((instructionsData[2] as AtaInit).params.tokenName, 'tsol:usdt');
1899+
should.equal((instructionsData[2] as AtaInit).params.payerAddress, testData.wrwUser.walletAddress0);
18991900

19001901
const sourceUSDTTokenAccount = await getAssociatedTokenAccountAddress(
19011902
usdtMintAddress,
19021903
testData.wrwUser.walletAddress0
19031904
);
1904-
should.equal(instructionsData[2].type, 'TokenTransfer');
1905-
should.equal((instructionsData[2] as TokenTransfer).params.fromAddress, testData.wrwUser.walletAddress0);
1906-
should.equal((instructionsData[2] as TokenTransfer).params.toAddress, destinationUSDTTokenAccount);
1907-
should.equal((instructionsData[2] as TokenTransfer).params.amount, '2000000000');
1908-
should.equal((instructionsData[2] as TokenTransfer).params.tokenName, 'tsol:usdt');
1909-
should.equal((instructionsData[2] as TokenTransfer).params.sourceAddress, sourceUSDTTokenAccount);
1905+
should.equal(instructionsData[3].type, 'TokenTransfer');
1906+
should.equal((instructionsData[3] as TokenTransfer).params.fromAddress, testData.wrwUser.walletAddress0);
1907+
should.equal((instructionsData[3] as TokenTransfer).params.toAddress, destinationUSDTTokenAccount);
1908+
should.equal((instructionsData[3] as TokenTransfer).params.amount, '2000000000');
1909+
should.equal((instructionsData[3] as TokenTransfer).params.tokenName, 'tsol:usdt');
1910+
should.equal((instructionsData[3] as TokenTransfer).params.sourceAddress, sourceUSDTTokenAccount);
19101911

19111912
const solCoin = basecoin as any;
19121913
sandBox.assert.callCount(solCoin.getDataFromNode, 7);
@@ -1940,7 +1941,7 @@ describe('SOL:', function () {
19401941
should.equal(tokenTxnJson.numSignatures, testData.SolInputData.durableNonceSignatures);
19411942

19421943
const instructionsData = tokenTxnJson.instructionsData as TokenTransfer[];
1943-
should.equal(instructionsData.length, 2);
1944+
should.equal(instructionsData.length, 3);
19441945
should.equal(instructionsData[0].type, 'NonceAdvance');
19451946

19461947
const sourceUSDTTokenAccount = await getAssociatedTokenAccountAddress(
@@ -1951,12 +1952,13 @@ describe('SOL:', function () {
19511952
usdtMintAddress,
19521953
testData.keys.destinationPubKey2
19531954
);
1954-
should.equal(instructionsData[1].type, 'TokenTransfer');
1955-
should.equal(instructionsData[1].params.fromAddress, testData.wrwUser.walletAddress0);
1956-
should.equal(instructionsData[1].params.toAddress, destinationUSDTTokenAccount);
1957-
should.equal(instructionsData[1].params.amount, '2000000000');
1958-
should.equal(instructionsData[1].params.tokenName, 'tsol:usdt');
1959-
should.equal(instructionsData[1].params.sourceAddress, sourceUSDTTokenAccount);
1955+
should.equal(instructionsData[1].type, 'SetPriorityFee');
1956+
should.equal(instructionsData[2].type, 'TokenTransfer');
1957+
should.equal(instructionsData[2].params.fromAddress, testData.wrwUser.walletAddress0);
1958+
should.equal(instructionsData[2].params.toAddress, destinationUSDTTokenAccount);
1959+
should.equal(instructionsData[2].params.amount, '2000000000');
1960+
should.equal(instructionsData[2].params.tokenName, 'tsol:usdt');
1961+
should.equal(instructionsData[2].params.sourceAddress, sourceUSDTTokenAccount);
19601962

19611963
const solCoin = basecoin as any;
19621964
sandBox.assert.callCount(solCoin.getDataFromNode, 7);

‎modules/sdk-coin-sol/test/unit/transactionBuilder/tokenTransferBuilder.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -452,40 +452,40 @@ describe('Sol Token Transfer Builder', () => {
452452
tokenName: nameUSDC,
453453
});
454454
txJson.instructionsData[2].type.should.equal('CreateAssociatedTokenAccount');
455-
txJson.instructionsData[2].params.should.deepEqual({
455+
txJson.instructionsData[3].params.should.deepEqual({
456456
mintAddress: mintUSDC,
457457
ataAddress: ataAddress2,
458458
ownerAddress: account2.pub,
459459
payerAddress: walletPK,
460460
tokenName: nameUSDC,
461461
});
462-
txJson.instructionsData.length.should.equal(7);
463-
txJson.instructionsData[3].type.should.equal('TokenTransfer');
464-
txJson.instructionsData[3].params.should.deepEqual({
462+
txJson.instructionsData.length.should.equal(8);
463+
txJson.instructionsData[4].type.should.equal('TokenTransfer');
464+
txJson.instructionsData[4].params.should.deepEqual({
465465
fromAddress: walletPK,
466466
toAddress: otherAccount.pub,
467467
amount: amount,
468468
tokenName: nameUSDC,
469469
sourceAddress: 'B5rJjuVi7En63iK6o3ijKdJwAoTe2gwCYmJsVdHQ2aKV',
470470
});
471-
txJson.instructionsData[4].type.should.equal('TokenTransfer');
472-
txJson.instructionsData[4].params.should.deepEqual({
471+
txJson.instructionsData[5].type.should.equal('TokenTransfer');
472+
txJson.instructionsData[5].params.should.deepEqual({
473473
fromAddress: walletPK,
474474
toAddress: account1.pub,
475475
amount: amount,
476476
tokenName: nameUSDC,
477477
sourceAddress: 'B5rJjuVi7En63iK6o3ijKdJwAoTe2gwCYmJsVdHQ2aKV',
478478
});
479-
txJson.instructionsData[5].type.should.equal('TokenTransfer');
480-
txJson.instructionsData[5].params.should.deepEqual({
479+
txJson.instructionsData[6].type.should.equal('TokenTransfer');
480+
txJson.instructionsData[6].params.should.deepEqual({
481481
fromAddress: walletPK,
482482
toAddress: account2.pub,
483483
amount: amount,
484484
tokenName: nameUSDC,
485485
sourceAddress: 'B5rJjuVi7En63iK6o3ijKdJwAoTe2gwCYmJsVdHQ2aKV',
486486
});
487-
txJson.instructionsData[6].type.should.equal('Memo');
488-
txJson.instructionsData[6].params.memo.should.equal(memo);
487+
txJson.instructionsData[7].type.should.equal('Memo');
488+
txJson.instructionsData[7].params.memo.should.equal(memo);
489489

490490
const rawTx = tx.toBroadcastFormat();
491491
should.equal(Utils.isValidRawTransaction(rawTx), true);

‎modules/sdk-coin-sol/test/unit/utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ describe('SOL util library', function () {
142142
it('should succeed for valid signature in a unsigned tx', function () {
143143
const signature = '335sxAuVj5ucXqVWW82QwpFLArPbdD3gXfXr4KrxkLkUpmLB3Nwz2G82z2TqiDD7mNAAbHkcAqD5ycDZp1vVKtjf';
144144
Utils.verifySignature(
145-
testData.TOKEN_TRANSFER_UNSIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE,
145+
testData.TOKEN_TRANSFER_UNSIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE_OLD,
146146
signature,
147147
testData.associatedTokenAccounts.accounts[0].pub
148148
).should.equal(true);
@@ -151,7 +151,7 @@ describe('SOL util library', function () {
151151
it('should succeed for valid signature in a signed tx', function () {
152152
const signature = '335sxAuVj5ucXqVWW82QwpFLArPbdD3gXfXr4KrxkLkUpmLB3Nwz2G82z2TqiDD7mNAAbHkcAqD5ycDZp1vVKtjf';
153153
Utils.verifySignature(
154-
testData.TOKEN_TRANSFER_SIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE,
154+
testData.TOKEN_TRANSFER_SIGNED_TX_WITH_MEMO_AND_DURABLE_NONCE_OLD,
155155
signature,
156156
testData.associatedTokenAccounts.accounts[0].pub
157157
).should.equal(true);

0 commit comments

Comments
 (0)