Skip to content

Add semaphore when adding assets #42

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

Merged
merged 4 commits into from
Dec 11, 2018
Merged

Add semaphore when adding assets #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
615bf3b
refactor to controllers and tests related to assets
estebanmino Dec 10, 2018
d17ffe5
add semaphore when adding assets
estebanmino Dec 11, 2018
595edd1
run asset detection with safely execute
estebanmino Dec 11, 2018
a94a5a2
use BN isZero
estebanmino Dec 11, 2018
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
62 changes: 31 additions & 31 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/AssetsContractController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('AssetsContractController', () => {
it('should get balance of contract correctly', async () => {
assetsContract.configure({ provider: MAINNET_PROVIDER });
const CKBalance = await assetsContract.getBalanceOf(CKADDRESS, '0xb1690c08e213a35ed9bab7b318de14420fb57d8c');
const CKNoBalance = await assetsContract.getBalanceOf(CKADDRESS, '0xfoO');
const CKNoBalance = await assetsContract.getBalanceOf(CKADDRESS, '0xb1690c08e213a35ed9bab7b318de14420fb57d81');
expect(CKBalance.toNumber()).not.toEqual(0);
expect(CKNoBalance.toNumber()).toEqual(0);
});
Expand Down
92 changes: 31 additions & 61 deletions src/AssetsContractController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,17 @@ export class AssetsContractController extends BaseController<AssetsContractConfi
* @returns - Promise resolving to whether the contract implements `interfaceID`
*/
private async contractSupportsInterface(address: string, interfaceId: string): Promise<boolean> {
/* istanbul ignore if */
if (!this.web3) {
return false;
}
try {
const contract = this.web3.eth.contract(abiERC721).at(address);
return await new Promise<boolean>((resolve, reject) => {
contract.supportsInterface(interfaceId, (error: Error, result: boolean) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
const contract = this.web3.eth.contract(abiERC721).at(address);
return new Promise<boolean>((resolve, reject) => {
contract.supportsInterface(interfaceId, (error: Error, result: boolean) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
} catch (error) {
/* istanbul ignore next */
/* waiting for https://github.com/ethereum/web3.js/issues/1119 */
return false;
}
});
}

/**
Expand Down Expand Up @@ -110,30 +100,20 @@ export class AssetsContractController extends BaseController<AssetsContractConfi
*
* @param address - Asset contract address
* @param selectedAddress - Current account public address
* @returns - Promise resolving to balance for current account on specific asset contract
* @returns - Promise resolving to BN object containing balance for current account on specific asset contract
*/
async getBalanceOf(address: string, selectedAddress: string): Promise<typeof BN> {
/* istanbul ignore if */
if (!this.web3) {
return new BN(0);
}
try {
const contract = this.web3.eth.contract(abiERC20).at(address);
return await new Promise<typeof BN>((resolve, reject) => {
contract.balanceOf(selectedAddress, (error: Error, result: typeof BN) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
const contract = this.web3.eth.contract(abiERC20).at(address);
return new Promise<typeof BN>((resolve, reject) => {
contract.balanceOf(selectedAddress, (error: Error, result: typeof BN) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
} catch (error) {
/* istanbul ignore next */
/* waiting for https://github.com/ethereum/web3.js/issues/1119 */
return new BN(0);
}
});
}

/**
Expand Down Expand Up @@ -166,27 +146,17 @@ export class AssetsContractController extends BaseController<AssetsContractConfi
* @returns - Promise resolving to the 'tokenURI'
*/
async getCollectibleTokenURI(address: string, tokenId: number): Promise<string> {
/* istanbul ignore if */
if (!this.web3) {
return '';
}
try {
const contract = this.web3.eth.contract(abiERC721).at(address);
return await new Promise<string>((resolve, reject) => {
contract.tokenURI(tokenId, (error: Error, result: string) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
const contract = this.web3.eth.contract(abiERC721).at(address);
return new Promise<string>((resolve, reject) => {
contract.tokenURI(tokenId, (error: Error, result: string) => {
/* istanbul ignore if */
if (error) {
reject(error);
return;
}
resolve(result);
});
} catch (error) {
/* istanbul ignore next */
/* waiting for https://github.com/ethereum/web3.js/issues/1119 */
return '';
}
});
}
}

Expand Down
Loading