Skip to content

Chore/update for sdk conway era #734

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

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Chore/update for sdk conway era #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec875eb
chore: stake pools sort by ros
mirceahasegan Nov 17, 2023
6e9da94
chore: metrics require lastRos and ros
mirceahasegan Nov 17, 2023
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
4 changes: 3 additions & 1 deletion apps/browser-extension-wallet/src/api/mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ const getDetailsForAll = (): PoolDetails => ({
livePledge: BigInt('2000000000'),
saturation: Percent(0.95),
size: undefined,
stake: undefined
stake: undefined,
lastRos: Percent(1),
ros: Percent(2)
},
relays: undefined,
rewardAccount: Wallet.Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),
Expand Down
4 changes: 3 additions & 1 deletion apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ export const cardanoStakePoolMock: Wallet.StakePoolSearchResults = {
saturation: Percent(0.0512),
stake: undefined,
size: undefined,
apy: Percent(0.013)
apy: Percent(0.013),
lastRos: Percent(1),
ros: Percent(2)
},
owners: [
Wallet.Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),
Expand Down
2 changes: 1 addition & 1 deletion ...et/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type stakePoolsTableProps = {
};

const DEFAULT_SORT_OPTIONS: StakePoolSortOptions = {
field: 'apy',
field: 'ros',
order: 'desc'
};

Expand Down
28 changes: 21 additions & 7 deletions packages/cardano/src/wallet/test/mocks/StakepoolSearchProviderStub.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
livePledge: BigInt('2000000000'),
saturation: Percent(0.211),
size: undefined,
stake: undefined
stake: undefined,
lastRos: Percent(1),
ros: Percent(2)
},
margin: {
numerator: 2.01,
Expand Down Expand Up @@ -58,7 +60,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
stake: {
live: BigInt('201000000'),
active: BigInt('201000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
},
metadata: {
name: 'THE AMSTERDAM NODE',
Expand Down Expand Up @@ -92,7 +96,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
stake: {
live: BigInt('77000000'),
active: BigInt('77000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
}
},
{
Expand All @@ -114,7 +120,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
stake: {
live: BigInt('34000000'),
active: BigInt('34000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
},
metadata: {
name: 'stakit.io Pool by TOBG',
Expand Down Expand Up @@ -144,7 +152,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
stake: {
live: BigInt('53000000'),
active: BigInt('53000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
},
margin: {
numerator: 0.79,
Expand Down Expand Up @@ -172,7 +182,9 @@ export const pools: Partial<Cardano.StakePool>[] = [
stake: {
live: BigInt('53000000'),
active: BigInt('53000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
},
metadata: {
name: 'VEGASPool',
Expand Down Expand Up @@ -202,7 +214,9 @@ const detailsForAll: PoolDetails = {
stake: {
live: BigInt('34000000'),
active: BigInt('34000000')
}
},
lastRos: Percent(1),
ros: Percent(2)
},
relays: undefined,
rewardAccount: Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),
Expand Down
4 changes: 3 additions & 1 deletion packages/cardano/src/wallet/test/mocks/mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export const stakePoolMock: Cardano.StakePool = {
livePledge: BigInt('2000000000'),
saturation: Percent(0.5),
stake: undefined,
size: undefined
size: undefined,
lastRos: Percent(1),
ros: Percent(2)
},
owners: [
Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),
Expand Down
4 changes: 3 additions & 1 deletion packages/cardano/src/wallet/util/__tests__/stake-pool-transformer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ const cardanoStakePoolMock: StakePoolSearchResults = {
saturation: Percent(0.0512),
stake: undefined,
size: undefined,
apy: Percent(0.013)
apy: Percent(0.013),
lastRos: Percent(1),
ros: Percent(2)
},
owners: [
Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),
Expand Down
2 changes: 1 addition & 1 deletion packages/staking/src/features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type StakePoolsTableProps = {
};

const DEFAULT_SORT_OPTIONS: StakePoolSortOptions = {
field: 'apy',
field: 'ros',
order: 'desc',
};

Expand Down