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

fix: repair key handling in _getSignData and add Nonce live test

Browse Source
This commit is contained in:
Tyera Eulberg
2020-01-07 17:57:56 -07:00
committed by Michael Vines
parent bd0a9348f4
commit aea0e83a40
4 changed files with 165 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
web3.js/src/transaction.js
View File

@@ -184,7 +184,7 @@ export class Transaction {
*/
_getSignData(): Buffer {
const {nonceInfo} = this;
if (nonceInfo) {
if (nonceInfo && this.instructions[0] != nonceInfo.nonceInstruction) {
this.recentBlockhash = nonceInfo.nonce;
this.instructions.unshift(nonceInfo.nonceInstruction);
}
@@ -203,25 +203,10 @@ export class Transaction {
const programIds = [];
const allKeys = [];
this.instructions.forEach(instruction => {
instruction.keys.forEach(keySignerPair => {
const keyStr = keySignerPair.pubkey.toString();
if (!keys.includes(keyStr)) {
if (keySignerPair.isSigner) {
this.signatures.push({
signature: null,
publicKey: keySignerPair.pubkey,
});
if (!keySignerPair.isWritable) {
numReadonlySignedAccounts += 1;
}
} else {
if (!keySignerPair.isWritable) {
numReadonlyUnsignedAccounts += 1;
}
}
keys.push(keyStr);
}
allKeys.push(keySignerPair);
});
const programId = instruction.programId.toString();
@@ -230,6 +215,32 @@ export class Transaction {
}
});
allKeys.sort(function(x, y) {
const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
const checkWritable = x.isWritable === y.isWritable ? 0 : x.isWritable ? -1 : 1;
return checkSigner || checkWritable;
});
allKeys.forEach(keySignerPair => {
const keyStr = keySignerPair.pubkey.toString();
if (!keys.includes(keyStr)) {
if (keySignerPair.isSigner) {
this.signatures.push({
signature: null,
publicKey: keySignerPair.pubkey,
});
if (!keySignerPair.isWritable) {
numReadonlySignedAccounts += 1;
}
} else {
if (!keySignerPair.isWritable) {
numReadonlyUnsignedAccounts += 1;
}
}
keys.push(keyStr);
}
});
programIds.forEach(programId => {
if (!keys.includes(programId)) {
keys.push(programId);