feat(jellyfish-api-core): Add `futureswap` RPC #1273

surangap · 2022-03-28T11:24:13Z

What this PR does / why we need it:

Add futureswap RPC

Which issue(s) does this PR fixes?:

Fixes part of #1268

Additional comments?:

DeFiCh/ain#1155

codeclimate · 2022-03-28T11:24:45Z

Code Climate has analyzed commit 403236c and detected 0 issues on this pull request.

View more on Code Climate.

netlify · 2022-03-28T11:25:54Z

✅ Deploy Preview for jellyfish-defi ready!

Name	Link
🔨 Latest commit	`403236c`
🔍 Latest deploy log	https://app.netlify.com/sites/jellyfish-defi/deploys/625033dbe54f4a000874550f
😎 Deploy Preview	https://deploy-preview-1273--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-03-28T11:29:35Z

Codecov Report

Merging #1273 (403236c) into main (76c0abe) will increase coverage by 2.28%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##             main    #1273      +/-   ##
==========================================
+ Coverage   88.44%   90.72%   +2.28%     
==========================================
  Files         337      348      +11     
  Lines        9675    10008     +333     
  Branches     1177     1222      +45     
==========================================
+ Hits         8557     9080     +523     
+ Misses       1063      881     -182     
+ Partials       55       47       -8

Impacted Files	Coverage Δ
packages/jellyfish-api-core/src/category/oracle.ts	`94.28% <0.00%> (+0.34%)`	⬆️
apps/playground-api/src/setups/setup.dex.ts	`96.96% <100.00%> (ø)`
...ackages/jellyfish-api-core/src/category/account.ts	`97.18% <100.00%> (-2.82%)`	⬇️
packages/jellyfish-testing/src/token.ts	`100.00% <100.00%> (ø)`
...es/testcontainers/src/containers/DeFiDContainer.ts	`91.11% <100.00%> (ø)`
...ners/src/containers/RegTestContainer/Masternode.ts	`97.34% <100.00%> (+0.14%)`	⬆️
packages/jellyfish-address/src/p2wsh.ts	`48.27% <0.00%> (-51.73%)`	⬇️
packages/jellyfish-address/src/script/P2PKH.ts	`91.66% <0.00%> (-8.34%)`	⬇️
apps/legacy-api/src/modules/ControllerModule.ts	`94.11% <0.00%> (-5.89%)`	⬇️
... and 43 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 76c0abe...403236c. Read the comment docs.

github-actions · 2022-03-28T12:24:44Z

Docker build preview for jellyfish/apps is ready!

Built with commit 00913fa

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

…jellyfish into surangap/dfi2203-futures � Conflicts: � docs/node/CATEGORIES/08-account.md � packages/jellyfish-api-core/src/category/account.ts

This reverts commit 4d137e2.

jingyi2811 · 2022-04-07T11:52:06Z

What if user passed in arbitrary UTXO?

jingyi2811 · 2022-04-07T11:52:29Z

Some typos:

Activat
Retrive
calclulate
TSLADUSD

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

jingyi2811 · 2022-04-07T12:12:58Z

What happened if the oracle is removed after futureswap?

surangap · 2022-04-07T16:13:02Z

What happened if the oracle is removed after futureswap?

invalid price -> https://github.com/DeFiCh/jellyfish/pull/1273/files#diff-ee8fba519a7bc06607fd3b0ea91b884d54fd950efd18398dcd9601ea0f771d00R549

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

…jellyfish into surangap/dfi2203-futures

jingyi2811 · 2022-04-08T13:10:54Z

This is the final one.

If you passed in an arbitrary address like bcrt1qcnfukr6c78wlz2tqpv8vxe0zu339c06pmm3l30 as the address parameter of futureswap. You should get

Received message: "RpcApiError: 'Incorrect authorization for bcrt1qcnfukr6c78wlz2tqpv8vxe0zu339c06pmm3l30', code: -5, method: futureswap"

fuxingloh

🚀 LGTM

packages/testcontainers/src/containers/RegTestContainer/Masternode.ts

Added dfip2203 futures rpcs.

cb115e5

defichain-bot added area/packages kind/feature New feature request labels Mar 28, 2022

surangap added 6 commits March 29, 2022 15:17

Added listFutureSwapHistory rpc.

fa477cd

Updated futureswap API.

6f2551e

Added dfip2203 futures rpcs.

4468967

Added listFutureSwapHistory rpc.

68f69fa

Updated futureswap API.

a133624

Added futureswap tests.

a9990a2

surangap force-pushed the surangap/dfi2203-futures branch from a58b30a to a9990a2 Compare April 3, 2022 14:07

Merge branch 'surangap/dfi2203-futures' of https://github.com/DeFiCh/…

30cf8a8

…jellyfish into surangap/dfi2203-futures � Conflicts: � docs/node/CATEGORIES/08-account.md � packages/jellyfish-api-core/src/category/account.ts

thedoublejay mentioned this pull request Apr 5, 2022

futures option for swapping DUSD to dTokens BirthdayResearch/defichain-wallet#2394

Closed

7 tasks

surangap mentioned this pull request Apr 5, 2022

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

Closed

surangap and others added 8 commits April 5, 2022 19:05

Added dfip2203 futures rpcs.

0207801

Added listFutureSwapHistory rpc.

2320d99

Updated futureswap API.

77e19d8

Added futureswap tests.

a6bcedd

Updated tests.

9f8f3a8

Addted a test to withdraw fututre swap

7e9feaa

Revert "Addted a test to withdraw fututre swap"

247656e

This reverts commit 4d137e2.

Fixed failing tests due to ain 1159.

8a71f88

surangap force-pushed the surangap/dfi2203-futures branch from cf90ff6 to 8a71f88 Compare April 5, 2022 11:05

surangap added 2 commits April 5, 2022 19:50

Updated tests.

efb7d52

Removed untested futureswap extra APIs.

703243a

surangap marked this pull request as ready for review April 5, 2022 12:46

surangap requested a review from fuxingloh as a code owner April 5, 2022 12:46

jingyi2811 reviewed Apr 7, 2022

View reviewed changes

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

jingyi2811 reviewed Apr 7, 2022

View reviewed changes

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

jingyi2811 reviewed Apr 7, 2022

View reviewed changes

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

jingyi2811 reviewed Apr 7, 2022

View reviewed changes

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

surangap added 3 commits April 8, 2022 01:20

Refactored as per suggestions.

da2b5bb

Updated ain image v2.7.0

94c295c

minor update.

ff6456a

surangap requested review from jingyi2811 and canonbrother April 7, 2022 18:25

canonbrother previously approved these changes Apr 8, 2022

View reviewed changes

surangap mentioned this pull request Apr 8, 2022

feat(jellyfish-api-core): Add oracle getFutureSwapBlock RPC for dfip2203 futures #1322

Merged

chanakasameera reviewed Apr 8, 2022

View reviewed changes

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

chanakasameera previously approved these changes Apr 8, 2022

View reviewed changes

surangap dismissed stale reviews from chanakasameera and canonbrother via db26ee4 April 8, 2022 07:20

Rename futureswap.test.ts to futureSwap.test.ts

db26ee4

surangap requested review from chanakasameera and canonbrother April 8, 2022 07:23

chanakasameera previously approved these changes Apr 8, 2022

View reviewed changes

jingyi2811 added 2 commits April 8, 2022 19:40

Merge branch 'surangap/dfi2203-futures' of https://github.com/DeFiCh/…

b674731

…jellyfish into surangap/dfi2203-futures

Fix typos and extra spacing

403236c

jingyi2811 dismissed chanakasameera’s stale review via 403236c April 8, 2022 13:08

fuxingloh approved these changes Apr 8, 2022

View reviewed changes

packages/testcontainers/src/containers/RegTestContainer/Masternode.ts Show resolved Hide resolved

fuxingloh merged commit 57daee6 into main Apr 8, 2022

fuxingloh deleted the surangap/dfi2203-futures branch April 8, 2022 14:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(jellyfish-api-core): Add `futureswap` RPC #1273

feat(jellyfish-api-core): Add `futureswap` RPC #1273

surangap commented Mar 28, 2022 •

edited

Loading

codeclimate bot commented Mar 28, 2022 •

edited

Loading

netlify bot commented Mar 28, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading

github-actions bot commented Mar 28, 2022 •

edited

Loading

jingyi2811 commented Apr 7, 2022

jingyi2811 commented Apr 7, 2022

jingyi2811 commented Apr 7, 2022

surangap commented Apr 7, 2022

jingyi2811 commented Apr 8, 2022 •

edited

Loading

fuxingloh left a comment

feat(jellyfish-api-core): Add futureswap RPC #1273

feat(jellyfish-api-core): Add futureswap RPC #1273

Conversation

surangap commented Mar 28, 2022 • edited Loading

What this PR does / why we need it:

Which issue(s) does this PR fixes?:

Additional comments?:

codeclimate bot commented Mar 28, 2022 • edited Loading

netlify bot commented Mar 28, 2022 • edited Loading

✅ Deploy Preview for jellyfish-defi ready!

codecov bot commented Mar 28, 2022 • edited Loading

Codecov Report

github-actions bot commented Mar 28, 2022 • edited Loading

jingyi2811 commented Apr 7, 2022

jingyi2811 commented Apr 7, 2022

jingyi2811 commented Apr 7, 2022

surangap commented Apr 7, 2022

jingyi2811 commented Apr 8, 2022 • edited Loading

fuxingloh left a comment

Choose a reason for hiding this comment

feat(jellyfish-api-core): Add `futureswap` RPC #1273

feat(jellyfish-api-core): Add `futureswap` RPC #1273

surangap commented Mar 28, 2022 •

edited

Loading

codeclimate bot commented Mar 28, 2022 •

edited

Loading

netlify bot commented Mar 28, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading

github-actions bot commented Mar 28, 2022 •

edited

Loading

jingyi2811 commented Apr 8, 2022 •

edited

Loading