lil-org/tokenary
1
1
Fork 0
mirror of https://github.com/lil-org/tokenary.git synced 2025-01-07 14:10:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up solana provider

Browse Source
This commit is contained in:
Ivan Grachev 2022-05-02 19:00:13 +03:00
parent 149da776c8
commit a985a2c280
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Safari Shared/web3-provider/solana.js
View File

@ -148,9 +148,6 @@ class TokenarySolana extends EventEmitter {
}
processTokenaryResponse(id, response) {
// TODO: use and clean up respondWithBuffer
// TODO: use and clean up transactionsPendingSignature
if (response.name == "didLoadLatestConfiguration") {
this.didGetLatestConfiguration = true;
if ("publicKey" in response) { // TODO: validate non-empty?
@ -173,7 +170,7 @@ class TokenarySolana extends EventEmitter {
if (response.name == "signTransaction" || response.name == "signAndSendTransaction") {
if (this.transactionsPendingSignature.has(id)) {
const pending = this.transactionsPendingSignature.get(id);
this.transactionsPendingSignature.delete(id); // TODO: there are other cases to delete it as well;
this.transactionsPendingSignature.delete(id);
const buffer = Utils.messageToBuffer(bs58.decode(response.result));
const transaction = pending[0];
transaction.addSignature(this.publicKey, buffer);
@ -183,7 +180,7 @@ class TokenarySolana extends EventEmitter {
}
} else {
if (this.respondWithBuffer.get(id) === true) {
this.respondWithBuffer.delete(id); // TODO: there are other cases to delete it as well;
this.respondWithBuffer.delete(id);
const buffer = Utils.messageToBuffer(bs58.decode(response.result));
this.sendResponse(id, {signature: buffer, publicKey: this.publicKey});
} else {
@ -193,7 +190,7 @@ class TokenarySolana extends EventEmitter {
} else if ("results" in response) {
if (this.transactionsPendingSignature.has(id)) {
const transactions = this.transactionsPendingSignature.get(id);
this.transactionsPendingSignature.delete(id); // TODO: there are other cases to delete it as well;
this.transactionsPendingSignature.delete(id);
response.results.forEach( (signature, index) => {
const buffer = Utils.messageToBuffer(bs58.decode(signature));
transactions[index].addSignature(this.publicKey, buffer);
@ -203,6 +200,8 @@ class TokenarySolana extends EventEmitter {
this.sendResponse(id, {signatures: response.results, publicKey: this.publicKey.toString()});
}
} else if ("error" in response) {
this.respondWithBuffer.delete(id);
this.transactionsPendingSignature.delete(id);
this.sendError(id, response.error);
}
}