status-im
/
keycard-redeem
mirror of https://github.com/status-im/keycard-redeem.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

check bucket type before loading ERC20 or NFT bucket

This commit is contained in:
Andrea Franz 2020-04-30 12:16:02 +02:00
parent 60133de7d1
commit 0a5292bdbc
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/actions/bucket.ts
View File

@ -1,5 +1,6 @@
import { RootState } from '../reducers'; import { RootState } from '../reducers';
import ERC20Bucket from '../embarkArtifacts/contracts/ERC20Bucket'; import ERC20Bucket from '../embarkArtifacts/contracts/ERC20Bucket';
import Bucket from '../embarkArtifacts/contracts/Bucket';
import IERC20Detailed from '../embarkArtifacts/contracts/IERC20Detailed'; import IERC20Detailed from '../embarkArtifacts/contracts/IERC20Detailed';
import { config } from "../config"; import { config } from "../config";
import { Dispatch } from 'redux'; import { Dispatch } from 'redux';
@ -113,15 +114,15 @@ export const tokenLoaded = (symbol: string, decimals: number): BucketTokenLoaded
}); });
export const newBucketContract = (address: string) => { export const newBucketContract = (address: string) => {
const bucketAbi = ERC20Bucket.options.jsonInterface; const bucketAbi = Bucket.options.jsonInterface;
const bucket = new config.web3!.eth.Contract(bucketAbi, address); const bucket = new config.web3!.eth.Contract(bucketAbi, address);
return bucket; return bucket;
} }
const newERC20Contract = (address: string) => { export const newERC20BucketContract = (address: string) => {
const erc20Abi = IERC20Detailed.options.jsonInterface; const bucketAbi = ERC20Bucket.options.jsonInterface;
const erc20 = new config.web3!.eth.Contract(erc20Abi, address); const bucket = new config.web3!.eth.Contract(bucketAbi, address);
return erc20; return bucket;
} }
export const loadRedeemable = (bucketAddress: string, recipientAddress: string) => { export const loadRedeemable = (bucketAddress: string, recipientAddress: string) => {
@ -152,6 +153,27 @@ export const loadRedeemable = (bucketAddress: string, recipientAddress: string)
//FIXME: set the proper Contract type //FIXME: set the proper Contract type
export const loadToken = (bucket: any) => { export const loadToken = (bucket: any) => {
return (dispatch: Dispatch, getState: () => RootState) => {
bucket.methods.bucketType().call().then((type: string) => {
switch (type) {
case "20":
dispatch<any>(loadERC20Token(bucket));
break;
case "721":
dispatch<any>(loadERC20Token(bucket));
break;
default:
//FIXME: manage error
console.error("unknown bucket type ", type);
}
}).catch((err: string) => {
//FIXME: manage error
console.error("ERROR: ", err);
})
}
};
export const loadERC20Token = (bucket: any) => {
return (dispatch: Dispatch, getState: () => RootState) => { return (dispatch: Dispatch, getState: () => RootState) => {
bucket.methods.tokenAddress().call().then(async (address: string) => { bucket.methods.tokenAddress().call().then(async (address: string) => {
const erc20Abi = IERC20Detailed.options.jsonInterface; const erc20Abi = IERC20Detailed.options.jsonInterface;