int_of_float,
+ bondedTokenCount |> Coin.getBandAmountFromCoin |> int_of_float,
metadata.totalSupply->Coin.getBandAmountFromCoins |> int_of_float,
true,
)
@@ -437,7 +437,11 @@ let make = () => {
{validators->Belt_Array.size > 0
? validators
->Belt_Array.mapWithIndex((i, e) =>
- renderBody(i + 1 + (page - 1) * pageSize, Sub.resolve(e), bondedTokenCount)
+ renderBody(
+ i + 1 + (page - 1) * pageSize,
+ Sub.resolve(e),
+ bondedTokenCount.amount,
+ )
)
->React.array
:
diff --git a/scan/src/pages/ValidatorIndexPage.re b/scan/src/pages/ValidatorIndexPage.re
index cdac85d66a..f75c46f148 100644
--- a/scan/src/pages/ValidatorIndexPage.re
+++ b/scan/src/pages/ValidatorIndexPage.re
@@ -94,7 +94,9 @@ let make = (~address, ~hashtag: Route.validator_tab_t) =>
let validatorSub = ValidatorSub.get(address);
let bondedTokenCountSub = ValidatorSub.getTotalBondedAmount();
let%Sub validator = validatorSub;
- let%Sub bondedTokenCount = bondedTokenCountSub;
+ let%Sub rawBondedTokenCount = bondedTokenCountSub;
+
+ let bondedTokenCount = rawBondedTokenCount.amount;
<>
diff --git a/scan/src/subscriptions/DelegationSub.re b/scan/src/subscriptions/DelegationSub.re
index 6a8f4f9b2d..a80f36ec9a 100644
--- a/scan/src/subscriptions/DelegationSub.re
+++ b/scan/src/subscriptions/DelegationSub.re
@@ -5,24 +5,24 @@ type t = {
};
type stake_t = {
- amount: float,
- reward: float,
+ amount: Coin.t,
+ reward: Coin.t,
sharePercentage: float,
delegatorAddress: Address.t,
validatorAddress: Address.t,
};
type stake_aggregate_t = {
- amount: float,
- reward: float,
+ amount: Coin.t,
+ reward: Coin.t,
};
module StakeConfig = [%graphql
{|
subscription Stake($limit: Int!, $offset: Int!, $delegator_address: String!) {
delegations_view(offset: $offset, limit: $limit, order_by: {amount: desc}, where: {delegator_address: {_eq: $delegator_address}}) @bsRecord {
- amount @bsDecoder(fn: "GraphQLParser.numberExn")
- reward @bsDecoder(fn: "GraphQLParser.numberExn")
+ amount @bsDecoder(fn: "GraphQLParser.coinExn")
+ reward @bsDecoder(fn: "GraphQLParser.coinExn")
sharePercentage: share_percentage @bsDecoder(fn: "GraphQLParser.floatWithDefault")
delegatorAddress: delegator_address @bsDecoder(fn: "GraphQLParser.addressExn")
validatorAddress: validator_address @bsDecoder(fn: "GraphQLParser.addressExn")
@@ -37,8 +37,8 @@ module TotalStakeByDelegatorConfig = [%graphql
delegations_view_aggregate(where: {delegator_address: {_eq: $delegator_address}}){
aggregate{
sum{
- amount @bsDecoder(fn: "GraphQLParser.numberWithDefault")
- reward @bsDecoder(fn: "GraphQLParser.numberWithDefault")
+ amount @bsDecoder(fn: "GraphQLParser.coinWithDefault")
+ reward @bsDecoder(fn: "GraphQLParser.coinWithDefault")
}
}
}
@@ -62,8 +62,8 @@ module DelegatorsByValidatorConfig = [%graphql
{|
subscription Stake($limit: Int!, $offset: Int!, $validator_address: String!) {
delegations_view(offset: $offset, limit: $limit, order_by: {amount: desc}, where: {validator_address: {_eq: $validator_address}}) @bsRecord {
- amount @bsDecoder(fn: "GraphQLParser.numberExn")
- reward @bsDecoder(fn: "GraphQLParser.numberExn")
+ amount @bsDecoder(fn: "GraphQLParser.coinExn")
+ reward @bsDecoder(fn: "GraphQLParser.coinExn")
sharePercentage: share_percentage @bsDecoder(fn: "GraphQLParser.floatWithDefault")
delegatorAddress: delegator_address @bsDecoder(fn: "GraphQLParser.addressExn")
validatorAddress: validator_address @bsDecoder(fn: "GraphQLParser.addressExn")
diff --git a/scan/src/subscriptions/GraphQLParser.re b/scan/src/subscriptions/GraphQLParser.re
index aeafd90506..8ce6f32d03 100644
--- a/scan/src/subscriptions/GraphQLParser.re
+++ b/scan/src/subscriptions/GraphQLParser.re
@@ -17,6 +17,21 @@ let hash = json =>
json |> Js.Json.decodeString |> Belt.Option.getExn |> Js.String.substr(~from=2) |> Hash.fromHex;
let coinRegEx = "([0-9]+)([a-z][a-z0-9/]{2,31})" |> Js.Re.fromString;
+let coin = json => {
+ json |> Js.Json.decodeNumber |> Belt_Option.getExn |> Coin.newUBANDFromAmount;
+};
+let coinExn = jsonOpt => {
+ jsonOpt
+ |> Belt_Option.flatMap(_, Js.Json.decodeNumber)
+ |> Belt.Option.getExn
+ |> Coin.newUBANDFromAmount;
+};
+let coinWithDefault = jsonOpt => {
+ jsonOpt
+ |> Belt_Option.flatMap(_, Js.Json.decodeNumber)
+ |> Belt.Option.getWithDefault(_, 0.0)
+ |> Coin.newUBANDFromAmount;
+};
let coins = str =>
str
|> Js.String.split(",")
@@ -35,17 +50,12 @@ let coins = str =>
let addressExn = jsonOpt => jsonOpt |> Belt_Option.getExn |> Address.fromBech32;
-// TODO: remove 1e6.
-let numberExn = jsonOpt =>
- (jsonOpt |> Belt_Option.flatMap(_, Js.Json.decodeNumber) |> Belt.Option.getExn) /. 1_000_000.;
-
let numberWithDefault = jsonOpt =>
- (jsonOpt |> Belt_Option.flatMap(_, Js.Json.decodeNumber) |> Belt.Option.getWithDefault(_, 0.0))
- /. 1_000_000.;
+ jsonOpt |> Belt_Option.flatMap(_, Js.Json.decodeNumber) |> Belt.Option.getWithDefault(_, 0.0);
let floatWithDefault = jsonOpt =>
jsonOpt |> Belt_Option.flatMap(_, Js.Json.decodeNumber) |> Belt.Option.getWithDefault(_, 0.);
-let floatWithMillionDivision = json => {
- (json |> Js.Json.decodeNumber |> Belt.Option.getExn) /. 1_000_000.;
+let floatExn = json => {
+ json |> Js.Json.decodeNumber |> Belt.Option.getExn;
};
diff --git a/scan/src/subscriptions/UnbondingSub.re b/scan/src/subscriptions/UnbondingSub.re
new file mode 100644
index 0000000000..f41f0f5229
--- /dev/null
+++ b/scan/src/subscriptions/UnbondingSub.re
@@ -0,0 +1,34 @@
+type t = {balance: Coin.t};
+
+module SingleConfig = [%graphql
+ {|
+ subscription Unbonding($delegator_address: String!) {
+ unbonding_delegations_aggregate(where: {delegator_address: {_eq: $delegator_address}}) {
+ aggregate {
+ sum {
+ balance @bsDecoder(fn: "GraphQLParser.coinWithDefault")
+ }
+ }
+ }
+ }
+|}
+];
+
+let getUnbondingBalance = delegatorAddress => {
+ let (result, _) =
+ ApolloHooks.useSubscription(
+ SingleConfig.definition,
+ ~variables=
+ SingleConfig.makeVariables(~delegator_address=delegatorAddress |> Address.toBech32, ()),
+ );
+
+ let unbondingInfoSub =
+ result
+ |> Sub.map(_, a =>
+ (a##unbonding_delegations_aggregate##aggregate |> Belt_Option.getExn)##sum
+ |> Belt_Option.getExn
+ );
+
+ let%Sub unbondingInfo = unbondingInfoSub;
+ unbondingInfo##balance |> Sub.resolve;
+};
diff --git a/scan/src/subscriptions/ValidatorSub.re b/scan/src/subscriptions/ValidatorSub.re
index 708d801254..ca47060aa0 100644
--- a/scan/src/subscriptions/ValidatorSub.re
+++ b/scan/src/subscriptions/ValidatorSub.re
@@ -12,7 +12,7 @@ type internal_t = {
moniker: string,
identity: string,
website: string,
- tokens: float,
+ tokens: Coin.t,
commissionRate: float,
consensusPubKey: PubKey.t,
bondedHeight: int,
@@ -31,7 +31,7 @@ type t = {
identity: string,
website: string,
details: string,
- tokens: float,
+ tokens: Coin.t,
commission: float,
bondedHeight: int,
completedRequestCount: int,
@@ -59,7 +59,7 @@ let toExternal =
operatorAddress,
consensusAddress,
consensusPubKey,
- votingPower: tokens,
+ votingPower: tokens.amount,
moniker,
identity,
website,
@@ -89,7 +89,7 @@ module SingleConfig = [%graphql
moniker
identity
website
- tokens @bsDecoder(fn: "GraphQLParser.floatWithMillionDivision")
+ tokens @bsDecoder(fn: "GraphQLParser.coin")
commissionRate: commission_rate @bsDecoder(fn: "float_of_string")
consensusPubKey: consensus_pubkey @bsDecoder(fn: "PubKey.fromBech32")
bondedHeight: bonded_height @bsDecoder(fn: "GraphQLParser.int64")
@@ -109,7 +109,7 @@ module MultiConfig = [%graphql
moniker
identity
website
- tokens @bsDecoder(fn: "GraphQLParser.floatWithMillionDivision")
+ tokens @bsDecoder(fn: "GraphQLParser.coin")
commissionRate: commission_rate @bsDecoder(fn: "float_of_string")
consensusPubKey: consensus_pubkey @bsDecoder(fn: "PubKey.fromBech32")
bondedHeight: bonded_height @bsDecoder(fn: "GraphQLParser.int64")
@@ -126,7 +126,7 @@ module TotalBondedAmountConfig = [%graphql
validators_aggregate{
aggregate{
sum{
- tokens @bsDecoder(fn: "GraphQLParser.numberWithDefault")
+ tokens @bsDecoder(fn: "GraphQLParser.coinWithDefault")
}
}
}