Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change baseUrl be unique per FIOSDK instance #93

Draft
wants to merge 2 commits into
base: release/1.3.x
Choose a base branch
from
+109 −97
Draft

Change baseUrl be unique per FIOSDK instance #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec7c02
Change baseUrl be unique per FIOSDK instance
andreyvEze Aug 5, 2021
35c72a5
Make abiMap unique per FIOSDK instance
andreyvEze Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 41 additions & 39 deletions lib/FIOSDK.js
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions lib/transactions/Transactions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const textEncoder = new text_encoding_1.TextEncoder();
const textDecoder = new text_encoding_1.TextDecoder();
class Transactions {
constructor() {
this.abiMap = new Map();
this.baseUrl = '';
this.publicKey = '';
this.privateKey = '';
this.serilizeEndpoint = 'chain/serialize_json';
Expand All @@ -37,7 +39,7 @@ class Transactions {
'Content-Type': 'application/json',
},
};
const res = yield Transactions.fetchJson(Transactions.baseUrl + 'chain/get_info', options);
const res = yield Transactions.fetchJson(this.baseUrl + 'chain/get_info', options);
return yield res.json();
});
}
Expand All @@ -49,7 +51,7 @@ class Transactions {
if (chain.last_irreversible_block_num == undefined) {
throw new Error('chain.last_irreversible_block_num undefined');
}
const res = yield Transactions.fetchJson(Transactions.baseUrl + 'chain/get_block', {
const res = yield Transactions.fetchJson(this.baseUrl + 'chain/get_block', {
method: 'POST',
headers: {
'Accept': 'application/json',
Expand Down Expand Up @@ -93,13 +95,13 @@ class Transactions {
transaction.expiration = expirationStr.substr(0, expirationStr.length - 1);
if (dryRun) {
return Transactions.FioProvider.prepareTransaction({
transaction, chainId: chain.chain_id, privateKeys: privky, abiMap: Transactions.abiMap,
transaction, chainId: chain.chain_id, privateKeys: privky, abiMap: this.abiMap,
textDecoder: new text_encoding_1.TextDecoder(), textEncoder: new text_encoding_1.TextEncoder(),
});
}
else {
const signedTransaction = yield Transactions.FioProvider.prepareTransaction({
transaction, chainId: chain.chain_id, privateKeys: privky, abiMap: Transactions.abiMap,
transaction, chainId: chain.chain_id, privateKeys: privky, abiMap: this.abiMap,
textDecoder: new text_encoding_1.TextDecoder(), textEncoder: new text_encoding_1.TextEncoder(),
});
return this.executeCall(endpoint, JSON.stringify(signedTransaction));
Expand Down Expand Up @@ -127,9 +129,9 @@ class Transactions {
};
}
try {
const res = yield Transactions.fetchJson(Transactions.baseUrl + endPoint, options);
const res = yield Transactions.fetchJson(this.baseUrl + endPoint, options);
if (!res.ok) {
const error = new Error(`Error ${res.status} while fetching ${Transactions.baseUrl + endPoint}`);
const error = new Error(`Error ${res.status} while fetching ${this.baseUrl + endPoint}`);
try {
error.json = yield res.json();
}
Expand Down Expand Up @@ -166,4 +168,3 @@ class Transactions {
}
}
exports.Transactions = Transactions;
Transactions.abiMap = new Map();
3 changes: 2 additions & 1 deletion lib/transactions/queries/Query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ class Query extends Transactions_1.Transactions {
}
decrypt(result) {
}
execute(publicKey, privateKey = '') {
execute(baseUrl, publicKey, privateKey = '') {
return __awaiter(this, void 0, void 0, function* () {
this.publicKey = publicKey;
this.privateKey = privateKey;
this.baseUrl = baseUrl;
if (!this.isEncrypted) {
return this.executeCall(this.getEndPoint(), JSON.stringify(this.getData()));
}
Expand Down
4 changes: 3 additions & 1 deletion lib/transactions/signed/SignedTransaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ const RawAction_1 = require("../../entities/RawAction");
const RawTransaction_1 = require("../../entities/RawTransaction");
const Transactions_1 = require("../Transactions");
class SignedTransaction extends Transactions_1.Transactions {
execute(privateKey, publicKey, dryRun = false) {
execute(baseUrl, abiMap, privateKey, publicKey, dryRun = false) {
return __awaiter(this, void 0, void 0, function* () {
this.privateKey = privateKey;
this.publicKey = publicKey;
this.baseUrl = baseUrl;
this.abiMap = abiMap;
const rawTransaction = new RawTransaction_1.RawTransaction();
const rawaction = new RawAction_1.RawAction();
rawaction.account = this.getAccount();
Expand Down
Loading