feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures #1321

jingyi2811 · 2022-04-05T03:34:45Z

What this PR does / why we need it:

Add getPendingFutureSwaps RPC

Which issue(s) does this PR fixes?:

Fixes part of #1268

Additional comments?:

codeclimate · 2022-04-05T03:35:15Z

Code Climate has analyzed commit 71d4b76 and detected 1 issue on this pull request.

Here's the issue category breakdown:

Category	Count
Complexity	1

View more on Code Climate.

netlify · 2022-04-05T03:35:55Z

✅ Deploy Preview for jellyfish-defi ready!

Name	Link
🔨 Latest commit	`71d4b76`
🔍 Latest deploy log	https://app.netlify.com/sites/jellyfish-defi/deploys/62514bfe45fe3c00086ada62
😎 Deploy Preview	https://deploy-preview-1321--jellyfish-defi.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

codecov · 2022-04-05T03:46:41Z

Codecov Report

Merging #1321 (71d4b76) into main (fa355c4) will decrease coverage by 0.85%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1321      +/-   ##
==========================================
- Coverage   90.47%   89.62%   -0.86%     
==========================================
  Files         348      348              
  Lines       10008    10010       +2     
  Branches     1222     1222              
==========================================
- Hits         9055     8971      -84     
- Misses        905      987      +82     
- Partials       48       52       +4

Impacted Files	Coverage Δ
...ackages/jellyfish-api-core/src/category/account.ts	`100.00% <100.00%> (+2.81%)`	⬆️
apps/whale/src/module.health/probe.indicator.ts	`37.50% <0.00%> (-62.50%)`	⬇️
apps/whale/src/module.model/pool.swap.ts	`38.46% <0.00%> (-61.54%)`	⬇️
...s/whale/src/module.indexer/model/dftx/pool.swap.ts	`36.95% <0.00%> (-60.87%)`	⬇️
apps/whale/src/module.defid/defid.probes.ts	`27.27% <0.00%> (-59.10%)`	⬇️
...le/src/module.indexer/model/dftx/composite.swap.ts	`32.55% <0.00%> (-53.49%)`	⬇️
apps/whale/src/module.model/_model.probes.ts	`33.33% <0.00%> (-50.01%)`	⬇️
...kages/playground-api-client/src/apis/Playground.ts	`50.00% <0.00%> (-50.00%)`	⬇️
apps/legacy-api/src/modules/WhaleApiModule.ts	`45.83% <0.00%> (-45.84%)`	⬇️
apps/whale/src/module.api/fee.controller.ts	`60.00% <0.00%> (-40.00%)`	⬇️
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fa355c4...71d4b76. Read the comment docs.

github-actions · 2022-04-05T04:20:17Z

Docker build preview for jellyfish/apps is ready!

Built with commit 2840b35

ghcr.io/defich/legacy-api:pr-1321
ghcr.io/defich/ocean-api:pr-1321
ghcr.io/defich/playground-api:pr-1321
ghcr.io/defich/status-api:pr-1321

jingyi2811 · 2022-04-06T03:37:21Z

The final review of this PR is going to determine how the design of listPendingFutureSwaps PR looks like as both PRs are highly related.

jingyi2811 · 2022-04-06T05:36:42Z

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts

+    })
+
+    it('Should getPendingFutureSwaps if futureswap DUSD for TSLA', async () => {
+      // Call getpendingfutureswaps before performing futureswap


It looks redundant as Line 142 does the same thing.
However, I believe every code in every Jest Item (It) should be independent.

…utureSwaps

jingyi2811 · 2022-04-06T09:17:31Z

packages/testcontainers/src/containers/DeFiDContainer.ts

@@ -35,7 +35,7 @@ export abstract class DeFiDContainer extends DockerContainer {
    if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
      return process.env.DEFICHAIN_DOCKER_IMAGE
    }
-    return 'defi/defichain:master-2a236bb79'
+    return 'defi/defichain:master-57c099c1a'


This should be the latest docker, if not reviewer please change this for me.

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts

canonbrother

check the listing logic against the gov

futureswap
check the list 
deactivate the DFIP2203 
check the list again

packages/jellyfish-api-core/src/category/account.ts

jingyi2811 · 2022-04-08T05:15:07Z

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts

+    await testing.generate(1)
+  }
+
+  beforeEach(async () => {


Reset container to remove GOV attributes

jingyi2811 · 2022-04-08T05:16:15Z

packages/jellyfish-testing/src/token.ts

@@ -43,6 +43,11 @@ export class TestingToken {
    const to = { [address]: [account] }
    return await this.rpc.account.sendTokensToAddress({}, to)
  }
+
+  async getTokenId (symbol: string): Promise<string> {


This is a new function created by Suranga

jingyi2811 · 2022-04-08T05:19:31Z

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts

+    })
+  })
+
+  describe('Multiple futureswaps', () => {


I don't duplicate the negative test units for setGov in multiple futureswaps

…utureSwaps # Conflicts: # docs/node/CATEGORIES/08-account.md # packages/jellyfish-api-core/src/category/account.ts # packages/testcontainers/src/containers/DeFiDContainer.ts

…utureSwaps

Add getPendingFutureSwaps RPC

7301f20

defichain-bot added the area/packages label Apr 5, 2022

Remove any and improve doc

61d7824

jingyi2811 mentioned this pull request Apr 5, 2022

packages/jellyfish-api-core: Add DFI2203 Futures work #1268

Closed

Stable version

182e3e2

jingyi2811 added 3 commits April 6, 2022 13:05

Refactor code

61e1177

Improve docs

00c17ba

Rename variable

07d4499

jingyi2811 commented Apr 6, 2022

View reviewed changes

jingyi2811 added 4 commits April 6, 2022 14:17

Add stricter checking

af26179

Merge remote-tracking branch 'origin/main' into jimmy/rpc-getPendingF…

3a771bd

…utureSwaps

Add missing comment

e66c5c6

Merge remote-tracking branch 'origin/main' into jimmy/rpc-getPendingF…

7e0724c

…utureSwaps

jingyi2811 commented Apr 6, 2022

View reviewed changes

jingyi2811 marked this pull request as ready for review April 6, 2022 09:17

jingyi2811 requested review from fuxingloh, canonbrother, surangap, ivan-zynesis, chee-chyuan and chanakasameera as code owners April 6, 2022 09:17

jingyi2811 changed the title ~~Add getPendingFutureSwaps RPC~~ feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures Apr 6, 2022

defichain-bot added the kind/feature New feature request label Apr 6, 2022

jingyi2811 mentioned this pull request Apr 7, 2022

feat(jellyfish-api-core): Add listPendingFutureSwaps RPC for dfip2203 futures #1319

Merged

canonbrother reviewed Apr 7, 2022

View reviewed changes

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts Outdated Show resolved Hide resolved

canonbrother reviewed Apr 7, 2022

View reviewed changes

packages/jellyfish-api-core/__tests__/category/account/getPendingFutureSwaps.test.ts Outdated Show resolved Hide resolved

canonbrother reviewed Apr 7, 2022

View reviewed changes

jingyi2811 added 6 commits April 8, 2022 10:46

Don't mint loan tokens

45c2f5b

Remove getNextSettleBlock function

08866f6

Don't generate block after futureswap

747c578

Fix flank test

e149ffe

Refactor code to handle different GOV attributes

37f65e9

Quick push, switch branch

b61eb17

ivan-zynesis reviewed Apr 8, 2022

View reviewed changes

packages/jellyfish-api-core/src/category/account.ts Outdated Show resolved Hide resolved

jingyi2811 added 2 commits April 8, 2022 12:49

Quick push, switch branch

4c9460c

Stable version

5dc5348

jingyi2811 commented Apr 8, 2022

View reviewed changes

jingyi2811 added 4 commits April 9, 2022 16:24

Merge remote-tracking branch 'origin/main' into jimmy/rpc-getPendingF…

d35fbe7

…utureSwaps # Conflicts: # docs/node/CATEGORIES/08-account.md # packages/jellyfish-api-core/src/category/account.ts # packages/testcontainers/src/containers/DeFiDContainer.ts

Explain what is source

a51760b

Merge remote-tracking branch 'origin/main' into jimmy/rpc-getPendingF…

6bf9496

…utureSwaps

Add comment to sync with function file

71d4b76

surangap approved these changes Apr 9, 2022

View reviewed changes

surangap requested review from canonbrother and ivan-zynesis April 9, 2022 13:25

fuxingloh approved these changes Apr 9, 2022

View reviewed changes

fuxingloh merged commit fdfb3d2 into main Apr 9, 2022

fuxingloh deleted the jimmy/rpc-getPendingFutureSwaps branch April 9, 2022 14:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures #1321

feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures #1321

jingyi2811 commented Apr 5, 2022 •

edited by canonbrother

Loading

codeclimate bot commented Apr 5, 2022 •

edited

Loading

netlify bot commented Apr 5, 2022 •

edited

Loading

codecov bot commented Apr 5, 2022 •

edited

Loading

github-actions bot commented Apr 5, 2022 •

edited

Loading

jingyi2811 commented Apr 6, 2022

jingyi2811 Apr 6, 2022 •

edited

Loading

jingyi2811 Apr 6, 2022

canonbrother left a comment

jingyi2811 Apr 8, 2022 •

edited

Loading

jingyi2811 Apr 8, 2022

jingyi2811 Apr 8, 2022

feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures #1321

feat(jellyfish-api-core): Add account getPendingFutureSwaps RPC for dfip2203 futures #1321

Conversation

jingyi2811 commented Apr 5, 2022 • edited by canonbrother Loading

What this PR does / why we need it:

Which issue(s) does this PR fixes?:

Additional comments?:

codeclimate bot commented Apr 5, 2022 • edited Loading

netlify bot commented Apr 5, 2022 • edited Loading

✅ Deploy Preview for jellyfish-defi ready!

codecov bot commented Apr 5, 2022 • edited Loading

Codecov Report

github-actions bot commented Apr 5, 2022 • edited Loading

jingyi2811 commented Apr 6, 2022

jingyi2811 Apr 6, 2022 • edited Loading

Choose a reason for hiding this comment

jingyi2811 Apr 6, 2022

Choose a reason for hiding this comment

canonbrother left a comment

Choose a reason for hiding this comment

jingyi2811 Apr 8, 2022 • edited Loading

Choose a reason for hiding this comment

jingyi2811 Apr 8, 2022

Choose a reason for hiding this comment

jingyi2811 Apr 8, 2022

Choose a reason for hiding this comment

jingyi2811 commented Apr 5, 2022 •

edited by canonbrother

Loading

codeclimate bot commented Apr 5, 2022 •

edited

Loading

netlify bot commented Apr 5, 2022 •

edited

Loading

codecov bot commented Apr 5, 2022 •

edited

Loading

github-actions bot commented Apr 5, 2022 •

edited

Loading

jingyi2811 Apr 6, 2022 •

edited

Loading

jingyi2811 Apr 8, 2022 •

edited

Loading