Skip to content

feat: partial tx facade #408

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 26 commits into from
Sep 14, 2022
Merged

feat: partial tx facade #408

merged 26 commits into from
Sep 14, 2022

Conversation

r4mmer
Copy link
Member

@r4mmer r4mmer commented Aug 23, 2022

Acceptance Criteria

  • Changes requested for the new atomic-swap api.
  • Create a method to calculate the token balance for a wallet on a partial tx.

Security Checklist

  • Make sure you do not include new dependencies in the project unless strictly necessary and do not include dev-dependencies as production ones. More dependencies increase the possibility of one of them being hijacked and affecting us.

@r4mmer r4mmer self-assigned this Aug 23, 2022
@codecov
Copy link

codecov bot commented Aug 26, 2022 •
edited
Loading

Codecov Report

Merging #408 (d3f1133) into dev (cb7c96b) will increase coverage by 1.46%.
The diff coverage is 82.97%.

@@            Coverage Diff             @@
##              dev     #408      +/-   ##
==========================================
+ Coverage   55.21%   56.68%   +1.46%     
==========================================
  Files          55       55              
  Lines        4551     4603      +52     
  Branches      846      879      +33     
==========================================
+ Hits         2513     2609      +96     
+ Misses       1848     1804      -44     
  Partials      190      190
Impacted Files Coverage Δ
src/new/wallet.js 13.62% <0.00%> (ø)
src/utils/transaction.ts 75.00% <14.28%> (-25.00%) ⬇️
src/models/partial_tx.ts 93.95% <93.93%> (-0.90%) ⬇️
src/wallet/partialTxProposal.ts 80.95% <97.87%> (+80.95%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@r4mmer r4mmer marked this pull request as ready for review August 26, 2022 20:18
@r4mmer r4mmer requested a review from pedroferreira1 as a code owner August 26, 2022 20:18
@r4mmer r4mmer changed the title Feat/partial tx facade feat: partial tx facade Aug 26, 2022
@r4mmer r4mmer requested a review from tuliomir August 30, 2022 14:47
tuliomir
tuliomir approved these changes Aug 30, 2022
View reviewed changes
Copy link
Contributor

@tuliomir tuliomir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only suggestions I made were about comment blocks and configs, so the code is approved already.

jest.config.js
@@ -7,7 +7,7 @@ module.exports = {
modulePathIgnorePatterns: ["__fixtures__/*","integration/*"],
coverageThreshold: {
global: {
branches: 43,
branches: 45,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one! Always good to improve our coverage and update this config 👍

pedroferreira1
pedroferreira1 reviewed Sep 1, 2022
View reviewed changes
tuliomir
tuliomir approved these changes Sep 8, 2022
View reviewed changes
pedroferreira1
pedroferreira1 reviewed Sep 9, 2022
View reviewed changes
src/models/partial_tx.ts Outdated
const token = tokenIndex === 0 ? HATHOR_TOKEN_CONFIG.uid : tx.tokens[tokenIndex-1];
let authorities = 0;
if (output.isMint()) {
authorities += 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use here TOKEN_MINT_MASK (this is meant also for the melt below)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The isMint already checks for TOKEN_AUTHORITY_MASK (on token data) and TOKEN_MINT_MASK (on value).

I think this seems more readable.
What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment was to use authorities += TOKEN_MINT_MASK and authorities += TOKEN_MELT_MASK below, instead of the hardcoded += 1 and += 2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

r4mmer added 20 commits September 10, 2022 11:48
@r4mmer
feat: addSend with optional utxos argument
fae1ef2
@r4mmer
feat: calculate balance method
e1949a1
@r4mmer
feat: calculate authority balance
547f28b
@r4mmer
fix: utxo selection
b41b114
@r4mmer
fix: use base58 address
a0d6423
@r4mmer
tests: PartialTxProposal tests
1c180f0
@r4mmer
tests: more partialTx proposal tests
4be9aeb
@r4mmer
chore: increase code coverage
63d1b15
@r4mmer
chore: change coverage
34f4686
@r4mmer
feat: filter utxos
a3d831b
@r4mmer
feat: addressPath helper
8693816
@r4mmer
chore: use addressIndex to get addressPath
8c0caae
@r4mmer
feat: expose bufferUtils
ce01429
@r4mmer
feat: track token authority with authorities property
88bb352
@r4mmer
chore: add authorities to constructor
dc9530a
@r4mmer
tests: remove tokenData from partial tx constructor
92e2a33
@r4mmer
tests: remove tokenData from expected tests
d2aa086
@r4mmer
tests: change mock variables
94cff9e
@r4mmer
tests: fix mock methods
0c5eff3
@r4mmer
tests: integration tests
f821ef7
@r4mmer r4mmer force-pushed the feat/partial-tx-facade branch from 224d0d8 to f821ef7 Compare September 12, 2022 14:20
@r4mmer r4mmer mentioned this pull request Sep 12, 2022
Merged
1 task
@tuliomir tuliomir self-requested a review September 14, 2022 14:41
tuliomir
tuliomir requested changes Sep 14, 2022
View reviewed changes
@r4mmer r4mmer merged commit 701a06c into dev Sep 14, 2022
@r4mmer r4mmer deleted the feat/partial-tx-facade branch September 14, 2022 18:36
r4mmer added a commit that referenced this pull request Sep 15, 2022
@r4mmer
feat: partial tx facade update (#408)
cf0ec6e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tuliomir tuliomir tuliomir approved these changes

@pedroferreira1 pedroferreira1 pedroferreira1 approved these changes

Assignees

@r4mmer r4mmer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@r4mmer @tuliomir @pedroferreira1