LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

Merge pull request #145 from lbryio/supports

Browse source 
store supports by outpoint in redux
This commit is contained in:
Sean Yesmunt 2019-05-14 14:20:26 -04:00 • committed by GitHub
commit a2bf82bc93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
dist/bundle.es.js vendored
View file

@ -1432,7 +1432,7 @@ const selectTotalBalance = reselect.createSelector(selectState$2, state => state
const selectTransactionsById = reselect.createSelector(selectState$2, state => state.transactions || {});
const selectSupportsById = reselect.createSelector(selectState$2, state => state.supports || {});
const selectSupportsByOutpoint = reselect.createSelector(selectState$2, state => state.supports || {});
const selectTransactionItems = reselect.createSelector(selectTransactionsById, byId => {
const items = [];
@ -1992,21 +1992,23 @@ function doFetchClaimListMine() {
}
function doAbandonClaim(txid, nout) {
const outpoint = `${txid}:${nout}`;
return (dispatch, getState) => {
const state = getState();
const myClaims = selectMyClaimsRaw(state);
const mySupports = selectSupportsById(state);
const mySupports = selectSupportsByOutpoint(state);
// A user could be trying to abandon a support or one of their claims
const claimToAbandon = myClaims.find(claim => claim.txid === txid && claim.nout === nout);
const supportToAbandon = mySupports[txid];
const supportToAbandon = mySupports[outpoint];
if (!claimToAbandon && !supportToAbandon) {
console.error('No associated support or claim with txid: ', txid);
return;
}
const data = claimToAbandon ? { claimId: claimToAbandon.claim_id } : { txid: supportToAbandon.txid };
const data = claimToAbandon ? { claimId: claimToAbandon.claim_id } : { outpoint: `${supportToAbandon.txid}:${supportToAbandon.nout}` };
const isClaim = !!claimToAbandon;
const startedActionType = isClaim ? ABANDON_CLAIM_STARTED : ABANDON_SUPPORT_STARTED;
@ -3158,7 +3160,7 @@ const defaultState$4 = {
fetchingTransactions: false,
supports: {},
fetchingSupports: false,
abandoningSupportsById: {},
abandoningSupportsByOutpoint: {},
gettingNewAddress: false,
draftTransaction: buildDraftTransaction(),
sendingSupport: false,
@ -3202,38 +3204,39 @@ const walletReducer = handleActions({
}),
[FETCH_SUPPORTS_COMPLETED]: (state, action) => {
const byId = state.supports;
const byOutpoint = state.supports;
const { supports } = action.data;
supports.forEach(support => {
byId[support.txid] = support;
supports.forEach(transaction => {
const { txid, nout } = transaction;
byOutpoint[`${txid}:${nout}`] = transaction;
});
return _extends$7({}, state, { supports: byId, fetchingSupports: false });
return _extends$7({}, state, { supports: byOutpoint, fetchingSupports: false });
},
[ABANDON_SUPPORT_STARTED]: (state, action) => {
const { txid } = action.data;
const abandoningById = state.abandoningSupportsById;
const { outpoint } = action.data;
const currentlyAbandoning = state.abandoningSupportsByOutpoint;
abandoningById[txid] = true;
currentlyAbandoning[outpoint] = true;
return _extends$7({}, state, {
abandoningSupportsById: abandoningById
abandoningSupportsByOutpoint: currentlyAbandoning
});
},
[ABANDON_SUPPORT_COMPLETED]: (state, action) => {
const { txid } = action.data;
const byId = state.supports;
const abandoningById = state.abandoningSupportsById;
const { outpoint } = action.data;
const byOutpoint = state.supports;
const currentlyAbandoning = state.abandoningSupportsByOutpoint;
delete abandoningById[txid];
delete byId[txid];
delete currentlyAbandoning[outpoint];
delete byOutpoint[outpoint];
return _extends$7({}, state, {
supports: byId,
abandoningSupportsById: abandoningById
supports: byOutpoint,
abandoningSupportsById: currentlyAbandoning
});
},
@ -3600,7 +3603,7 @@ exports.selectSearchState = selectState;
exports.selectSearchSuggestions = selectSearchSuggestions;
exports.selectSearchUrisByQuery = selectSearchUrisByQuery;
exports.selectSearchValue = selectSearchValue;
exports.selectSupportsById = selectSupportsById;
exports.selectSupportsByOutpoint = selectSupportsByOutpoint;
exports.selectToast = selectToast;
exports.selectTotalBalance = selectTotalBalance;
exports.selectTotalDownloadProgress = selectTotalDownloadProgress;

2
src/index.js
View file

@ -183,7 +183,7 @@ export {
selectBalance,
selectTotalBalance,
selectTransactionsById,
selectSupportsById,
selectSupportsByOutpoint,
selectTransactionItems,
selectRecentTransactions,
selectHasTransactions,

10
src/redux/actions/claims.js
View file

@ -5,7 +5,7 @@ import { normalizeURI, parseURI } from 'lbryURI';
import { doToast } from 'redux/actions/notifications';
import { selectMyClaimsRaw, selectResolvingUris, selectClaimsByUri } from 'redux/selectors/claims';
import { doFetchTransactions } from 'redux/actions/wallet';
import { selectSupportsById } from 'redux/selectors/wallet';
import { selectSupportsByOutpoint } from 'redux/selectors/wallet';
import { creditsToString } from 'util/formatCredits';
export function doResolveUris(uris: Array<string>, returnCachedClaims: boolean = false) {
@ -90,14 +90,16 @@ export function doFetchClaimListMine() {
}
export function doAbandonClaim(txid: string, nout: number) {
const outpoint = `${txid}:${nout}`;
return (dispatch: Dispatch, getState: GetState) => {
const state = getState();
const myClaims: Array<ChannelClaim | StreamClaim> = selectMyClaimsRaw(state);
const mySupports: { [string]: Support } = selectSupportsById(state);
const mySupports: { [string]: Support } = selectSupportsByOutpoint(state);
// A user could be trying to abandon a support or one of their claims
const claimToAbandon = myClaims.find(claim => claim.txid === txid && claim.nout === nout);
const supportToAbandon = mySupports[txid];
const supportToAbandon = mySupports[outpoint];
if (!claimToAbandon && !supportToAbandon) {
console.error('No associated support or claim with txid: ', txid);
@ -106,7 +108,7 @@ export function doAbandonClaim(txid: string, nout: number) {
const data = claimToAbandon
? { claimId: claimToAbandon.claim_id }
: { txid: supportToAbandon.txid };
: { outpoint: `${supportToAbandon.txid}:${supportToAbandon.nout}` };
const isClaim = !!claimToAbandon;
const startedActionType = isClaim

35
src/redux/reducers/wallet.js
View file

@ -19,7 +19,7 @@ type WalletState = {
latestBlock: ?number,
transactions: { [string]: Transaction },
supports: { [string]: Support },
abandoningSupportsById: { [string]: boolean },
abandoningSupportsByOutpoint: { [string]: boolean },
fetchingTransactions: boolean,
gettingNewAddress: boolean,
draftTransaction: any,
@ -47,7 +47,7 @@ const defaultState = {
fetchingTransactions: false,
supports: {},
fetchingSupports: false,
abandoningSupportsById: {},
abandoningSupportsByOutpoint: {},
gettingNewAddress: false,
draftTransaction: buildDraftTransaction(),
sendingSupport: false,
@ -95,40 +95,41 @@ export const walletReducer = handleActions(
}),
[ACTIONS.FETCH_SUPPORTS_COMPLETED]: (state: WalletState, action) => {
const byId = state.supports;
const byOutpoint = state.supports;
const { supports } = action.data;
supports.forEach(support => {
byId[support.txid] = support;
supports.forEach(transaction => {
const { txid, nout } = transaction;
byOutpoint[`${txid}:${nout}`] = transaction;
});
return { ...state, supports: byId, fetchingSupports: false };
return { ...state, supports: byOutpoint, fetchingSupports: false };
},
[ACTIONS.ABANDON_SUPPORT_STARTED]: (state: WalletState, action: any): WalletState => {
const { txid }: { txid: string } = action.data;
const abandoningById = state.abandoningSupportsById;
const { outpoint }: { outpoint: string } = action.data;
const currentlyAbandoning = state.abandoningSupportsByOutpoint;
abandoningById[txid] = true;
currentlyAbandoning[outpoint] = true;
return {
...state,
abandoningSupportsById: abandoningById,
abandoningSupportsByOutpoint: currentlyAbandoning,
};
},
[ACTIONS.ABANDON_SUPPORT_COMPLETED]: (state: WalletState, action: any): WalletState => {
const { txid }: { txid: string } = action.data;
const byId = state.supports;
const abandoningById = state.abandoningSupportsById;
const { outpoint }: { outpoint: string } = action.data;
const byOutpoint = state.supports;
const currentlyAbandoning = state.abandoningSupportsByOutpoint;
delete abandoningById[txid];
delete byId[txid];
delete currentlyAbandoning[outpoint];
delete byOutpoint[outpoint];
return {
...state,
supports: byId,
abandoningSupportsById: abandoningById,
supports: byOutpoint,
abandoningSupportsById: currentlyAbandoning,
};
},

2
src/redux/selectors/wallet.js
View file

@ -85,7 +85,7 @@ export const selectTransactionsById = createSelector(
state => state.transactions || {}
);
export const selectSupportsById = createSelector(
export const selectSupportsByOutpoint = createSelector(
selectState,
state => state.supports || {}
);