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.

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

Add reserves subscription to addLiquidity #870

Merged
merged 23 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
check pool properties subscription
  • Loading branch information
Nikita-Polyakov committed Nov 28, 2022
commit ce9cfa539d62fc45e5b88b615f27d7c93ef29f92
42 changes: 25 additions & 17 deletions src/store/addLiquidity/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,6 @@ function updateSecondTokenValue(context: ActionContext<any, any>) {
estimateMinted(context);
}

async function checkLiquidity(context: ActionContext<any, any>): Promise<void> {
const { getters, commit } = addLiquidityActionContext(context);
const { firstToken, secondToken } = getters;

if (firstToken && secondToken) {
try {
const isAvailable = await api.poolXyk.check(firstToken.address, secondToken.address);
commit.setIsAvailable(isAvailable);
} catch (error) {
console.error('addLiquidity:checkLiquidity', error);
}
}
}

const actions = defineActions({
async setFirstTokenAddress(context, address: string): Promise<void> {
const { commit, dispatch, getters, rootGetters } = addLiquidityActionContext(context);
Expand All @@ -103,8 +89,7 @@ const actions = defineActions({
balanceSubscriptions.add('first', { updateBalance, token: getters.firstToken });
}

await checkLiquidity(context);

dispatch.subscribeOnAvailability();
dispatch.subscribeOnReserves();
},

Expand All @@ -126,7 +111,7 @@ const actions = defineActions({
balanceSubscriptions.add('second', { updateBalance, token: getters.secondToken });
}

await checkLiquidity(context);
dispatch.subscribeOnAvailability();
dispatch.subscribeOnReserves();
},

Expand Down Expand Up @@ -191,10 +176,14 @@ const actions = defineActions({
async resetData(context): Promise<void> {
const { commit } = addLiquidityActionContext(context);

balanceSubscriptions.remove('first', {
updateBalance: (balance: Nullable<AccountBalance>) => commit.setFirstTokenBalance(balance),
});
balanceSubscriptions.remove('second', {
updateBalance: (balance: Nullable<AccountBalance>) => commit.setSecondTokenBalance(balance),
});

commit.resetAvailabilitySubscription();
commit.resetReserveSubscription();

commit.setFirstTokenAddress();
Expand All @@ -203,6 +192,25 @@ const actions = defineActions({
commit.setSecondTokenValue();
},

subscribeOnAvailability(context): void {
const { commit, getters } = addLiquidityActionContext(context);
const { firstToken, secondToken } = getters;

commit.resetAvailabilitySubscription();

if (firstToken && secondToken) {
// [TODO]: subscription to js-lib
const subscription = api.apiRx.query.poolXYK
.properties(firstToken.address, secondToken.address)
.subscribe((result) => {
const isAvailable = !!result && result.isSome;
commit.setIsAvailable(isAvailable);
});

commit.setAvailabilitySubscription(subscription);
}
},

subscribeOnReserves(context): void {
const { commit, dispatch, getters } = addLiquidityActionContext(context);
const { firstToken, secondToken } = getters;
Expand Down
7 changes: 7 additions & 0 deletions src/store/addLiquidity/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ const mutations = defineMutations<AddLiquidityState>()({
state.reserveSubscription?.unsubscribe();
state.reserveSubscription = null;
},
setAvailabilitySubscription(state, subscription: Subscription): void {
state.availabilitySubscription = subscription;
},
resetAvailabilitySubscription(state): void {
state.availabilitySubscription?.unsubscribe();
state.availabilitySubscription = null;
},
setMintedAndSupply(state, { minted, pts }: { minted: CodecString; pts: CodecString }): void {
state.minted = minted;
state.totalSupply = pts;
Expand Down
6 changes: 5 additions & 1 deletion src/store/addLiquidity/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ function initialState(): AddLiquidityState {
secondTokenValue: '',
firstTokenBalance: null,
secondTokenBalance: null,
focusedField: null,
// pool reserves
reserve: null,
reserveSubscription: null,
// pool lp tokens
minted: ZeroStringValue,
totalSupply: ZeroStringValue,
focusedField: null,
// pool availability
isAvailable: false,
availabilitySubscription: null,
};
}

Expand Down
1 change: 1 addition & 0 deletions src/store/addLiquidity/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ export type AddLiquidityState = {
totalSupply: CodecString;
focusedField: Nullable<FocusedField>;
isAvailable: boolean;
availabilitySubscription: Nullable<Subscription>;
};
10 changes: 0 additions & 10 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ module.exports = defineConfig({
publicPath: './',
configureWebpack: (config) => {
config.plugins.push(new NodePolyfillPlugin());
config.stats = {
preset: 'verbose',
loggingTrace: true,
moduleTrace: true,
};
// bundle all dependencies from node_modules to vendors
config.optimization.splitChunks.cacheGroups.defaultVendors.chunks = 'all';
config.optimization.splitChunks.cacheGroups.common.chunks = 'all';
Expand Down Expand Up @@ -87,9 +82,4 @@ module.exports = defineConfig({
},
productionSourceMap: false,
runtimeCompiler: true,
devServer: {
client: {
logging: 'log',
},
},
});