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.

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

feat: add value field to RuneUtxoBalance #61

Merged
merged 5 commits into from
May 14, 2024
Merged

feat: add value field to RuneUtxoBalance #61

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5423fa1
feat: add value field to RuneUtxoBalance
May 8, 2024
6241dc0
fix: fix value to satValue in RuneUtxoBalance
May 11, 2024
36721d3
fix: fix test/updater.test.ts for utxoBalance
May 11, 2024
341f9af
fix: make value is a required field
May 13, 2024
9471650
fix: fix update.test.ts for value
May 13, 2024
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
1 change: 1 addition & 0 deletions src/indexer/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export type RuneSpentUtxoBalance = RuneUtxoBalance & { spentTxid: string };
export type RuneUtxoBalance = {
txid: string;
vout: number;
satValue: number;
address?: string;
scriptPubKey: Buffer;
runeId: RuneLocation;
Expand Down
4 changes: 3 additions & 1 deletion src/indexer/updater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function isScriptPubKeyHexOpReturn(scriptPubKeyHex: string) {
export type UpdaterTx = {
txid: string;
vin: ({ txid: string; vout: number; txinwitness: string[] } | { coinbase: string })[];
vout: { scriptPubKey: { hex: string; address?: string } }[];
vout: { scriptPubKey: { hex: string; address?: string }, value?: number }[];
Copy link
Collaborator

Choose a reason for hiding this comment

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

Note UpdaterTx is just a view of Tx from rpcclient of the fields needed, and value is a required field. Thus I'd make value required here too.

};

export class RuneUpdater implements RuneBlockIndex {
Expand Down Expand Up @@ -298,6 +298,7 @@ export class RuneUpdater implements RuneBlockIndex {
txid: tx.txid,
vout,
address: output.scriptPubKey.address,
satValue: output.value ?? 0,
});
}
}
Expand Down Expand Up @@ -466,6 +467,7 @@ export class RuneUpdater implements RuneBlockIndex {
runeTicker: additionalBalance.runeTicker,
amount: additionalBalance.amount,
spentTxid: tx.txid,
satValue: additionalBalance.satValue,
});
}
}
Expand Down
15 changes: 15 additions & 0 deletions test/updater.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getUtxoBalance.mockResolvedValueOnce([
Expand All @@ -801,6 +802,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getEtching.mockResolvedValue({
Expand Down Expand Up @@ -866,6 +868,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -955,6 +958,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1003,6 +1007,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1055,6 +1060,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1111,6 +1117,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1169,6 +1176,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1230,6 +1238,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1288,6 +1297,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1346,6 +1356,7 @@ describe('edict', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);

Expand Down Expand Up @@ -1401,6 +1412,7 @@ describe('no runestone', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getEtching.mockResolvedValue({
Expand Down Expand Up @@ -1451,6 +1463,7 @@ describe('no runestone', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getEtching.mockResolvedValue({
Expand Down Expand Up @@ -1508,6 +1521,7 @@ describe('burning', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getEtching.mockResolvedValue({
Expand Down Expand Up @@ -1560,6 +1574,7 @@ describe('burning', () => {
runeId: { block: 888, tx: 8 },
scriptPubKey: Buffer.from('a914ea6b832a05c6ca578baa3836f3f25553d41068a587', 'hex'),
address: '3P4WqXDbSLRhzo2H6MT6YFbvBKBDPLbVtQ',
satValue: 0,
},
]);
storage.getEtching.mockResolvedValue({
Expand Down