gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Catch up to latest Transaction ABI changes

Browse Source
This commit is contained in:
Michael Vines
2018-09-20 14:22:11 -07:00
parent d009e7e91b
commit da2496872b
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web3.js/src/budget-program.js
View File

@ -167,9 +167,6 @@ export class BudgetProgram {
userdata.writeUInt32LE(amount, pos); // Contract.tokens userdata.writeUInt32LE(amount, pos); // Contract.tokens
pos += 8; pos += 8;
userdata.writeUInt32LE(0, pos); // Contract.plan = Budget
pos += 4;
switch (conditions.length) { switch (conditions.length) {
case 0: case 0:
userdata.writeUInt32LE(0, pos); // Budget enum = Pay userdata.writeUInt32LE(0, pos); // Budget enum = Pay

16
web3.js/src/system-program.js
View File

@ -24,7 +24,7 @@ export class SystemProgram {
newAccount: PublicKey, newAccount: PublicKey,
tokens: number, tokens: number,
space: number, space: number,
programId: ?PublicKey programId: PublicKey
): Transaction { ): Transaction {
const userdata = Buffer.alloc(4 + 8 + 8 + 1 + 32); const userdata = Buffer.alloc(4 + 8 + 8 + 1 + 32);
let pos = 0; let pos = 0;
@ -38,17 +38,9 @@ export class SystemProgram {
userdata.writeUInt32LE(space, pos); // space as u64 userdata.writeUInt32LE(space, pos); // space as u64
pos += 8; pos += 8;
if (programId) { const programIdBytes = Transaction.serializePublicKey(programId);
userdata.writeUInt8(1, pos); // 'Some' programIdBytes.copy(userdata, pos);
pos += 1; pos += 32;
const programIdBytes = Transaction.serializePublicKey(programId);
programIdBytes.copy(userdata, pos);
pos += 32;
} else {
userdata.writeUInt8(0, pos); // 'None'
pos += 1;
}
assert(pos <= userdata.length); assert(pos <= userdata.length);