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

BREAKING CHANGE: requires Solana version v0.13.0 or greater

Browse Source 
feat: Update to current solana tx format
This commit is contained in:
Tyera Eulberg
2019-04-10 12:31:50 -07:00
committed by Michael Vines
parent 853ea88fd0
commit efd0392706
12 changed files with 196 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
web3.js/src/token-program.js
View File

@ -236,11 +236,13 @@ export class Token {
await sendAndConfirmTransaction(connection, transaction, owner);
transaction = new Transaction().add({
keys: [tokenAccount.publicKey, initialAccountPublicKey],
keys: [
{pubkey: tokenAccount.publicKey, isSigner: true},
{pubkey: initialAccountPublicKey, isSigner: false},
],
programId,
data,
});
transaction.fee = 0; // TODO: Batch with the `SystemProgram.createAccount` and remove this line
await sendAndConfirmTransaction(connection, transaction, tokenAccount);
return [token, initialAccountPublicKey];
@ -284,16 +286,19 @@ export class Token {
await sendAndConfirmTransaction(this.connection, transaction, owner);
// Initialize the token account
const keys = [tokenAccount.publicKey, owner.publicKey, this.token];
const keys = [
{pubkey: tokenAccount.publicKey, isSigner: true},
{pubkey: owner.publicKey, isSigner: false},
{pubkey: this.token, isSigner: false},
];
if (source) {
keys.push(source);
keys.push({pubkey: source, isSigner: false});
}
transaction = new Transaction().add({
keys,
programId: this.programId,
data,
});
transaction.fee = 0; // TODO: Batch with the `SystemProgram.createAccount` and remove this line
await sendAndConfirmTransaction(this.connection, transaction, tokenAccount);
return tokenAccount.publicKey;
@ -480,9 +485,13 @@ export class Token {
data,
);
const keys = [owner, source, destination];
const keys = [
{pubkey: owner, isSigner: true},
{pubkey: source, isSigner: false},
{pubkey: destination, isSigner: false},
];
if (accountInfo.source) {
keys.push(accountInfo.source);
keys.push({pubkey: accountInfo.source, isSigner: false});
}
return new TransactionInstruction({
keys,
@ -520,7 +529,11 @@ export class Token {
);
return new TransactionInstruction({
keys: [owner, account, delegate],
keys: [
{pubkey: owner, isSigner: true},
{pubkey: account, isSigner: false},
{pubkey: delegate, isSigner: false},
],
programId: this.programId,
data,
});
@ -564,7 +577,11 @@ export class Token {
);
return new TransactionInstruction({
keys: [owner, account, newOwner],
keys: [
{pubkey: owner, isSigner: true},
{pubkey: account, isSigner: false},
{pubkey: newOwner, isSigner: false},
],
programId: this.programId,
data,
});