Skip to content

Commit 2b02c44

Browse files
nooxxloicttn
nooxx
authored and
loicttn
committed
eth: update get stakes and rewards functions
1 parent 2921ec6 commit 2b02c44

File tree

9 files changed

+596
-503
lines changed

9 files changed

+596
-503
lines changed

‎examples/accounts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Kiln } from "../src/kiln";
33
const f = async () => {
44
const k = new Kiln({
55
testnet: true,
6-
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ejJoV3FCSTlyZlBtM2ZIM0RFRVVaM3NwTkZReHJXTDZWZUxJMWtWWlVrb3VNYUVzcE9Lakt4ZVplOG9vd1oyVw',
6+
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ZjF1SUw4d3R1ZDRxYUdreEwtV2sxcjdmbVFJYlhuMWFGUVduRjBkVFJscFdCaUc5bkV2WmpyTU9xb19pSjlsWg',
77
});
88

99
try {

‎examples/ada.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const f = async () => {
88
try {
99
const k = new Kiln({
1010
testnet: true,
11-
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ejJoV3FCSTlyZlBtM2ZIM0RFRVVaM3NwTkZReHJXTDZWZUxJMWtWWlVrb3VNYUVzcE9Lakt4ZVplOG9vd1oyVw',
11+
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ZjF1SUw4d3R1ZDRxYUdreEwtV2sxcjdmbVFJYlhuMWFGUVduRjBkVFJscFdCaUc5bkV2WmpyTU9xb19pSjlsWg',
1212
integrations: [
1313
{
1414
name: 'vault1',

‎examples/atom.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const apiSecret = fs.readFileSync(__dirname + '/fireblocks_secret.key', 'utf8');
66
const f = async () => {
77
const k = new Kiln({
88
testnet: true,
9-
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ejJoV3FCSTlyZlBtM2ZIM0RFRVVaM3NwTkZReHJXTDZWZUxJMWtWWlVrb3VNYUVzcE9Lakt4ZVplOG9vd1oyVw',
9+
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ZjF1SUw4d3R1ZDRxYUdreEwtV2sxcjdmbVFJYlhuMWFGUVduRjBkVFJscFdCaUc5bkV2WmpyTU9xb19pSjlsWg',
1010
integrations: [
1111
{
1212
name: 'vault1',

‎examples/dot.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const apiSecret = fs.readFileSync(__dirname + '/fireblocks_secret.key', 'utf8');
77
const f = async () => {
88
const k = new Kiln({
99
testnet: true,
10-
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ejJoV3FCSTlyZlBtM2ZIM0RFRVVaM3NwTkZReHJXTDZWZUxJMWtWWlVrb3VNYUVzcE9Lakt4ZVplOG9vd1oyVw',
10+
apiToken: 'kiln_dTkxUTFRdHBMZm9vNFFycFhDSTZCdlJsbjJZang5VnY6ZjF1SUw4d3R1ZDRxYUdreEwtV2sxcjdmbVFJYlhuMWFGUVduRjBkVFJscFdCaUc5bkV2WmpyTU9xb19pSjlsWg',
1111
integrations: [
1212
{
1313
name: 'vault1',

‎examples/eth.ts‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,28 @@ const f = async () => {
2020
});
2121

2222
try {
23-
const tx = await k.eth.craftStakeTx(
24-
'376acfff-e35d-4b7c-90da-c6acb8ea7197',
25-
'0x9cE658155A6f05FE4aef83b7Fa8F431D5e8CcB55',
26-
32,
27-
);
28-
const txSigned = await k.eth.sign('vault1', tx);
29-
const hash = await k.eth.broadcast(txSigned);
23+
// const tx = await k.eth.craftStakeTx(
24+
// '376acfff-e35d-4b7c-90da-c6acb8ea7197',
25+
// '0x9cE658155A6f05FE4aef83b7Fa8F431D5e8CcB55',
26+
// 32,
27+
// );
28+
// const txSigned = await k.eth.sign('vault1', tx);
29+
// const hash = await k.eth.broadcast(txSigned);
3030
//
31-
// const rewards = await k.eth.getStakesRewards(['0xb15c8670d36abe47f03acaa3ba901ac433973048d43df4d2086de4c422ea4d3d0a6b63702d253c15712d3c85997f0071', 'a262bbe9197b0fe7ced73f8af4b13813e0e03a42d62bd223e96b31c8ba379d6c56835c6729647139963f3fade95f52f6']);
31+
// const stakes = await k.eth.getStakesByAccounts(['771254de-ac5a-4911-afdf-1d5b7e802dc9']);
32+
// const stakes = await k.eth.getStakesByValidators(['0xb682de189fd7e6c0e719ba4fcafa1f2ef878824df995617c11a656b99e88fdaf0bd696f48baf35ea8114dfaa67c9bf54']);
33+
// const stakes = await k.eth.getStakesByWallets(['0xbc86717BaD3F8CcF86D2882A6bC351C94580a994']);
34+
// console.log(stakes);
35+
36+
// const rewards = await k.eth.getRewardsByAccounts(['771254de-ac5a-4911-afdf-1d5b7e802dc9'], '2022-11-10', '2022-11-12');
37+
// const rewards = await k.eth.getRewardsByValidators(['0xb682de189fd7e6c0e719ba4fcafa1f2ef878824df995617c11a656b99e88fdaf0bd696f48baf35ea8114dfaa67c9bf54']);
38+
// const rewards = await k.eth.getRewardsByWallets(['0xbc86717BaD3F8CcF86D2882A6bC351C94580a994']);
3239
// console.log(rewards);
33-
if(hash){
34-
console.log(hash);
35-
const status = await k.eth.getTxStatus(hash);
36-
console.log(status);
37-
}
40+
// if(hash){
41+
// console.log(hash);
42+
// const status = await k.eth.getTxStatus(hash);
43+
// console.log(status);
44+
// }
3845
} catch (err) {
3946
console.log(err);
4047
}

‎examples/sol.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ const f = async () => {
1919
});
2020

2121
try {
22-
const tx = await k.sol.craftMergeStakeAccountsTx(
23-
'H1JADXwA94AfMa6tbzhyALDHeawPcWShsvrV3uHGXEWc',
24-
'5dZHQaV1tHLs2z377Lsp6trQsJWe338scd1hYroxXRv3',
25-
'4icse2mPXNgyxxn11tVM7sTnSqDqwJSEzdnaCQnRzvA9',
26-
);
22+
// const tx = await k.sol.craftMergeStakeAccountsTx(
23+
// 'H1JADXwA94AfMa6tbzhyALDHeawPcWShsvrV3uHGXEWc',
24+
// '5dZHQaV1tHLs2z377Lsp6trQsJWe338scd1hYroxXRv3',
25+
// '4icse2mPXNgyxxn11tVM7sTnSqDqwJSEzdnaCQnRzvA9',
26+
// );
2727
// const tx = await k.sol.craftMergeStakeAccountsTx(
2828
// 'Atms8wevMwkrMy7Nb5uqftayQSzxLHP2zNXq9gBS7vWB',
2929
// '2ax6R5pHCS4hLC4q6xfrqToQ36hyy5PofUDodCGWkNtJ',
@@ -35,14 +35,14 @@ const f = async () => {
3535
// '4icse2mPXNgyxxn11tVM7sTnSqDqwJSEzdnaCQnRzvA9',
3636
// 0.1
3737
// );
38-
const signedTx = await k.sol.sign('vault1', tx);
39-
const hash = await k.sol.broadcast(signedTx);
40-
console.log(hash);
38+
// const signedTx = await k.sol.sign('vault1', tx);
39+
// const hash = await k.sol.broadcast(signedTx);
40+
// console.log(hash);
4141

4242
// const accounts = await k.sol.getAccountsRewards(['771254de-ac5a-4911-afdf-1d5b7e802dc9']);
4343
// console.log(accounts);
44-
const tx = await k.sol.getTxStatus('26GZcovnvTGvf5fXFysbtJkNob5r4K9v4H8ZU9tSm8oF5hgUuUm231cabS8LCiC1cqQMFiRkNRNEgqtiVwpr2Bek');
45-
console.log(tx);
44+
// const tx = await k.sol.getTxStatus('26GZcovnvTGvf5fXFysbtJkNob5r4K9v4H8ZU9tSm8oF5hgUuUm231cabS8LCiC1cqQMFiRkNRNEgqtiVwpr2Bek');
45+
// console.log(tx);
4646
} catch (err){
4747
console.log(err);
4848
}

‎src/services/eth.ts‎

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ADDRESSES } from '../globals';
77
import {
88
EthereumStakeOptions,
99
EthereumTx,
10-
EthNetworkStats,
10+
EthNetworkStats, EthRewards,
1111
EthStakes, EthTxStatus,
1212
InternalEthereumConfig,
1313
ValidationKeyDepositData,
@@ -193,7 +193,7 @@ export class EthService extends Service {
193193
* @param accountIds: account ids of which you wish to retrieve rewards
194194
* @returns {EthStakes} Ethereum Stakes
195195
*/
196-
async getAccountsRewards(
196+
async getStakesByAccounts(
197197
accountIds: string[],
198198
): Promise<EthStakes> {
199199
const { data } = await api.get<EthStakes>(
@@ -202,11 +202,11 @@ export class EthService extends Service {
202202
}
203203

204204
/**
205-
* Retrieve stakes made with given wallets
205+
* Retrieve stakes of given wallets
206206
* @param walletAddresses addresses of the wallets of which you wish to retrieve rewards
207207
* @returns {EthStakes} Ethereum Stakes
208208
*/
209-
async getWalletsRewards(
209+
async getStakesByWallets(
210210
walletAddresses: string[],
211211
): Promise<EthStakes> {
212212
const { data } = await api.get<EthStakes>(
@@ -216,17 +216,74 @@ export class EthService extends Service {
216216
}
217217

218218
/**
219-
* Retrieve stake on given validators
219+
* Retrieve stake on given validator addresses
220220
* @param validatorAddresses validator addresses of which you wish to retrieve rewards
221221
* @returns {EthStakes} Ethereum Stakes
222222
*/
223-
async getStakesRewards(validatorAddresses: string[]): Promise<EthStakes> {
223+
async getStakesByValidators(validatorAddresses: string[]): Promise<EthStakes> {
224224
const { data } = await api.get<EthStakes>(
225225
`/v1/eth/stakes?validators=${validatorAddresses.join(',')}`,
226226
);
227227
return data;
228228
}
229229

230+
/**
231+
* Retrieve rewards of given kiln accounts
232+
* @param accountIds: account ids of which you wish to retrieve rewards
233+
* @param startDay: optional date YYYY-MM-DD from which you wish to retrieve rewards
234+
* @param endDay: optional date YYYY-MM-DD until you wish to retrieve rewards
235+
* @returns {EthRewards} Ethereum rewards
236+
*/
237+
async getRewardsByAccounts(
238+
accountIds: string[],
239+
startDay?: string,
240+
endDay?: string,
241+
): Promise<EthRewards> {
242+
const query = `/v1/eth/rewards?accounts=${accountIds.join(',')}${
243+
startDay ? `&start_day=${startDay}` : ''
244+
}${endDay ? `&end_day=${endDay}` : ''}`;
245+
const { data } = await api.get<EthRewards>(query);
246+
return data;
247+
}
248+
249+
/**
250+
* Retrieve stakes of given wallets
251+
* @param walletAddresses addresses of the wallets of which you wish to retrieve rewards
252+
* @param startDay: optional date YYYY-MM-DD from which you wish to retrieve rewards
253+
* @param endDay: optional date YYYY-MM-DD until you wish to retrieve rewards
254+
* @returns {EthRewards} Ethereum rewards
255+
*/
256+
async getRewardsByWallets(
257+
walletAddresses: string[],
258+
startDay?: string,
259+
endDay?: string,
260+
): Promise<EthRewards> {
261+
const query = `/v1/eth/rewards?wallets=${walletAddresses.join(',')}${
262+
startDay ? `&start_day=${startDay}` : ''
263+
}${endDay ? `&end_day=${endDay}` : ''}`;
264+
const { data } = await api.get<EthRewards>(query);
265+
return data;
266+
}
267+
268+
/**
269+
* Retrieve stake on given validator addresses
270+
* @param validatorAddresses validator addresses of which you wish to retrieve rewards
271+
* @param startDay: optional date YYYY-MM-DD from which you wish to retrieve rewards
272+
* @param endDay: optional date YYYY-MM-DD until you wish to retrieve rewards
273+
* @returns {EthRewards} Ethereum rewards
274+
*/
275+
async getRewardsByValidators(
276+
validatorAddresses: string[],
277+
startDay?: string,
278+
endDay?: string,
279+
): Promise<EthRewards> {
280+
const query = `/v1/eth/rewards?validators=${validatorAddresses.join(',')}${
281+
startDay ? `&start_day=${startDay}` : ''
282+
}${endDay ? `&end_day=${endDay}` : ''}`;
283+
const { data } = await api.get<EthRewards>(query);
284+
return data;
285+
}
286+
230287
/**
231288
* Retrieve ETH network stats
232289
*/

0 commit comments

Comments
 (0)