Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Check vouch status on appId in addition to contentHash #6719

Merged
merged 2 commits into from
Oct 12, 2017
Merged

Check vouch status on appId in addition to contentHash #6719

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a753ea
Check vouch status on appId in addition to contentHash
jacogr Oct 12, 2017
42c8be4
Simplify var expansion
jacogr Oct 12, 2017
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
91 changes: 53 additions & 38 deletions js/src/ui/DappVouchFor/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,70 @@ import { uniq } from 'lodash';
import Contracts from '~/contracts';
import { vouchfor as vouchForAbi } from '~/contracts/abi';

let contractPromise = null;

export default class Store {
@observable vouchers = [];

constructor (api, app) {
this._api = api;

const { contentHash } = app;
const { contentHash, id } = app;

this.findVouchers(contentHash, id);
}

async attachContract () {
const address = await Contracts.get().registry.lookupAddress('vouchfor');
Copy link
Contributor Author

@jacogr jacogr Oct 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't lookup contract address per instance and only create a single contract that is used for queries across stores. (next couple of lines after this). Optimisation as discussed in the previous PR.


if (!address || /^0x0*$/.test(address)) {
return null;
}

const contract = await this._api.newContract(vouchForAbi, address);

return contract;
}

async findVouchers (contentHash, id) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made everything async/await to simplify as per comments from previous PR.

if (!contentHash) {
return;
}

if (contentHash) {
this.lookupVouchers(contentHash);
if (!contractPromise) {
contractPromise = this.attachContract();
}

const contract = await contractPromise;

if (!contract) {
return;
}

const vouchHash = await this.lookupHash(contract, `0x${contentHash}`);
const vouchId = await this.lookupHash(contract, id);

this.addVouchers(vouchHash, vouchId);
}

lookupVouchers (contentHash) {
Contracts
.get().registry
.lookupAddress('vouchfor')
.then((address) => {
if (!address || /^0x0*$/.test(address)) {
return;
}

return this._api.newContract(vouchForAbi, address);
})
.then(async (contract) => {
if (!contract) {
return;
}

let lastItem = false;

for (let index = 0; !lastItem; index++) {
const voucher = await contract.instance.vouched.call({}, [`0x${contentHash}`, index]);

if (/^0x0*$/.test(voucher)) {
lastItem = true;
} else {
this.addVoucher(voucher);
}
}
})
.catch((error) => {
console.error('vouchFor', error);

return;
});
async lookupHash (contract, hash) {
const vouchers = [];
let lastItem = false;

for (let index = 0; !lastItem; index++) {
const voucher = await contract.instance.vouched.call({}, [hash, index]);

if (/^0x0*$/.test(voucher)) {
lastItem = true;
} else {
vouchers.push(voucher);
}
}

return vouchers;
}

@action addVoucher = (voucher) => {
this.vouchers = uniq([].concat(this.vouchers.peek(), [voucher]));
@action addVouchers = (vouchHash, vouchId) => {
this.vouchers = uniq([].concat(this.vouchers.peek(), vouchHash, vouchId));
}
}