From 6fe0e08a8022c558c2709b8c18ef5c6cc64947b9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 14 Mar 2019 13:27:47 -0700 Subject: [PATCH] fix: rename userdata to data --- web3.js/module.flow.js | 6 +- web3.js/src/budget-program.js | 92 +++++++++++++++--------------- web3.js/src/connection.js | 14 ++--- web3.js/src/loader.js | 20 +++---- web3.js/src/system-program.js | 30 +++++----- web3.js/src/token-program.js | 70 +++++++++++------------ web3.js/src/transaction.js | 34 +++++------ web3.js/test/connection.test.js | 8 +-- web3.js/test/token-program.test.js | 14 ++--- 9 files changed, 144 insertions(+), 144 deletions(-) diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js index eda817170f..98589448cb 100644 --- a/web3.js/module.flow.js +++ b/web3.js/module.flow.js @@ -40,7 +40,7 @@ declare module '@solana/web3.js' { executable: boolean, owner: PublicKey, lamports: number, - userdata: Buffer, + data: Buffer, }; declare type AccountChangeCallback = (accountInfo: AccountInfo) => void; @@ -104,13 +104,13 @@ declare module '@solana/web3.js' { declare type TransactionInstructionCtorFields = {| keys: ?Array, programId?: PublicKey, - userdata?: Buffer, + data?: Buffer, |}; declare export class TransactionInstruction { keys: Array; programId: PublicKey; - userdata: Buffer; + data: Buffer; } declare type SignaturePubkeyPair = {| diff --git a/web3.js/src/budget-program.js b/web3.js/src/budget-program.js index ad207a1659..8d026edec0 100644 --- a/web3.js/src/budget-program.js +++ b/web3.js/src/budget-program.js @@ -58,18 +58,18 @@ export type BudgetCondition = SignatureCondition | TimestampCondition; */ function serializePayment(payment: Payment): Buffer { const toData = payment.to.toBuffer(); - const userdata = Buffer.alloc(8 + toData.length); - userdata.writeUInt32LE(payment.amount, 0); - toData.copy(userdata, 8); - return userdata; + const data = Buffer.alloc(8 + toData.length); + data.writeUInt32LE(payment.amount, 0); + toData.copy(data, 8); + return data; } /** * @private */ function serializeDate(when: Date): Buffer { - const userdata = Buffer.alloc(8 + 20); - userdata.writeUInt32LE(20, 0); // size of timestamp as u64 + const data = Buffer.alloc(8 + 20); + data.writeUInt32LE(20, 0); // size of timestamp as u64 function iso(date) { function pad(number) { @@ -94,8 +94,8 @@ function serializeDate(when: Date): Buffer { 'Z' ); } - userdata.write(iso(when), 8); - return userdata; + data.write(iso(when), 8); + return data; } /** @@ -107,28 +107,28 @@ function serializeCondition(condition: BudgetCondition) { const date = serializeDate(condition.when); const from = condition.from.toBuffer(); - const userdata = Buffer.alloc(4 + date.length + from.length); - userdata.writeUInt32LE(0, 0); // Condition enum = Timestamp - date.copy(userdata, 4); - from.copy(userdata, 4 + date.length); - return userdata; + const data = Buffer.alloc(4 + date.length + from.length); + data.writeUInt32LE(0, 0); // Condition enum = Timestamp + date.copy(data, 4); + from.copy(data, 4 + date.length); + return data; } case 'signature': { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('condition'), Layout.publicKey('from'), ]); const from = condition.from.toBuffer(); - const userdata = Buffer.alloc(4 + from.length); - userdataLayout.encode( + const data = Buffer.alloc(4 + from.length); + dataLayout.encode( { instruction: 1, // Signature from, }, - userdata, + data, ); - return userdata; + return data; } default: throw new Error(`Unknown condition type: ${condition.type}`); @@ -186,66 +186,66 @@ export class BudgetProgram { amount: number, ...conditions: Array ): Transaction { - const userdata = Buffer.alloc(1024); + const data = Buffer.alloc(1024); let pos = 0; - userdata.writeUInt32LE(0, pos); // NewBudget instruction + data.writeUInt32LE(0, pos); // NewBudget instruction pos += 4; switch (conditions.length) { case 0: - userdata.writeUInt32LE(0, pos); // Budget enum = Pay + data.writeUInt32LE(0, pos); // Budget enum = Pay pos += 4; { const payment = serializePayment({amount, to}); - payment.copy(userdata, pos); + payment.copy(data, pos); pos += payment.length; } return new Transaction().add({ keys: [from, to], programId: this.programId, - userdata: userdata.slice(0, pos), + data: data.slice(0, pos), }); case 1: - userdata.writeUInt32LE(1, pos); // Budget enum = After + data.writeUInt32LE(1, pos); // Budget enum = After pos += 4; { const condition = conditions[0]; const conditionData = serializeCondition(condition); - conditionData.copy(userdata, pos); + conditionData.copy(data, pos); pos += conditionData.length; const paymentData = serializePayment({amount, to}); - paymentData.copy(userdata, pos); + paymentData.copy(data, pos); pos += paymentData.length; } return new Transaction().add({ keys: [from, program, to], programId: this.programId, - userdata: userdata.slice(0, pos), + data: data.slice(0, pos), }); case 2: - userdata.writeUInt32LE(2, pos); // Budget enum = Or + data.writeUInt32LE(2, pos); // Budget enum = Or pos += 4; for (let condition of conditions) { const conditionData = serializeCondition(condition); - conditionData.copy(userdata, pos); + conditionData.copy(data, pos); pos += conditionData.length; const paymentData = serializePayment({amount, to}); - paymentData.copy(userdata, pos); + paymentData.copy(data, pos); pos += paymentData.length; } return new Transaction().add({ keys: [from, program, to], programId: this.programId, - userdata: userdata.slice(0, pos), + data: data.slice(0, pos), }); default: @@ -268,28 +268,28 @@ export class BudgetProgram { condition1: BudgetCondition, condition2: BudgetCondition, ): Transaction { - const userdata = Buffer.alloc(1024); + const data = Buffer.alloc(1024); let pos = 0; - userdata.writeUInt32LE(0, pos); // NewBudget instruction + data.writeUInt32LE(0, pos); // NewBudget instruction pos += 4; - userdata.writeUInt32LE(3, pos); // Budget enum = And + data.writeUInt32LE(3, pos); // Budget enum = And pos += 4; for (let condition of [condition1, condition2]) { const conditionData = serializeCondition(condition); - conditionData.copy(userdata, pos); + conditionData.copy(data, pos); pos += conditionData.length; } const paymentData = serializePayment({amount, to}); - paymentData.copy(userdata, pos); + paymentData.copy(data, pos); pos += paymentData.length; return new Transaction().add({ keys: [from, program, to], programId: this.programId, - userdata: userdata.slice(0, pos), + data: data.slice(0, pos), }); } @@ -304,15 +304,15 @@ export class BudgetProgram { when: Date, ): Transaction { const whenData = serializeDate(when); - const userdata = Buffer.alloc(4 + whenData.length); + const data = Buffer.alloc(4 + whenData.length); - userdata.writeUInt32LE(1, 0); // ApplyTimestamp instruction - whenData.copy(userdata, 4); + data.writeUInt32LE(1, 0); // ApplyTimestamp instruction + whenData.copy(data, 4); return new Transaction().add({ keys: [from, program, to], programId: this.programId, - userdata, + data, }); } @@ -325,22 +325,22 @@ export class BudgetProgram { program: PublicKey, to: PublicKey, ): Transaction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 2, // ApplySignature instruction }, - userdata, + data, ); return new Transaction().add({ keys: [from, program, to], programId: this.programId, - userdata, + data, }); } } diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js index 74a4de3de7..a72d1eb4b4 100644 --- a/web3.js/src/connection.js +++ b/web3.js/src/connection.js @@ -86,7 +86,7 @@ const AccountInfoResult = struct({ executable: 'boolean', owner: 'array', lamports: 'number', - userdata: 'array', + data: 'array', }); /** @@ -159,14 +159,14 @@ const SendTransactionRpcResult = jsonRpcResult('string'); * @typedef {Object} AccountInfo * @property {number} lamports Number of lamports assigned to the account * @property {PublicKey} owner Identifier of the program that owns the account - * @property {?Buffer} userdata Optional userdata assigned to the account - * @property {boolean} executable `true` if this account's userdata contains a loaded program + * @property {?Buffer} data Optional data assigned to the account + * @property {boolean} executable `true` if this account's data contains a loaded program */ type AccountInfo = { executable: boolean, owner: PublicKey, lamports: number, - userdata: Buffer, + data: Buffer, }; /** @@ -316,7 +316,7 @@ export class Connection { executable: result.executable, owner: new PublicKey(result.owner), lamports: result.lamports, - userdata: Buffer.from(result.userdata), + data: Buffer.from(result.data), }; } @@ -593,7 +593,7 @@ export class Connection { executable: result.executable, owner: new PublicKey(result.owner), lamports: result.lamports, - userdata: Buffer.from(result.userdata), + data: Buffer.from(result.data), }); return true; } @@ -667,7 +667,7 @@ export class Connection { executable: result[1].executable, owner: new PublicKey(result[1].owner), lamports: result[1].lamports, - userdata: Buffer.from(result[1].userdata), + data: Buffer.from(result[1].data), }, }); return true; diff --git a/web3.js/src/loader.js b/web3.js/src/loader.js index 52ec6282d3..d1525f2996 100644 --- a/web3.js/src/loader.js +++ b/web3.js/src/loader.js @@ -46,7 +46,7 @@ export class Loader { * @param data Program data */ async load(program: Account, data: Array) { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), BufferLayout.u32('offset'), BufferLayout.u32('bytesLength'), @@ -64,20 +64,20 @@ export class Loader { let transactions = []; while (array.length > 0) { const bytes = array.slice(0, chunkSize); - const userdata = Buffer.alloc(chunkSize + 16); - userdataLayout.encode( + const data = Buffer.alloc(chunkSize + 16); + dataLayout.encode( { instruction: 0, // Load instruction offset, bytes, }, - userdata, + data, ); const transaction = new Transaction().add({ keys: [program.publicKey], programId: this.programId, - userdata, + data, }); transactions.push( sendAndConfirmTransaction(this.connection, transaction, program), @@ -108,22 +108,22 @@ export class Loader { * @param program `load()`ed Account */ async finalize(program: Account) { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 1, // Finalize instruction }, - userdata, + data, ); const transaction = new Transaction().add({ keys: [program.publicKey], programId: this.programId, - userdata, + data, }); await sendAndConfirmTransaction(this.connection, transaction, program); } diff --git a/web3.js/src/system-program.js b/web3.js/src/system-program.js index eca05a2daf..478352c852 100644 --- a/web3.js/src/system-program.js +++ b/web3.js/src/system-program.js @@ -29,28 +29,28 @@ export class SystemProgram { space: number, programId: PublicKey, ): Transaction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), BufferLayout.ns64('lamports'), BufferLayout.ns64('space'), Layout.publicKey('programId'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 0, // Create Account instruction lamports, space, programId: programId.toBuffer(), }, - userdata, + data, ); return new Transaction().add({ keys: [from, newAccount], programId: SystemProgram.programId, - userdata, + data, }); } @@ -58,24 +58,24 @@ export class SystemProgram { * Generate a Transaction that moves lamports from one account to another */ static move(from: PublicKey, to: PublicKey, amount: number): Transaction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), BufferLayout.ns64('amount'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 2, // Move instruction amount, }, - userdata, + data, ); return new Transaction().add({ keys: [from, to], programId: SystemProgram.programId, - userdata, + data, }); } @@ -83,24 +83,24 @@ export class SystemProgram { * Generate a Transaction that assigns an account to a program */ static assign(from: PublicKey, programId: PublicKey): Transaction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), Layout.publicKey('programId'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 1, // Assign instruction programId: programId.toBuffer(), }, - userdata, + data, ); return new Transaction().add({ keys: [from], programId: SystemProgram.programId, - userdata, + data, }); } } diff --git a/web3.js/src/token-program.js b/web3.js/src/token-program.js index 7a4907befd..437e97f7a0 100644 --- a/web3.js/src/token-program.js +++ b/web3.js/src/token-program.js @@ -202,7 +202,7 @@ export class Token { let transaction; - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), Layout.uint64('supply'), BufferLayout.u8('decimals'), @@ -210,9 +210,9 @@ export class Token { Layout.rustString('symbol'), ]); - let userdata = Buffer.alloc(1024); + let data = Buffer.alloc(1024); { - const encodeLength = userdataLayout.encode( + const encodeLength = dataLayout.encode( { instruction: 0, // NewToken instruction supply: supply.toBuffer(), @@ -220,9 +220,9 @@ export class Token { name, symbol, }, - userdata, + data, ); - userdata = userdata.slice(0, encodeLength); + data = data.slice(0, encodeLength); } // Allocate memory for the tokenAccount account @@ -230,7 +230,7 @@ export class Token { owner.publicKey, tokenAccount.publicKey, 1, - 1 + userdata.length, + 1 + data.length, programId, ); await sendAndConfirmTransaction(connection, transaction, owner); @@ -238,7 +238,7 @@ export class Token { transaction = new Transaction().add({ keys: [tokenAccount.publicKey, initialAccountPublicKey], programId, - userdata, + data, }); transaction.fee = 0; // TODO: Batch with the `SystemProgram.createAccount` and remove this line await sendAndConfirmTransaction(connection, transaction, tokenAccount); @@ -263,16 +263,16 @@ export class Token { const tokenAccount = new Account(); let transaction; - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 1, // NewTokenAccount instruction }, - userdata, + data, ); // Allocate memory for the token @@ -293,7 +293,7 @@ export class Token { transaction = new Transaction().add({ keys, programId: this.programId, - userdata, + data, }); transaction.fee = 0; // TODO: Batch with the `SystemProgram.createAccount` and remove this line await sendAndConfirmTransaction(this.connection, transaction, tokenAccount); @@ -312,12 +312,12 @@ export class Token { ); } - const userdata = Buffer.from(accountInfo.userdata); + const data = Buffer.from(accountInfo.data); - if (userdata.readUInt8(0) !== 1) { - throw new Error(`Invalid token userdata`); + if (data.readUInt8(0) !== 1) { + throw new Error(`Invalid token data`); } - const tokenInfo = TokenInfoLayout.decode(userdata, 1); + const tokenInfo = TokenInfoLayout.decode(data, 1); tokenInfo.supply = TokenAmount.fromBuffer(tokenInfo.supply); return tokenInfo; } @@ -333,11 +333,11 @@ export class Token { throw new Error(`Invalid token account owner`); } - const userdata = Buffer.from(accountInfo.userdata); - if (userdata.readUInt8(0) !== 2) { - throw new Error(`Invalid token account userdata`); + const data = Buffer.from(accountInfo.data); + if (data.readUInt8(0) !== 2) { + throw new Error(`Invalid token account data`); } - const tokenAccountInfo = TokenAccountInfoLayout.decode(userdata, 1); + const tokenAccountInfo = TokenAccountInfoLayout.decode(data, 1); tokenAccountInfo.token = new PublicKey(tokenAccountInfo.token); tokenAccountInfo.owner = new PublicKey(tokenAccountInfo.owner); @@ -468,18 +468,18 @@ export class Token { throw new Error('Account owner mismatch'); } - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), Layout.uint64('amount'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 2, // Transfer instruction amount: new TokenAmount(amount).toBuffer(), }, - userdata, + data, ); const keys = [owner, source, destination]; @@ -489,7 +489,7 @@ export class Token { return new TransactionInstruction({ keys, programId: this.programId, - userdata, + data, }); } @@ -507,24 +507,24 @@ export class Token { delegate: PublicKey, amount: number | TokenAmount, ): TransactionInstruction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), Layout.uint64('amount'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 3, // Approve instruction amount: new TokenAmount(amount).toBuffer(), }, - userdata, + data, ); return new TransactionInstruction({ keys: [owner, account, delegate], programId: this.programId, - userdata, + data, }); } @@ -555,22 +555,22 @@ export class Token { account: PublicKey, newOwner: PublicKey, ): TransactionInstruction { - const userdataLayout = BufferLayout.struct([ + const dataLayout = BufferLayout.struct([ BufferLayout.u32('instruction'), ]); - const userdata = Buffer.alloc(userdataLayout.span); - userdataLayout.encode( + const data = Buffer.alloc(dataLayout.span); + dataLayout.encode( { instruction: 4, // SetOwner instruction }, - userdata, + data, ); return new TransactionInstruction({ keys: [owner, account, newOwner], programId: this.programId, - userdata, + data, }); } } diff --git a/web3.js/src/transaction.js b/web3.js/src/transaction.js index aafffa4bbc..33058b7452 100644 --- a/web3.js/src/transaction.js +++ b/web3.js/src/transaction.js @@ -27,12 +27,12 @@ export const PACKET_DATA_SIZE = 512; * @typedef {Object} TransactionInstructionCtorFields * @property {?Array} keys * @property {?PublicKey} programId - * @property {?Buffer} userdata + * @property {?Buffer} data */ type TransactionInstructionCtorFields = {| keys?: Array, programId?: PublicKey, - userdata?: Buffer, + data?: Buffer, |}; /** @@ -52,7 +52,7 @@ export class TransactionInstruction { /** * Program input */ - userdata: Buffer = Buffer.alloc(0); + data: Buffer = Buffer.alloc(0); constructor(opts?: TransactionInstructionCtorFields) { opts && Object.assign(this, opts); @@ -182,19 +182,19 @@ export class Transaction { shortvec.encodeLength(programIdCount, programIds.length); const instructions = this.instructions.map(instruction => { - const {userdata, programId} = instruction; + const {data, programId} = instruction; let keyIndicesCount = []; shortvec.encodeLength(keyIndicesCount, instruction.keys.length); - let userdataCount = []; - shortvec.encodeLength(userdataCount, instruction.userdata.length); + let dataCount = []; + shortvec.encodeLength(dataCount, instruction.data.length); return { programIdIndex: programIds.indexOf(programId.toString()), keyIndicesCount: Buffer.from(keyIndicesCount), keyIndices: Buffer.from( instruction.keys.map(key => keys.indexOf(key.toString())), ), - userdataLength: Buffer.from(userdataCount), - userdata, + dataLength: Buffer.from(dataCount), + data, }; }); @@ -222,11 +222,11 @@ export class Transaction { instruction.keyIndices.length, 'keyIndices', ), - BufferLayout.blob(instruction.userdataLength.length, 'userdataLength'), + BufferLayout.blob(instruction.dataLength.length, 'dataLength'), BufferLayout.seq( BufferLayout.u8('userdatum'), - instruction.userdata.length, - 'userdata', + instruction.data.length, + 'data', ), ]); const length = instructionLayout.encode( @@ -405,9 +405,9 @@ export class Transaction { * Deprecated method * @private */ - get userdata(): Buffer { + get data(): Buffer { invariant(this.instructions.length === 1); - return this.instructions[0].userdata; + return this.instructions[0].data; } /** @@ -462,9 +462,9 @@ export class Transaction { const accountIndexCount = shortvec.decodeLength(byteArray); instruction.accountIndex = byteArray.slice(0, accountIndexCount); byteArray = byteArray.slice(accountIndexCount); - const userdataLength = shortvec.decodeLength(byteArray); - instruction.userdata = byteArray.slice(0, userdataLength); - byteArray = byteArray.slice(userdataLength); + const dataLength = shortvec.decodeLength(byteArray); + instruction.data = byteArray.slice(0, dataLength); + byteArray = byteArray.slice(dataLength); instructions.push(instruction); } @@ -482,7 +482,7 @@ export class Transaction { let instructionData = { keys: [], programId: new PublicKey(programs[instructions[i].programIndex]), - userdata: Buffer.from(instructions[i].userdata), + data: Buffer.from(instructions[i].data), }; for (let j = 0; j < instructions[i].accountIndex.length; j++) { instructionData.keys.push( diff --git a/web3.js/test/connection.test.js b/web3.js/test/connection.test.js index 77073c0311..0af5200a79 100644 --- a/web3.js/test/connection.test.js +++ b/web3.js/test/connection.test.js @@ -214,7 +214,7 @@ test('request airdrop', async () => { 0, ], lamports: 42, - userdata: [], + data: [], executable: false, }, }, @@ -222,7 +222,7 @@ test('request airdrop', async () => { const accountInfo = await connection.getAccountInfo(account.publicKey); expect(accountInfo.lamports).toBe(42); - expect(accountInfo.userdata).toHaveLength(0); + expect(accountInfo.data).toHaveLength(0); expect(accountInfo.owner).toEqual(SystemProgram.programId); }); @@ -472,7 +472,7 @@ test('account change notification', async () => { expect(mockCallback.mock.calls[0][0].lamports).toBe(41); expect(mockCallback.mock.calls[0][0].owner).toEqual(BpfLoader.programId); expect(mockCallback.mock.calls[0][0].executable).toBe(false); - expect(mockCallback.mock.calls[0][0].userdata).toEqual( + expect(mockCallback.mock.calls[0][0].data).toEqual( Buffer.from([1, 2, 3]), ); }); @@ -534,7 +534,7 @@ test('program account change notification', async () => { BpfLoader.programId, ); expect(mockCallback.mock.calls[0][0].accountInfo.executable).toBe(false); - expect(mockCallback.mock.calls[0][0].accountInfo.userdata).toEqual( + expect(mockCallback.mock.calls[0][0].accountInfo.data).toEqual( Buffer.from([1, 2, 3]), ); }); diff --git a/web3.js/test/token-program.test.js b/web3.js/test/token-program.test.js index dfe9a0ef3a..81a9d81f59 100644 --- a/web3.js/test/token-program.test.js +++ b/web3.js/test/token-program.test.js @@ -95,7 +95,7 @@ test('create new token', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 1, 16, 39, @@ -163,7 +163,7 @@ test('create new token', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...initialOwner.publicKey.toBuffer(), @@ -252,7 +252,7 @@ test('create new token account', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...destOwner.publicKey.toBuffer(), @@ -310,7 +310,7 @@ test('transfer', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...initialOwner.publicKey.toBuffer(), @@ -349,7 +349,7 @@ test('transfer', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...dest.toBuffer(), @@ -420,7 +420,7 @@ test('approve/revoke', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...delegate.toBuffer(), @@ -482,7 +482,7 @@ test('approve/revoke', async () => { result: { owner: [...SYSTEM_TOKEN_PROGRAM_ID.toBuffer()], lamports: 1, - userdata: [ + data: [ 2, ...testToken.token.toBuffer(), ...delegate.toBuffer(),