diff --git a/apps/explorer/.env.validator-testnet b/apps/explorer/.env.validator-testnet index cf2d4c960..8371a14c3 100644 --- a/apps/explorer/.env.validator-testnet +++ b/apps/explorer/.env.validator-testnet @@ -1,7 +1,7 @@ # App configuration variables NX_VEGA_ENV=VALIDATOR_TESTNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml -NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql +NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql NX_VEGA_REST=https://api.validators-testnet.vega.xyz/ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io diff --git a/apps/explorer/src/app/app.tsx b/apps/explorer/src/app/app.tsx index 3afc1573c..7687dc401 100644 --- a/apps/explorer/src/app/app.tsx +++ b/apps/explorer/src/app/app.tsx @@ -48,7 +48,7 @@ const MainnetSimAd = () => {
- Mainnet sim 3 is coming soon! + Mainnet sim 3 is live! Learn more
diff --git a/apps/explorer/src/app/routes/validators/validators-page.tsx b/apps/explorer/src/app/routes/validators/validators-page.tsx index cf70d1547..e9ee92a4d 100644 --- a/apps/explorer/src/app/routes/validators/validators-page.tsx +++ b/apps/explorer/src/app/routes/validators/validators-page.tsx @@ -176,25 +176,14 @@ export const ValidatorsPage = () => { const validatorName = v.name && v.name.length > 0 ? v.name : truncateMiddle(v.id); return ( -
  • +
  • - {v.avatarUrl && ( -
    - - {validatorName} - -
    - )}
    -

    +

    {validatorName} @@ -315,6 +304,23 @@ export const ValidatorsPage = () => {

    + {v.avatarUrl && ( + +
    {t('Avatar')}
    +
    + + {validatorName} + +
    +
    + )} diff --git a/apps/governance/.env.validator-testnet b/apps/governance/.env.validator-testnet index bca039a58..72e0cf24d 100644 --- a/apps/governance/.env.validator-testnet +++ b/apps/governance/.env.validator-testnet @@ -1,7 +1,7 @@ # App configuration variables NX_VEGA_ENV=VALIDATOR_TESTNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml -NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql +NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql NX_VEGA_REST=https://api.validators-testnet.vega.xyz/ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 diff --git a/apps/governance/src/components/page-templates/template-sidebar.tsx b/apps/governance/src/components/page-templates/template-sidebar.tsx index baa77a1ae..fc858b7dc 100644 --- a/apps/governance/src/components/page-templates/template-sidebar.tsx +++ b/apps/governance/src/components/page-templates/template-sidebar.tsx @@ -21,7 +21,7 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) { <>
    - Mainnet sim 3 is coming soon! + Mainnet sim 3 is live! Come help stress test the network diff --git a/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx b/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx index ae82f8228..635e02926 100644 --- a/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx +++ b/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx @@ -166,10 +166,7 @@ export const ConsensusValidatorsTable = ({ avatarUrl, name, }, - [ValidatorFields.STAKE]: formatNumber( - toBigNum(stakedTotal, decimals), - 2 - ), + [ValidatorFields.STAKE]: stakedTotal, [ValidatorFields.NORMALISED_VOTING_POWER]: getNormalisedVotingPower(votingPower), [ValidatorFields.UNNORMALISED_VOTING_POWER]: @@ -198,10 +195,8 @@ export const ConsensusValidatorsTable = ({ stakedTotal, totalStake ), - [ValidatorFields.PENDING_STAKE]: formatNumber( - toBigNum(pendingStake, decimals), - 2 - ), + [ValidatorFields.PENDING_STAKE]: pendingStake, + decimals, }; } ); @@ -256,22 +251,18 @@ export const ConsensusValidatorsTable = ({ return { ...acc, - [ValidatorFields.STAKE]: formatNumber( - toBigNum(accStake, decimals).plus(toBigNum(stake, decimals)), - 2 - ), + [ValidatorFields.STAKE]: toBigNum(accStake, decimals) + .plus(toBigNum(stake, decimals)) + .toString(), [ValidatorFields.STAKE_SHARE]: formatNumberPercentage( new BigNumber(parseFloat(accStakeShare)).plus( new BigNumber(parseFloat(stakeShare)) ), 2 ), - [ValidatorFields.PENDING_STAKE]: formatNumber( - toBigNum(accPendingStake, decimals).plus( - toBigNum(pendingStake, decimals) - ), - 2 - ), + [ValidatorFields.PENDING_STAKE]: toBigNum(accPendingStake, decimals) + .plus(toBigNum(pendingStake, decimals)) + .toString(), [ValidatorFields.NORMALISED_VOTING_POWER]: formatNumberPercentage( new BigNumber(parseFloat(accNormalisedVotingPower)).plus( new BigNumber(parseFloat(normalisedVotingPower)) @@ -349,6 +340,8 @@ export const ConsensusValidatorsTable = ({ field: ValidatorFields.PENDING_STAKE, headerName: t(ValidatorFields.PENDING_STAKE).toString(), headerTooltip: t('PendingStakeDescription').toString(), + valueFormatter: ({ value }) => + formatNumber(toBigNum(value, decimals), 2), width: 110, }, ], diff --git a/apps/governance/src/routes/staking/home/validator-tables/shared.tsx b/apps/governance/src/routes/staking/home/validator-tables/shared.tsx index 9cd23f2d6..49086e297 100644 --- a/apps/governance/src/routes/staking/home/validator-tables/shared.tsx +++ b/apps/governance/src/routes/staking/home/validator-tables/shared.tsx @@ -12,6 +12,7 @@ import { } from '@vegaprotocol/ui-toolkit'; import type { NodesFragmentFragment } from '../__generated___/Nodes'; import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch'; +import { useAppState } from '../../../../contexts/app-state/app-state-context'; export enum ValidatorFields { RANKING_INDEX = 'rankingIndex', @@ -148,6 +149,11 @@ interface TotalStakeRendererProps { export const TotalStakeRenderer = ({ data }: TotalStakeRendererProps) => { const { t } = useTranslation(); + const { + appState: { decimals }, + } = useAppState(); + + const formattedStake = formatNumber(toBigNum(data.stake, decimals), 2); return ( { {t('stakedByDelegates')}: {data.stakedByDelegates.toString()}
    - {t('totalStake')}: {data.stake} + {t('totalStake')}:{' '} + {formattedStake}
    } > - {data.stake} + {formattedStake} ); }; diff --git a/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx b/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx index 5887fe7c3..b93d4b543 100644 --- a/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx +++ b/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx @@ -122,10 +122,7 @@ export const StandbyPendingValidatorsTable = ({ avatarUrl, name, }, - [ValidatorFields.STAKE]: formatNumber( - toBigNum(stakedTotal, decimals), - 2 - ), + [ValidatorFields.STAKE]: stakedTotal, [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION]: individualStakeNeededForPromotion || null, [ValidatorFields.STAKE_NEEDED_FOR_PROMOTION_DESCRIPTION]: @@ -154,10 +151,7 @@ export const StandbyPendingValidatorsTable = ({ stakedTotal, totalStake ), - [ValidatorFields.PENDING_STAKE]: formatNumber( - toBigNum(pendingStake, decimals), - 2 - ), + [ValidatorFields.PENDING_STAKE]: pendingStake, }; } ); @@ -222,6 +216,8 @@ export const StandbyPendingValidatorsTable = ({ field: ValidatorFields.PENDING_STAKE, headerName: t(ValidatorFields.PENDING_STAKE).toString(), headerTooltip: t('PendingStakeDescription').toString(), + valueFormatter: ({ value }) => + formatNumber(toBigNum(value, decimals), 2), width: 110, }, ], diff --git a/apps/multisig-signer/.env.validator-testnet b/apps/multisig-signer/.env.validator-testnet index 9e3502404..203a40d64 100644 --- a/apps/multisig-signer/.env.validator-testnet +++ b/apps/multisig-signer/.env.validator-testnet @@ -1,5 +1,5 @@ # App configuration variables NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.tom -NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql +NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}' NX_VEGA_ENV=VALIDATOR_TESTNET diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index 19327271a..9a305662d 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -3,12 +3,74 @@ "tranche_id": 54, "tranche_start": "2023-04-06T00:00:00.000Z", "tranche_end": "2023-05-06T00:00:00.000Z", - "total_added": "0", + "total_added": "1017", "total_removed": "0", - "locked_amount": "0", - "deposits": [], + "locked_amount": "1017", + "deposits": [ + { + "amount": "111", + "user": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D", + "tx": "0xaa4cd47a35439204ff26c2b25f2a1378232bcd88c20d2a2ce96194ccdb469d7c" + }, + { + "amount": "48", + "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "tx": "0x417ab1e8a2bc4e0d60dcebb8880eb8d8a3a24dddeccb40f078f4714ba0d1ddbc" + }, + { + "amount": "858", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tx": "0x1951bb7b36cbc8033a63f49dcd778dcd5d554d772321481070c6274b04432f45" + } + ], "withdrawals": [], - "users": [] + "users": [ + { + "address": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D", + "deposits": [ + { + "amount": "111", + "user": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D", + "tranche_id": 54, + "tx": "0xaa4cd47a35439204ff26c2b25f2a1378232bcd88c20d2a2ce96194ccdb469d7c" + } + ], + "withdrawals": [], + "total_tokens": "111", + "withdrawn_tokens": "0", + "remaining_tokens": "111" + }, + { + "address": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "deposits": [ + { + "amount": "48", + "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "tranche_id": 54, + "tx": "0x417ab1e8a2bc4e0d60dcebb8880eb8d8a3a24dddeccb40f078f4714ba0d1ddbc" + } + ], + "withdrawals": [], + "total_tokens": "48", + "withdrawn_tokens": "0", + "remaining_tokens": "48" + }, + { + "address": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "deposits": [ + { + "amount": "858", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tranche_id": 54, + "tx": "0x1951bb7b36cbc8033a63f49dcd778dcd5d554d772321481070c6274b04432f45" + } + ], + "withdrawals": [], + "total_tokens": "858", + "withdrawn_tokens": "0", + "remaining_tokens": "858" + } + ] }, { "tranche_id": 50, @@ -114,8 +176,8 @@ "tranche_start": "2023-03-06T00:00:00.000Z", "tranche_end": "2023-04-06T00:00:00.000Z", "total_added": "14099", - "total_removed": "0", - "locked_amount": "10799.3265539127835881", + "total_removed": "22.78816420236", + "locked_amount": "10344.2042644862615388", "deposits": [ { "amount": "30", @@ -878,7 +940,23 @@ "tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "14.85013776876", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tx": "0x8141c5265374c8ecdf1e5aec8c029bdc7fa72121fd6ae1e6aa2e0d106b9d8d19" + }, + { + "amount": "7.937219982", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tx": "0xab8488ed5dc0511447cd733109416b33f85215eeeff8ce3c5fd41243da1eee0f" + }, + { + "amount": "0.0008064516", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tx": "0x6991bd2d1e67b0b96ed00564fbc5e030c2985406789cf05b528ff66553f464f0" + } + ], "users": [ { "address": "0xFe6e34be49cEF3559877dC9543D8eb2d11fb00A8", @@ -1070,10 +1148,17 @@ "tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "14.85013776876", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tranche_id": 53, + "tx": "0x8141c5265374c8ecdf1e5aec8c029bdc7fa72121fd6ae1e6aa2e0d106b9d8d19" + } + ], "total_tokens": "63", - "withdrawn_tokens": "0", - "remaining_tokens": "63" + "withdrawn_tokens": "14.85013776876", + "remaining_tokens": "48.14986223124" }, { "address": "0x8499411Bff99ddE9A02903008F917EEa0E27B42A", @@ -1769,10 +1854,23 @@ "tx": "0xecbb3424e425019a8ebdb9326f662c3520f220fbecdfdaa4770c282001a0f5eb" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "7.937219982", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 53, + "tx": "0xab8488ed5dc0511447cd733109416b33f85215eeeff8ce3c5fd41243da1eee0f" + }, + { + "amount": "0.0008064516", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 53, + "tx": "0x6991bd2d1e67b0b96ed00564fbc5e030c2985406789cf05b528ff66553f464f0" + } + ], "total_tokens": "30", - "withdrawn_tokens": "0", - "remaining_tokens": "30" + "withdrawn_tokens": "7.9380264336", + "remaining_tokens": "22.0619735664" }, { "address": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E", @@ -2772,7 +2870,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "63336.4146916262637000031", + "locked_amount": "63098.8078918222376806917", "deposits": [ { "amount": "86666.297", @@ -2838,7 +2936,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "1095.396761803012", + "locked_amount": "1081.650958994709", "deposits": [ { "amount": "2500", @@ -2959,7 +3057,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "16334.43192683172325", + "locked_amount": "16239.25718347423575", "deposits": [ { "amount": "12500", @@ -3226,7 +3324,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "3917.838301575", - "locked_amount": "29159.8517111724975", + "locked_amount": "28952.5255141190925", "deposits": [ { "amount": "7500", @@ -3458,7 +3556,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "63278.62818251343134199", + "locked_amount": "63041.238169017378291735", "deposits": [ { "amount": "129999.45", @@ -3524,7 +3622,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "29798.43768391679672", + "locked_amount": "29626.811732623032584", "deposits": [ { "amount": "10000", @@ -3717,7 +3815,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "2571.847729578894", + "locked_amount": "2558.139586504312", "deposits": [ { "amount": "5000", @@ -3928,7 +4026,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "97499.58", "total_removed": "0", - "locked_amount": "5292.64119910832117511", + "locked_amount": "5059.78370974873541472972", "deposits": [ { "amount": "97499.58", @@ -3961,7 +4059,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "135173.4239508", "total_removed": "98230.390980249184455396", - "locked_amount": "7234.126782797007100838374056", + "locked_amount": "6915.850796010897201399987636", "deposits": [ { "amount": "135173.4239508", @@ -4007,7 +4105,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "32499.86", "total_removed": "0", - "locked_amount": "2226.522753440148345498", + "locked_amount": "2128.5636289003244271826", "deposits": [ { "amount": "32499.86", @@ -4040,7 +4138,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "10833.29", "total_removed": "0", - "locked_amount": "724.7115505793851096019", + "locked_amount": "692.8268061145151353672", "deposits": [ { "amount": "10833.29", @@ -4073,7 +4171,7 @@ "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "22749.93", "total_removed": "4720.860935375", - "locked_amount": "2709.1336374672767544753", + "locked_amount": "2589.9413413285340939682", "deposits": [ { "amount": "6500", @@ -4225,7 +4323,7 @@ "tranche_end": "2023-05-01T00:00:00.000Z", "total_added": "22500", "total_removed": "5454.874059975", - "locked_amount": "6059.4469383057075", + "locked_amount": "5935.0512200736645", "deposits": [ { "amount": "7500", @@ -4577,7 +4675,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "928642.9598472029154", - "locked_amount": "429148.746614663792446522", + "locked_amount": "423830.1834571677259461984", "deposits": [ { "amount": "1852091.69", @@ -10008,8 +10106,8 @@ "tranche_id": 11, "tranche_start": "2021-09-03T00:00:00.000Z", "tranche_end": "2022-09-03T00:00:00.000Z", - "total_added": "55593.000000000000000003", - "total_removed": "44322.21518131551", + "total_added": "56003.000000000000000003", + "total_removed": "44482.21518131551", "locked_amount": "0", "deposits": [ { @@ -10017,6 +10115,101 @@ "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008", "tx": "0x1f0b474f4b0a4a842010ec10ed179d19d608a2385418ae29e969996084729b7a" }, + { + "amount": "15", + "user": "0xaaaaFd67947Ef241D8C24C863893800083855Ed6", + "tx": "0x178b5743e692cabd8505900c3f8acd14b19b4cd2833ba5ce412aa9c0ec5c5d4f" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x4626eeaef56092f667bfc9c1ff248d99f67d58c3e3181bb60df141716dea9cd0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x4500c382084b6748ead7c42dd76aff526b89bef432ff4d34756786699b99e63e" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x87a76f0dbd2512d8230715cf19515a0332ec5b64e99d84bbecf19b72c9a1e0dd" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x799d6285e5e71d387da65d4176cbcf8c3713d3e0fb2bde0baae9bdd72dcfa62b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x81389f4d3fa0fcc953fcb52f5a525b91b276a50e68eb8aebeadc91da97a81fd2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x8243470e6825a8c6f06dc88e21b995c3385e9d9aa213442cccde58894f01c71f" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xa8d35b50c0ed2ed6f6335d80f3f1f09c03bef66ad85925260f966826e65fce6a" + }, + { + "amount": "25", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tx": "0x8f583c2aa71bc323b81be9f63848379c4d7843a5282720f507d8ac2134f1f2d6" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xeb9749d38b43dafae2b6a2c32452a1c1cee9f4c11f08563f30a141b78c026e68" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xedc7fffff8a8a41c57b2df83f2093d354fcc2c605b22168f6b6b8036f7ed5847" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tx": "0x8e24b29e8ab42e536d66baff5097d7efbf6179bd191def0a75e9fbd663582050" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xc6441e2b917ae485319d3e0887599a2436aa592d10380bcb25ad62d11b4ced55" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x54f3f64a9683231ff4d35298bdca050de078de95676c434496bc1cdc93d63a52" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xc0cfab61a9f0623cd764818233c0da0b4d41652f0fd8c791758e31898df5376b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x5dd75cdc698aa6f6b846e16bae645f3dd5d8a0fd18ff5e6ccfc9d44365ca17d0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0xdcbf2a952240450b54c5745db9a3bfdc5089ce1846f9664b371c17a3a62062ef" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x537839ad72c3cba4ca93ede1cf6361a4622aa5683914103fa32dc82c82457971" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tx": "0x16b4461d9c727f3238bb846506b8758441a866afa5abb85f3777cd28ef4f5230" + }, { "amount": "15", "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", @@ -20249,6 +20442,26 @@ } ], "withdrawals": [ + { + "amount": "25", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tx": "0xfb20dd94f31f9d09d623176bfe0915b054ded0ba4b1bcd6734364a0a2a5bd324" + }, + { + "amount": "10", + "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5", + "tx": "0x3ee3f6067fd4181af09fe85299003f5cc8597fc827c70f1842f4a3b3944b5b79" + }, + { + "amount": "10", + "user": "0x6Ea6bE7D5E4E7EEA7BB5EDB64901B8D8a50905F2", + "tx": "0x4884aa353e8b38236dd49b0976c7ec48b9bf2d599fd06bd04ecf3b6c1bb6350a" + }, + { + "amount": "115", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tx": "0xc1d1e0a03a5ace0a8c61f58c81a407867a2d3195d2249df11d2eb630949d4ea2" + }, { "amount": "130", "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", @@ -21483,1234 +21696,15 @@ "withdrawn_tokens": "1135", "remaining_tokens": "200" }, - { - "address": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", - "deposits": [ - { - "amount": "15", - "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", - "tranche_id": 11, - "tx": "0x842269dc960af54f5f20e903f8cc2dae77d68b6c051b238a1467fa93e0ec34c3" - }, - { - "amount": "30", - "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", - "tranche_id": 11, - "tx": "0x407d9a64209bd8f656d969ee2dde00c24347cbdb9c3f53d9026278390c80e325" - } - ], - "withdrawals": [ - { - "amount": "45", - "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", - "tranche_id": 11, - "tx": "0xa3689042534a1b09c39510c3a9da4f5838c77e88df0dd7dd76415b759d9ad377" - } - ], - "total_tokens": "45", - "withdrawn_tokens": "45", - "remaining_tokens": "0" - }, - { - "address": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "deposits": [ - { - "amount": "80", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xde7e3f48359ad1473d4b6f05582e2bee121458b1103687037fca29ab95c9f50a" - }, - { - "amount": "20", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xfeb720f64f2951e185db6e872e022575d3fd8477f85b2698890f70d8820fd596" - }, - { - "amount": "15", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x8d55eb2b5f4091eaa0dee96242f8eb6bac12312415c202007695da4b9df96ac6" - }, - { - "amount": "15", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xf7e1cb4b03d0f7664b4d7688029ed8ad4c468bf4b2e6ef941c59de4dce680496" - }, - { - "amount": "25", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x3a6f6a47608e017b8d8a1495821514beed5fbb265176665aba6213987a4e0bde" - }, - { - "amount": "20", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x1656fec2cd5d9bf5aeb907e64b222843e13ac0921f4dc9451e6db7d02611c742" - }, - { - "amount": "30", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x20652e7dddc270c76be42c7496a968f5a0831dae46c12d1866c8b720c1070cb4" - }, - { - "amount": "60", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x89b232cab8db6ae361d824c55ec20b0e59c0bc14fadb71d902bba3a801338258" - }, - { - "amount": "15", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x5032a6328b99e190e893bd7feca96d465fca1996939c71fda986bdddc89897d8" - }, - { - "amount": "20", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x9217321eb5e9b64157da6b8ab97a1ce927e64671095da3086be0edd7cd0ef709" - }, - { - "amount": "200", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xf88b8ed5ce899f00f466830936599112ea678a4e5911801fb3e445c22eb0295f" - }, - { - "amount": "100", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x0c0ea0139cc752d22c0f8a6b3ffa5c4bcdca1c5604089ebd0f34898f1049db61" - }, - { - "amount": "90", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x29371816157718f7d5136d0ed8a0f1e09045ee3cfcd67199d45e3f4157f7e011" - }, - { - "amount": "35", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x6a081b2c5dfa2d5c916a598569519605322721c5511d26cf4aed8e08e49cf700" - }, - { - "amount": "30", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xc37be614ef14bbbedc808ffc7651fbb7a3c04e4d1612f00f19299da7916003e6" - } - ], - "withdrawals": [ - { - "amount": "130", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0xc39eefed84fded9118b3e8a84f7fdb79789725ce078421c07e4b9f0b14bb78f2" - }, - { - "amount": "58.26122352505", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x249318d3c808f6ec92369ae9008fb479b35a0791fab00cc9d1a1b88a2fdd4ce8" - }, - { - "amount": "170", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x7e67e8f61e2da7b26a4b08053f9ec3f63fa03c7d1c1907b440fc1d63317370b7" - }, - { - "amount": "396.73877647495", - "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", - "tranche_id": 11, - "tx": "0x01702228af643636ceb22064a23b1b22b66a992f3ec9be8f6d1788e6a996312b" - } - ], - "total_tokens": "755", - "withdrawn_tokens": "755", - "remaining_tokens": "0" - }, - { - "address": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "deposits": [ - { - "amount": "70", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xb6da04f1ddff19acea3425120f1c1244a55291c73f2dbff9c90349bd82c727b2" - }, - { - "amount": "20", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xe3fd6d538990df7bf818b8a178ecf7135a5e34f4d07778e9d6dc637cf470e2e0" - }, - { - "amount": "15", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x07b9757e77de7a2de6e3fea89bc48801656fdcd51d9c81b92324b35aa800e0c8" - }, - { - "amount": "20", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x561607bb6a1c0c4c45fc7ac4bac7d8287015b80e624c32633ed5e06b4d0f1c3a" - }, - { - "amount": "12", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x0a36e69fa542ca075481e08073f159ea7bea4f2c73ef9b52d22d4614db19a5a0" - }, - { - "amount": "2", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x8ab01cde20c499bea4d28c208749cfc8139ac1bbae7b65f3fb77a903e2af1ace" - }, - { - "amount": "5", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x600702eb08091f59365fdf6af580b0e60c81600ae57a8fc3ad7473d67cc738dd" - }, - { - "amount": "10", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xfd7edebf2b9d7359188e31fde4d44674bfa8fc119d7f9c71e673b80dc3913899" - }, - { - "amount": "10", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xd055543cf69ebdb0d8862fd917723705853caa63e97e6dfa942419e707bff520" - }, - { - "amount": "20", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x15da44cda1d0e1d31e82e3cf7f39080b5f61eca6fa870af430c48ceb73ae3dc3" - }, - { - "amount": "10", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x99b34aa5c033c78b690dbe9262a3e621bc7643f60cafffeeafcc6a8885fabd74" - } - ], - "withdrawals": [ - { - "amount": "20", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xebb86840b89a0f2e4753dd646d342faff415ce5e2fcce0eef9918dbeb8e39c2e" - }, - { - "amount": "3.86333155832", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x068081c78445c62a22f68a81cbfd73d1c906b35c31882e5dcbd95b158485b227" - }, - { - "amount": "41.64068004762", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0x2794e03baf2be9d03ff553075bdbe9296e7975ee72647f08a42299cc05a4e3ab" - }, - { - "amount": "58.49598839406", - "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", - "tranche_id": 11, - "tx": "0xfeb269c626db43a4d16a117e47a21a148c9f911d708d97d9dfd0caf08e1c09e7" - } - ], - "total_tokens": "194", - "withdrawn_tokens": "124", - "remaining_tokens": "70" - }, - { - "address": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", - "deposits": [ - { - "amount": "35", - "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", - "tranche_id": 11, - "tx": "0x42be0e40a2d90a5c7e7b760511764f3139d44d932c5986ed3ce2053763c1f325" - }, - { - "amount": "35", - "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", - "tranche_id": 11, - "tx": "0x293d94a8ce38ba72a6b73ed1fa90225e3adb2fbd7a0ad94470956ceab4a76324" - } - ], - "withdrawals": [ - { - "amount": "70", - "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", - "tranche_id": 11, - "tx": "0x0c0606cbc64b0f7b24fe10fe388933eee170af414409506e8894b57bc7144ebf" - } - ], - "total_tokens": "70", - "withdrawn_tokens": "70", - "remaining_tokens": "0" - }, - { - "address": "0xE498BF682fC5C671cFF50916681c9B4699d67103", - "deposits": [ - { - "amount": "75", - "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", - "tranche_id": 11, - "tx": "0xc941663136f7394c2bfd067997b19ce0778074f6fb6eef20f29e72ee0f6553e1" - }, - { - "amount": "100", - "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", - "tranche_id": 11, - "tx": "0x010f056f9e1d516f062806fd263a562529deb55204f29beec2b4b7c1584ad53a" - } - ], - "withdrawals": [ - { - "amount": "75", - "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", - "tranche_id": 11, - "tx": "0xa56f48d7e5bf97c59c2a5e2c74e7cf6221f99465257207cd54cb7ecbedbddb77" - }, - { - "amount": "100", - "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", - "tranche_id": 11, - "tx": "0x9e439f405ae261569dd0fac4491b68dba12a4ad182ad0adb5d66d3187f0c399e" - } - ], - "total_tokens": "175", - "withdrawn_tokens": "175", - "remaining_tokens": "0" - }, - { - "address": "0x6F32AA5A6198329c16e438512F992a0548C856f9", - "deposits": [ - { - "amount": "25", - "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", - "tranche_id": 11, - "tx": "0xee546e7d8714dca8ce0977a9eccc87de97f3c5d5cf98063a138bbd8e03ddb719" - } - ], - "withdrawals": [], - "total_tokens": "25", - "withdrawn_tokens": "0", - "remaining_tokens": "25" - }, - { - "address": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", - "deposits": [ - { - "amount": "35", - "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", - "tranche_id": 11, - "tx": "0xf79f919504b21531ed5389dc486c7b8b62da122b224e78a3d7d8b70319398816" - }, - { - "amount": "25", - "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", - "tranche_id": 11, - "tx": "0xca6fa4334c444d7adb435c7d8ebfa1360c1e9d7118f9252a21903e8fe0fb9fa0" - }, - { - "amount": "25", - "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", - "tranche_id": 11, - "tx": "0xf22fd7f0855fc74d3a6a0b8b7dec1f2b467dd83bcbd6f37fb1648d0f49a8fbe4" - } - ], - "withdrawals": [ - { - "amount": "85", - "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", - "tranche_id": 11, - "tx": "0xb4b7bb22478f195c078c3000167144b638be7a611e306c69b287cb51c5a550f1" - } - ], - "total_tokens": "85", - "withdrawn_tokens": "85", - "remaining_tokens": "0" - }, - { - "address": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "deposits": [ - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x713ebb8efbbd9a2d373c18c25745296cb5e474c0b7ccca823af251f1608a1789" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0xc23fbe7994b46a5e4ef7556c23646d454a190212999db8886ae5915c6de2a781" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x8fbd66c0003f32619fb3a25359e1bacb537c7402bbccc1e6d068a40ab94d58c3" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0xf260a71cfef36130dd43e8e9359aacf054fdba26a32b8765b53b5cdc985b507c" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0xda76b73ad8ab4a4d0e1cbeb5e5cdb84599e3d4117cd079169aceaa6b64d33af5" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x52382f52e4bf7016fae9b163449d1538238c7370093bcbeaa1a5daf03dfdb765" - }, - { - "amount": "25", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x5be9e640d8a00401c4adb0f440928a6fefe9d51760095204f67d3f15e4c85e30" - } - ], - "withdrawals": [ - { - "amount": "50", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x5467038c03fbe60c161c255f8987fa74a346de7f7cb9f471461cae9442f30f97" - }, - { - "amount": "75", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0x9bc9be1400e05d85c64204eeab2851911a31083a9177c9afcabb6a28afc55853" - }, - { - "amount": "50", - "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", - "tranche_id": 11, - "tx": "0xc7c91eb072cd0e5956e9ef2eb3bac3ec20445bd88c782565ea475d98a4b14d56" - } - ], - "total_tokens": "175", - "withdrawn_tokens": "175", - "remaining_tokens": "0" - }, - { - "address": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", - "deposits": [ - { - "amount": "40", - "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", - "tranche_id": 11, - "tx": "0x7718c44a73aef7afc48f9119d5877904858fdc8031ffdd57106be3fb065d5f5e" - }, - { - "amount": "25", - "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", - "tranche_id": 11, - "tx": "0x2f9c4aa98d23a57e59cb7854f02fe097f56a9e9dcd63404d2d9c3da694f81587" - } - ], - "withdrawals": [ - { - "amount": "65", - "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", - "tranche_id": 11, - "tx": "0xa487588c3de563a97f90f92546a4b3f579b195d11f3c1cb16c0de982bdde9319" - } - ], - "total_tokens": "65", - "withdrawn_tokens": "65", - "remaining_tokens": "0" - }, - { - "address": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", - "deposits": [ - { - "amount": "12", - "user": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", - "tranche_id": 11, - "tx": "0x508cebb1f9324172b9544715dbb8ca25faf379211bb62d18618271565902cc02" - } - ], - "withdrawals": [ - { - "amount": "12", - "user": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", - "tranche_id": 11, - "tx": "0x05043974c49f07b2b082e83c437c2081a828616413c06d457c3019eef874e2e9" - } - ], - "total_tokens": "12", - "withdrawn_tokens": "12", - "remaining_tokens": "0" - }, - { - "address": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "deposits": [ - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xc7947ff4d79f1b09a89b8e70d42af42adb2ead52c92494f8a1c7bde0f2f77645" - }, - { - "amount": "50", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x04f0af4557ef852e5132a139f9f9c45315c86cfab2b9147cb279f6a4fb120146" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xd2fc5b073a66634f75d80de216d4ee83de510a767e44d2a74bce25f66caf3890" - }, - { - "amount": "50", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x24addf02f8ce6aa54a601359d7400e0c4f99aae8fbca961ccc7f5c155984da37" - }, - { - "amount": "46", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x69b7fedbd011b574f6541eae53a4d39212f72a5c9707e244f2b56b14bda40663" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xb3fc83a99518e3d17281c6a2f26eb9ce68e21b3a97796e6cfb6601355a58e6d1" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x0c10322e4ac684a17359fe5bff7acb6ad6ac90b0b35fd31068d6254e298f6d06" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x13e769680c99022af2fe734eda617c638b8bfb6035ca027eba47f20cb4a07a49" - }, - { - "amount": "15", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x8b933a7aaa3b1ea891c4392ec290df935e0ebcd433713df4c07d8583a123b125" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x0e722eedc0d2c4cca2b38bbe54b914f0833ed77db8e068b4e0580fcc63d05fcf" - }, - { - "amount": "15", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xcfe1c973d4d73770bff8defed041187f405bfdd24835bd08294be8065deed3d5" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x3a437dda1289198f485de1dce66eda37aaec0d4d2f157a2e8e155962616f9056" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xd5cc8fd70dcd8ef2e902032c17b0284387a4032f1ecda509d8da1a87faa430de" - }, - { - "amount": "26", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xa61b2f4a7962db3e1b3bd008949a45fca273d919236582fac2837fe9338bf09d" - }, - { - "amount": "15", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x3d5e00f458e04b8869a5a800948b27a681babcc008fad092b0cea92bd77ce4d4" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x4aa20102d2e76f332a83555ee29892be1972fd41a6a647c5dafd0aed9ac08da2" - }, - { - "amount": "15", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x5c94d762403f8c1af0513f22578e4839d191f72230a4bc5e88292294056dc7b1" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x470364c533cc37371644ceec17d2ecb8efc123ae2a48a67538f1e7a551d87507" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x005a58c1e9c52919d16b4033924a1d20c8ece3ea8b4ef31c18dc22063b6f0e37" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xe84e0f602076c3cbbe1fce4a807cd77b7edc0a5402a60a632fa7210fcf45e519" - }, - { - "amount": "65", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xdea46047ed750a8a035be101bb66dc68e57f08b4c7d674a3e7c5fa72aa186b2b" - }, - { - "amount": "120", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x08bbc1418fc1a08ff06ec298c205eb40496e98f9c63636dd750d00c36d4c4852" - }, - { - "amount": "10", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x502c6357954fe005d8d26aeb91cc519e2d23b233aeb90a9fe180bfd8087a630c" - }, - { - "amount": "15", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x699de41fd489c72412a07eac668a95e676433a8a483e4c94340d9f5ea4e5883a" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xfd7e7aad721f06dc963d1e91401e33051c42740740419c2d89ec4b005d4426af" - }, - { - "amount": "26", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x8c0f6f0f3362beecd8ffac3df842e61dbb8634c088871c819473ce7c1f61638f" - }, - { - "amount": "20", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x0b1e9eac4f1ad30ec826525769115b4200f0d67a11039eacc7dec254cae4e6ae" - }, - { - "amount": "40", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x6fec302369b6cc50b5fdd03f14a8ca5f8dc86d30b6f6695916c442d822c64464" - }, - { - "amount": "100", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x51f3812a13b40b8da14240c9e1467b5193302cb45fd99524330c46b561526918" - }, - { - "amount": "30", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x1196cc3f61afe969673421c6a00edaf82b48dda42986b98a4edfdb737a7fc18d" - }, - { - "amount": "25", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0xaa794c4025996e859a907009a44d39eb46f1485042ace3e6f0353f2ab397471a" - }, - { - "amount": "10", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x2cc9394dd362b6834b700c6b5c43dd61e6c07aa6f7e0d5c3e3f3a0b5ca54b01d" - } - ], - "withdrawals": [ - { - "amount": "502", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x19ad0e7dc04098b62f272ea54469979a645df1601ba2fa87bd559a11f2e3ca9e" - }, - { - "amount": "481", - "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", - "tranche_id": 11, - "tx": "0x536705dd5d8f7944cd5e3414dbd374bef0d96ba8209ba93c9c19da6a0d4d4a9a" - } - ], - "total_tokens": "1013", - "withdrawn_tokens": "983", - "remaining_tokens": "30" - }, - { - "address": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "deposits": [ - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xc9c9139b8030655aaa74ffd50e310cee570064e1a7a842dcdd1841a7dfac8772" - }, - { - "amount": "40", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x3700d4f9b1b67afde4969a28ce120ecfc63a5570fb05329fc0557272413cfa6f" - }, - { - "amount": "50", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x506b01fcf4d7cc170187ff2f6058f1539e479c062459fc1dcfca0c9c5da28b55" - }, - { - "amount": "60", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x1610a45e4e6cf254dd2344a4f03b81ee4be04e3b4c46b9f1fa5460a500b86c5f" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x973127e641cf01314a44e7560be0b54b1b139bad731e1379358e169f31b606e0" - }, - { - "amount": "100", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x03ebb823c4a3aa2794b9f9dae9b9fb75e19f518cb8fbd1c245fd07144c2a2760" - }, - { - "amount": "46", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xd5bf21ff59df324ce1fadc9acd3edf649904a0be184e91994b6f59255a98170f" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x38ac7e75b875453765de7759023d75161f210354cdb09932a60d8e16277e1d92" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x676bbb8223541f0527e33572dac4641a527d4719e7958bca495950c4ddc25dab" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x8beb66b4f217717342943d8e4ec6f896a5ac4f092f948e3b2dabeaea6269814e" - }, - { - "amount": "40", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xee0d751370f536531a291006f02fa2e9ef656bf4748a3debb52ebf0b1df3f489" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xbe672f18fb03e9f4c0c18e0bb217d0a0c59cfc743ff6cf5d645411cbfc211678" - }, - { - "amount": "26", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x5a254f32930e30d41ac65d8167f68c0f4466b57e3252a9b55507325cdb73260a" - }, - { - "amount": "15", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x72ab24c6b99f55ed26bfe4566a75ae246da44fa9d7f5ef808d9e9b1ff4a91522" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x8b31ef11c3a128fe012330769a26fe225186f7ea96213917a57dfdf6fb9a2070" - }, - { - "amount": "25", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x4ec995a1b1fd81a3b85305d082c2a2f2473a4a66f325d39210975625feee7d50" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x12964fc224054102b56943d319965724026aede86a5fc4720d7746dbaa9bb186" - }, - { - "amount": "55", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x137ae3c2675dde6f8e8f1f836fe70d6eefd6960800f54a2c4a3df9580e867c70" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xa165f6e5d6c13d3fbac05f12b3bd17bef57fca586672f2ca1eae5d8be5b8c8e6" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x44825392d5daa5e24f6549e519f1bac6f56faefdb591493248b4e5ef503a467c" - }, - { - "amount": "26", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x43cb6b735392c7c56efcdbde02ebf7a3d751f4258308a04f5fbf14764ef8fcc4" - }, - { - "amount": "50", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x503bfbc98c6ad751a3a7228ee3da97493b1991c3e5cc3f4a1509203bf9721686" - }, - { - "amount": "40", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x03767d9e7f75b3d7521ac9dbd4f0951aaeffbeaa394fdd82b94661e7876b6167" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xd01f9139e0d2160aa6700d0f0139a2b9cb80da6732d8b6001e5483ccd3bf022e" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x30c2e10886740d032f24791efefbd80b987f18e26eecf24a5ff64dfa1e400303" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x0bf1a6167925139834677da2ff27a5063b8a8c5b6eeac7410f9f29ccb32c382b" - }, - { - "amount": "10", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x94be2ebaa3fecf7deb6129116cd0f9a9f99d67a9391c57c02880b5faf5f9832b" - }, - { - "amount": "26", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x6931ce4ed6dc92ef54f9cc8bd8c4d4f4227d4731c69c40106a413e59dc3bc768" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xe87c6f2bcbe62dea3480cdf272d83fc21be020a56bb18a5e4aaf4e6b6be5640b" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x7c8127ee5e6180ef4b7ed14908065ab78b638d6b5f562cbd0b486af315cb404c" - }, - { - "amount": "20", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xc1764193e20737e8e8745cf18fe0a05298114157a24b5746106defc302b82aa3" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x222f42f4bc2f22cace85ffee472c515055dccc2e764dcd9ee6fc04fe7264aa4e" - }, - { - "amount": "26", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x3d0e53470a98eb33900cfe1ebc82260ee57e2a7a317766f779e5834b551b000c" - }, - { - "amount": "40", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x7ec76919be1a4b071aca253e90c057b867cbc945d9720e767c5137b89441b100" - }, - { - "amount": "30", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xe41284040c10157104bfb27000f56fe5b74cb398b31e04687bc2cb68200c7913" - }, - { - "amount": "15", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xbb621efba31c5e2b2c04c686cc6fdd73360674c528554743f803b8e44f39b84c" - } - ], - "withdrawals": [ - { - "amount": "296", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0xc0fbcdeac8ee69ea6a6be21a7c2865efcc37d5c70d82fc14898aae3651ca3eb7" - }, - { - "amount": "553", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x51a814adf98b7375e0ecd5e61a7f30273906b180b36d335ce0bf4a3dfcfd346e" - }, - { - "amount": "161", - "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", - "tranche_id": 11, - "tx": "0x4258ab72ce3514ad258afd42861a59ba5b1242684b2313ab4a57b3ae4737ab04" - } - ], - "total_tokens": "1120", - "withdrawn_tokens": "1010", - "remaining_tokens": "110" - }, - { - "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "deposits": [ - { - "amount": "50", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x8134229e16d6bb0540f596b7c23dde5bda09ad0c3c8853f5fd4df939b708b691" - }, - { - "amount": "26", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xf6880b495f4eaaaac264f513101dc1372f8d07397539ba1606561e4516187627" - }, - { - "amount": "30", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x97453e02bd907329d1c3483d23ff54d84c3dd34e65a5a795494e3b287e3af6d3" - }, - { - "amount": "20", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xaf7a554c2b5b6690bf6798f31973ed34b351dd3d9c81335301d681c259c3f057" - }, - { - "amount": "10", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xdb1da0991e2a5a044fa1b6e146358e73cf4628762f6f66e01469e3a46d32860b" - }, - { - "amount": "20", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xd355ef37d32d1c619fcaeccb5d66bfaaecf0e8443f6c9b6b47716e63d31ae27e" - }, - { - "amount": "20", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x2db47f31526593c9c215db918aee1dccb6e1fcbd56fdef5e41f46fcbb0a34c18" - }, - { - "amount": "10", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x6d027468ba87f7347a7f8bc69613a60e3c204a5dffeffdc8479456c0d0a32f31" - }, - { - "amount": "25", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x2f485648f47a24fff0503cada896eca6fee655ca855a93388847ad16a1e71571" - }, - { - "amount": "15", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x9f8576c559ffa9bc1082c100250e6d3a967b110e34b944240588d69298f5c691" - }, - { - "amount": "35", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xf4ced12b2414971d95166c74a7872ec1001ca11981b1df172d940c1131b07941" - }, - { - "amount": "60", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x2c49ec4fdc788960134ee975435dcab673096c167707c0d2f79b4c458e51245c" - }, - { - "amount": "60", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x8b4466d7afd3f36075306d3e4989a74d05bd6af042f0c4e5af9cfd6a5c0ec218" - }, - { - "amount": "100", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xe42b39b0ea87c6c5b36b5828a68f39d929f7d5a67061a291c1d4b35ad4cc6770" - }, - { - "amount": "30", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x913bbc51a588b59b360693e76ff58afb13772944ae97a591bff5d89c2aad3583" - }, - { - "amount": "50", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xa47a83976d0c90976ccb0e27a81e0995c823b39090eab8493685ac1cd2f910cc" - }, - { - "amount": "30", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x555e57b4a7304ad39635c17cee00fe5262e3bc371cb02e289d09275486925109" - }, - { - "amount": "150", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x8871a3e3d762039a37482d2dc91f118345808dd099edc8248186d7532193f44d" - }, - { - "amount": "20", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x7b6bb53d2a3360e3e97e393d43f6b595a15586f02ab30cfb9d1277e351d4c0dd" - }, - { - "amount": "15", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xad0d2fe5f21c7f5483a2a3aac4c694d19e85067df52ab803abb73606c3231354" - }, - { - "amount": "20", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x2368becf6a676e7a6a866d621fc7d6f321b70463f1d7fd00e2f88802d3c8807c" - } - ], - "withdrawals": [ - { - "amount": "226", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0xa7649e2ff32d75b81dfff739fe3fd84cde827a3121c8d393f97b1078ee028afd" - }, - { - "amount": "570", - "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", - "tranche_id": 11, - "tx": "0x818a1a6d0d22a088d468459803255b5f698843f7a89829991e2dc7920d8e8be6" - } - ], - "total_tokens": "796", - "withdrawn_tokens": "796", - "remaining_tokens": "0" - }, - { - "address": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "deposits": [ - { - "amount": "50", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x4f2d5ffff22744dd8bca0cd18653e49d05a921e3b37e0ea8e5e8013338044674" - }, - { - "amount": "50", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x64870b69035b9bbc763e488bbcfafe74d7dc9b382a52e574986d99e6057695fd" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xcc656bde93dc97848442b988966a72e9fb4a27236b999e43aa67ea71a205293a" - }, - { - "amount": "60", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x27088669b9ebcfbf0299f571cf839701b8fa0feb48493c375091ca731475411a" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x65dfad0fb2e1bae848cd90e03a9ea591b3f64e1419d6c56c3c3eca312fae9d60" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x652d4da270a1a5aab43538972a1a9f4922a09791201dac8c9a38386befda71ae" - }, - { - "amount": "10", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x6d2b8e1ece252bb50488134e9ded53f8f56aa797bb5b04a01253adaa808f1613" - }, - { - "amount": "15", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x90a80f78b6be0adaf9c8bdf1ab93b89841e1af1680e93af703a833ad3e488c3e" - }, - { - "amount": "15", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x942b78eab6683f71047e50bd3670399355538ca165c80441a901c200844c2f8d" - }, - { - "amount": "25", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xcb1bd76690836eaff41d027f34263a0aaef9f2e6a0dc02cf07a5dae9a2dcd409" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xf8d79b7f4b99f5f924ec3747514ab1dc76123b9207cf8966a556b3ca99ac46d7" - }, - { - "amount": "30", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x60863c700b947135d53d80d6c76dda6cf9fc6d459040e0cad43bf8bcb14ebae0" - }, - { - "amount": "30", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xca81df945a705678e81d5acf6ff9da732986c394cb25afca898748a5f10f8b3b" - }, - { - "amount": "15", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x2b1077878eb68fdc4254054f2306e04dc35e8e6bb34bcc820a9e62a98078291e" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xe381861fceca568dd5569246ca2d2a2d9e16af374434dc415d8be66574c44eb5" - }, - { - "amount": "20", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x3e7ccd74a5bece44dad8da2b408d3244312aa6f57ce76cf7ca3097ab637863da" - }, - { - "amount": "250", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xec131ba46616cd98500b4c781e0662938873cf861619a56f7f8deefe8f06c8b2" - }, - { - "amount": "35", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x1ba208cb36de855530b983d90ca432cb08ce9f0de2acb4c39ea3c5aa97191020" - } - ], - "withdrawals": [ - { - "amount": "260", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xfcfdc83be424a1379e7735e25f83f7fc9bc69a89607b71f0d6f79f84b18c30e8" - }, - { - "amount": "233.1966562025", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0xd72bc34666f08014c60a07fb1ea4fdeb10bf80668132e8b98248d91a613e6773" - }, - { - "amount": "211.8033437975", - "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", - "tranche_id": 11, - "tx": "0x31901f42c25fbd4ee746b0a16cfad2461a361ec7b8367d28560cfd6d767c6d05" - } - ], - "total_tokens": "705", - "withdrawn_tokens": "705", - "remaining_tokens": "0" - }, { "address": "0xaaaaFd67947Ef241D8C24C863893800083855Ed6", "deposits": [ + { + "amount": "15", + "user": "0xaaaaFd67947Ef241D8C24C863893800083855Ed6", + "tranche_id": 11, + "tx": "0x178b5743e692cabd8505900c3f8acd14b19b4cd2833ba5ce412aa9c0ec5c5d4f" + }, { "amount": "20", "user": "0xaaaaFd67947Ef241D8C24C863893800083855Ed6", @@ -23788,8 +22782,1525 @@ "tx": "0x26f83e1b57a646b5266f07b00f13f47d3983978d96e921349b24a8b2df0fbc3d" } ], - "total_tokens": "3645", + "total_tokens": "3660", "withdrawn_tokens": "3645", + "remaining_tokens": "15" + }, + { + "address": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "deposits": [ + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x4626eeaef56092f667bfc9c1ff248d99f67d58c3e3181bb60df141716dea9cd0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x4500c382084b6748ead7c42dd76aff526b89bef432ff4d34756786699b99e63e" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x87a76f0dbd2512d8230715cf19515a0332ec5b64e99d84bbecf19b72c9a1e0dd" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x799d6285e5e71d387da65d4176cbcf8c3713d3e0fb2bde0baae9bdd72dcfa62b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x81389f4d3fa0fcc953fcb52f5a525b91b276a50e68eb8aebeadc91da97a81fd2" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x8243470e6825a8c6f06dc88e21b995c3385e9d9aa213442cccde58894f01c71f" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xa8d35b50c0ed2ed6f6335d80f3f1f09c03bef66ad85925260f966826e65fce6a" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xeb9749d38b43dafae2b6a2c32452a1c1cee9f4c11f08563f30a141b78c026e68" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xedc7fffff8a8a41c57b2df83f2093d354fcc2c605b22168f6b6b8036f7ed5847" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xc6441e2b917ae485319d3e0887599a2436aa592d10380bcb25ad62d11b4ced55" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x54f3f64a9683231ff4d35298bdca050de078de95676c434496bc1cdc93d63a52" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xc0cfab61a9f0623cd764818233c0da0b4d41652f0fd8c791758e31898df5376b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x5dd75cdc698aa6f6b846e16bae645f3dd5d8a0fd18ff5e6ccfc9d44365ca17d0" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xdcbf2a952240450b54c5745db9a3bfdc5089ce1846f9664b371c17a3a62062ef" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x537839ad72c3cba4ca93ede1cf6361a4622aa5683914103fa32dc82c82457971" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x16b4461d9c727f3238bb846506b8758441a866afa5abb85f3777cd28ef4f5230" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xb0a0a9f1c9378dd7d7be224451678719000362139ef3e510a946563194224e60" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x30fd30b3b342aab9ceab0ea1ed2e30fcce04c35c3207f2d9fcf4041f522301b3" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x84c451d2a9c70a635b9edc1f1317de9ee1cb50233292cf9aab3e932c38763d97" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x56d5d4c663d66febdb438fe37c5e2d2b73c22e2e67cc8d0be8fad24d110efff6" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x1090b0020c80af215b3d2cf99aa438395f66c075f085c25ec268abd89af90324" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xf5dff2257044c59c9fc58d94733b7b0a1f074c9938d19a9ae58098a4061ef8f5" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x99183d244d03a354193c4977e526ae955920374eb049bfa5e84f18792ddb5a4d" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x1688a0f2b8ea93a512950e40a1c363b62a93df37974c62296956d4692a3eee3d" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xce821ee743667af65bdf28168344f569a998c55742adbcfbdbc473ffaffd1de0" + }, + { + "amount": "15", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xb96a9b0ce949cda20f8d2b1a9a4fcebdb73bab7d083867bd5c982c93d6a96b2b" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x1b15ad50c424258f2ba258b6a26ec59f97e9a8b1bc5808373209243fc7458385" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x71c559a8236898d94e5da4d7516b1eac3a4cb42a6c2a1f8734888e119fb1ac2a" + }, + { + "amount": "50", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x0f52a50d0ccd7873524598ad4b1a0fbb45fcf13b5339966cd908775e87a82ea3" + }, + { + "amount": "60", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x02b608830593d41a261bf47cca7898262c440d922e11223d470587cda1329537" + }, + { + "amount": "50", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x6e4e585537ed5bfb59bf42c3f0dc5d61e7323ac5b429eea0da3a163545e5c295" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x900dc8d64db5815539a3a3b249934734ae1ecc0804165dd42187ddf57d9556fe" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xd18122ac07c1fb8ba81692e93de1af7f7e1eb9369d5d146eb50e3427818df03d" + }, + { + "amount": "40", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x0124fdc80fed9085d6a17bcc6bc73cc49b650ba004695c244d7b87fa364adb26" + }, + { + "amount": "70", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xe8abc2e77b795dd7e1778f736d585cd6e947fc40025f768cfe6a5030cdd43e6e" + }, + { + "amount": "50", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xf208d0201508456a70945e7699b6545aee9e850cc81b293428d77c68e6496c2a" + }, + { + "amount": "60", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x677f361dac2fa32dedf3d834a61b1da635617a55d1141b8e51348e326664a9e9" + }, + { + "amount": "40", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x3488b96bf3afe013c72b834fa6a6b55e14a2d4a7a2b282c612373f2eafdfbbff" + }, + { + "amount": "30", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x804e8ccdc1e324ba09cb868be1130c7ed8f2dc8a3cadd1723ac203bd37487431" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0xf401af6e3aa2898c52bd65044228494fe3157d9c9c1aae115aae8ac379239224" + }, + { + "amount": "40", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x388703694c5f06e07c8f6e799a139bc4debdcdb5c34e3a8a5897676a2ec19298" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x01c7c74cce6a6f67fd54be275445a0b92df56cfbe9845dc88c7898609f7549d9" + }, + { + "amount": "20", + "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", + "tranche_id": 11, + "tx": "0x62b105e7c569b195b3a3625869c62e4cd307fbda5b0c1e5931a857e376ef6c09" + } + ], + "withdrawals": [], + "total_tokens": "1210", + "withdrawn_tokens": "0", + "remaining_tokens": "1210" + }, + { + "address": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "deposits": [ + { + "amount": "25", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x8f583c2aa71bc323b81be9f63848379c4d7843a5282720f507d8ac2134f1f2d6" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x8e24b29e8ab42e536d66baff5097d7efbf6179bd191def0a75e9fbd663582050" + }, + { + "amount": "70", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xb6da04f1ddff19acea3425120f1c1244a55291c73f2dbff9c90349bd82c727b2" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xe3fd6d538990df7bf818b8a178ecf7135a5e34f4d07778e9d6dc637cf470e2e0" + }, + { + "amount": "15", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x07b9757e77de7a2de6e3fea89bc48801656fdcd51d9c81b92324b35aa800e0c8" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x561607bb6a1c0c4c45fc7ac4bac7d8287015b80e624c32633ed5e06b4d0f1c3a" + }, + { + "amount": "12", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x0a36e69fa542ca075481e08073f159ea7bea4f2c73ef9b52d22d4614db19a5a0" + }, + { + "amount": "2", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x8ab01cde20c499bea4d28c208749cfc8139ac1bbae7b65f3fb77a903e2af1ace" + }, + { + "amount": "5", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x600702eb08091f59365fdf6af580b0e60c81600ae57a8fc3ad7473d67cc738dd" + }, + { + "amount": "10", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xfd7edebf2b9d7359188e31fde4d44674bfa8fc119d7f9c71e673b80dc3913899" + }, + { + "amount": "10", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xd055543cf69ebdb0d8862fd917723705853caa63e97e6dfa942419e707bff520" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x15da44cda1d0e1d31e82e3cf7f39080b5f61eca6fa870af430c48ceb73ae3dc3" + }, + { + "amount": "10", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x99b34aa5c033c78b690dbe9262a3e621bc7643f60cafffeeafcc6a8885fabd74" + } + ], + "withdrawals": [ + { + "amount": "115", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xc1d1e0a03a5ace0a8c61f58c81a407867a2d3195d2249df11d2eb630949d4ea2" + }, + { + "amount": "20", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xebb86840b89a0f2e4753dd646d342faff415ce5e2fcce0eef9918dbeb8e39c2e" + }, + { + "amount": "3.86333155832", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x068081c78445c62a22f68a81cbfd73d1c906b35c31882e5dcbd95b158485b227" + }, + { + "amount": "41.64068004762", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0x2794e03baf2be9d03ff553075bdbe9296e7975ee72647f08a42299cc05a4e3ab" + }, + { + "amount": "58.49598839406", + "user": "0xC6D7208DaDEe4F431bd0f3f11E7d4c91fF51bfb2", + "tranche_id": 11, + "tx": "0xfeb269c626db43a4d16a117e47a21a148c9f911d708d97d9dfd0caf08e1c09e7" + } + ], + "total_tokens": "239", + "withdrawn_tokens": "239", + "remaining_tokens": "0" + }, + { + "address": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", + "deposits": [ + { + "amount": "15", + "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", + "tranche_id": 11, + "tx": "0x842269dc960af54f5f20e903f8cc2dae77d68b6c051b238a1467fa93e0ec34c3" + }, + { + "amount": "30", + "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", + "tranche_id": 11, + "tx": "0x407d9a64209bd8f656d969ee2dde00c24347cbdb9c3f53d9026278390c80e325" + } + ], + "withdrawals": [ + { + "amount": "45", + "user": "0x4043fD11285B4f98A0f7b383D973a17F03e23EC5", + "tranche_id": 11, + "tx": "0xa3689042534a1b09c39510c3a9da4f5838c77e88df0dd7dd76415b759d9ad377" + } + ], + "total_tokens": "45", + "withdrawn_tokens": "45", + "remaining_tokens": "0" + }, + { + "address": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "deposits": [ + { + "amount": "80", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xde7e3f48359ad1473d4b6f05582e2bee121458b1103687037fca29ab95c9f50a" + }, + { + "amount": "20", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xfeb720f64f2951e185db6e872e022575d3fd8477f85b2698890f70d8820fd596" + }, + { + "amount": "15", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x8d55eb2b5f4091eaa0dee96242f8eb6bac12312415c202007695da4b9df96ac6" + }, + { + "amount": "15", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xf7e1cb4b03d0f7664b4d7688029ed8ad4c468bf4b2e6ef941c59de4dce680496" + }, + { + "amount": "25", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x3a6f6a47608e017b8d8a1495821514beed5fbb265176665aba6213987a4e0bde" + }, + { + "amount": "20", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x1656fec2cd5d9bf5aeb907e64b222843e13ac0921f4dc9451e6db7d02611c742" + }, + { + "amount": "30", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x20652e7dddc270c76be42c7496a968f5a0831dae46c12d1866c8b720c1070cb4" + }, + { + "amount": "60", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x89b232cab8db6ae361d824c55ec20b0e59c0bc14fadb71d902bba3a801338258" + }, + { + "amount": "15", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x5032a6328b99e190e893bd7feca96d465fca1996939c71fda986bdddc89897d8" + }, + { + "amount": "20", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x9217321eb5e9b64157da6b8ab97a1ce927e64671095da3086be0edd7cd0ef709" + }, + { + "amount": "200", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xf88b8ed5ce899f00f466830936599112ea678a4e5911801fb3e445c22eb0295f" + }, + { + "amount": "100", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x0c0ea0139cc752d22c0f8a6b3ffa5c4bcdca1c5604089ebd0f34898f1049db61" + }, + { + "amount": "90", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x29371816157718f7d5136d0ed8a0f1e09045ee3cfcd67199d45e3f4157f7e011" + }, + { + "amount": "35", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x6a081b2c5dfa2d5c916a598569519605322721c5511d26cf4aed8e08e49cf700" + }, + { + "amount": "30", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xc37be614ef14bbbedc808ffc7651fbb7a3c04e4d1612f00f19299da7916003e6" + } + ], + "withdrawals": [ + { + "amount": "130", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0xc39eefed84fded9118b3e8a84f7fdb79789725ce078421c07e4b9f0b14bb78f2" + }, + { + "amount": "58.26122352505", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x249318d3c808f6ec92369ae9008fb479b35a0791fab00cc9d1a1b88a2fdd4ce8" + }, + { + "amount": "170", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x7e67e8f61e2da7b26a4b08053f9ec3f63fa03c7d1c1907b440fc1d63317370b7" + }, + { + "amount": "396.73877647495", + "user": "0x94097462EF7c43D0aC732E7B18f830096D95207C", + "tranche_id": 11, + "tx": "0x01702228af643636ceb22064a23b1b22b66a992f3ec9be8f6d1788e6a996312b" + } + ], + "total_tokens": "755", + "withdrawn_tokens": "755", + "remaining_tokens": "0" + }, + { + "address": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "deposits": [ + { + "amount": "35", + "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "tranche_id": 11, + "tx": "0x42be0e40a2d90a5c7e7b760511764f3139d44d932c5986ed3ce2053763c1f325" + }, + { + "amount": "35", + "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "tranche_id": 11, + "tx": "0x293d94a8ce38ba72a6b73ed1fa90225e3adb2fbd7a0ad94470956ceab4a76324" + } + ], + "withdrawals": [ + { + "amount": "70", + "user": "0x697cEF6741F519621fE14c72041e4B8B1f7e2c8A", + "tranche_id": 11, + "tx": "0x0c0606cbc64b0f7b24fe10fe388933eee170af414409506e8894b57bc7144ebf" + } + ], + "total_tokens": "70", + "withdrawn_tokens": "70", + "remaining_tokens": "0" + }, + { + "address": "0xE498BF682fC5C671cFF50916681c9B4699d67103", + "deposits": [ + { + "amount": "75", + "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", + "tranche_id": 11, + "tx": "0xc941663136f7394c2bfd067997b19ce0778074f6fb6eef20f29e72ee0f6553e1" + }, + { + "amount": "100", + "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", + "tranche_id": 11, + "tx": "0x010f056f9e1d516f062806fd263a562529deb55204f29beec2b4b7c1584ad53a" + } + ], + "withdrawals": [ + { + "amount": "75", + "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", + "tranche_id": 11, + "tx": "0xa56f48d7e5bf97c59c2a5e2c74e7cf6221f99465257207cd54cb7ecbedbddb77" + }, + { + "amount": "100", + "user": "0xE498BF682fC5C671cFF50916681c9B4699d67103", + "tranche_id": 11, + "tx": "0x9e439f405ae261569dd0fac4491b68dba12a4ad182ad0adb5d66d3187f0c399e" + } + ], + "total_tokens": "175", + "withdrawn_tokens": "175", + "remaining_tokens": "0" + }, + { + "address": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "deposits": [ + { + "amount": "25", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tranche_id": 11, + "tx": "0xee546e7d8714dca8ce0977a9eccc87de97f3c5d5cf98063a138bbd8e03ddb719" + } + ], + "withdrawals": [ + { + "amount": "25", + "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9", + "tranche_id": 11, + "tx": "0xfb20dd94f31f9d09d623176bfe0915b054ded0ba4b1bcd6734364a0a2a5bd324" + } + ], + "total_tokens": "25", + "withdrawn_tokens": "25", + "remaining_tokens": "0" + }, + { + "address": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", + "deposits": [ + { + "amount": "35", + "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", + "tranche_id": 11, + "tx": "0xf79f919504b21531ed5389dc486c7b8b62da122b224e78a3d7d8b70319398816" + }, + { + "amount": "25", + "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", + "tranche_id": 11, + "tx": "0xca6fa4334c444d7adb435c7d8ebfa1360c1e9d7118f9252a21903e8fe0fb9fa0" + }, + { + "amount": "25", + "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", + "tranche_id": 11, + "tx": "0xf22fd7f0855fc74d3a6a0b8b7dec1f2b467dd83bcbd6f37fb1648d0f49a8fbe4" + } + ], + "withdrawals": [ + { + "amount": "85", + "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B", + "tranche_id": 11, + "tx": "0xb4b7bb22478f195c078c3000167144b638be7a611e306c69b287cb51c5a550f1" + } + ], + "total_tokens": "85", + "withdrawn_tokens": "85", + "remaining_tokens": "0" + }, + { + "address": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "deposits": [ + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x713ebb8efbbd9a2d373c18c25745296cb5e474c0b7ccca823af251f1608a1789" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0xc23fbe7994b46a5e4ef7556c23646d454a190212999db8886ae5915c6de2a781" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x8fbd66c0003f32619fb3a25359e1bacb537c7402bbccc1e6d068a40ab94d58c3" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0xf260a71cfef36130dd43e8e9359aacf054fdba26a32b8765b53b5cdc985b507c" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0xda76b73ad8ab4a4d0e1cbeb5e5cdb84599e3d4117cd079169aceaa6b64d33af5" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x52382f52e4bf7016fae9b163449d1538238c7370093bcbeaa1a5daf03dfdb765" + }, + { + "amount": "25", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x5be9e640d8a00401c4adb0f440928a6fefe9d51760095204f67d3f15e4c85e30" + } + ], + "withdrawals": [ + { + "amount": "50", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x5467038c03fbe60c161c255f8987fa74a346de7f7cb9f471461cae9442f30f97" + }, + { + "amount": "75", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0x9bc9be1400e05d85c64204eeab2851911a31083a9177c9afcabb6a28afc55853" + }, + { + "amount": "50", + "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc", + "tranche_id": 11, + "tx": "0xc7c91eb072cd0e5956e9ef2eb3bac3ec20445bd88c782565ea475d98a4b14d56" + } + ], + "total_tokens": "175", + "withdrawn_tokens": "175", + "remaining_tokens": "0" + }, + { + "address": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", + "deposits": [ + { + "amount": "40", + "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", + "tranche_id": 11, + "tx": "0x7718c44a73aef7afc48f9119d5877904858fdc8031ffdd57106be3fb065d5f5e" + }, + { + "amount": "25", + "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", + "tranche_id": 11, + "tx": "0x2f9c4aa98d23a57e59cb7854f02fe097f56a9e9dcd63404d2d9c3da694f81587" + } + ], + "withdrawals": [ + { + "amount": "65", + "user": "0xAf836191C83A8051358BF1e84ea017549CD2FCaF", + "tranche_id": 11, + "tx": "0xa487588c3de563a97f90f92546a4b3f579b195d11f3c1cb16c0de982bdde9319" + } + ], + "total_tokens": "65", + "withdrawn_tokens": "65", + "remaining_tokens": "0" + }, + { + "address": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", + "deposits": [ + { + "amount": "12", + "user": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", + "tranche_id": 11, + "tx": "0x508cebb1f9324172b9544715dbb8ca25faf379211bb62d18618271565902cc02" + } + ], + "withdrawals": [ + { + "amount": "12", + "user": "0xE371da53E59B2798Ecd81D12BEDFEA95d01dc0Fc", + "tranche_id": 11, + "tx": "0x05043974c49f07b2b082e83c437c2081a828616413c06d457c3019eef874e2e9" + } + ], + "total_tokens": "12", + "withdrawn_tokens": "12", + "remaining_tokens": "0" + }, + { + "address": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "deposits": [ + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xc7947ff4d79f1b09a89b8e70d42af42adb2ead52c92494f8a1c7bde0f2f77645" + }, + { + "amount": "50", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x04f0af4557ef852e5132a139f9f9c45315c86cfab2b9147cb279f6a4fb120146" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xd2fc5b073a66634f75d80de216d4ee83de510a767e44d2a74bce25f66caf3890" + }, + { + "amount": "50", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x24addf02f8ce6aa54a601359d7400e0c4f99aae8fbca961ccc7f5c155984da37" + }, + { + "amount": "46", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x69b7fedbd011b574f6541eae53a4d39212f72a5c9707e244f2b56b14bda40663" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xb3fc83a99518e3d17281c6a2f26eb9ce68e21b3a97796e6cfb6601355a58e6d1" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x0c10322e4ac684a17359fe5bff7acb6ad6ac90b0b35fd31068d6254e298f6d06" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x13e769680c99022af2fe734eda617c638b8bfb6035ca027eba47f20cb4a07a49" + }, + { + "amount": "15", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x8b933a7aaa3b1ea891c4392ec290df935e0ebcd433713df4c07d8583a123b125" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x0e722eedc0d2c4cca2b38bbe54b914f0833ed77db8e068b4e0580fcc63d05fcf" + }, + { + "amount": "15", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xcfe1c973d4d73770bff8defed041187f405bfdd24835bd08294be8065deed3d5" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x3a437dda1289198f485de1dce66eda37aaec0d4d2f157a2e8e155962616f9056" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xd5cc8fd70dcd8ef2e902032c17b0284387a4032f1ecda509d8da1a87faa430de" + }, + { + "amount": "26", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xa61b2f4a7962db3e1b3bd008949a45fca273d919236582fac2837fe9338bf09d" + }, + { + "amount": "15", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x3d5e00f458e04b8869a5a800948b27a681babcc008fad092b0cea92bd77ce4d4" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x4aa20102d2e76f332a83555ee29892be1972fd41a6a647c5dafd0aed9ac08da2" + }, + { + "amount": "15", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x5c94d762403f8c1af0513f22578e4839d191f72230a4bc5e88292294056dc7b1" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x470364c533cc37371644ceec17d2ecb8efc123ae2a48a67538f1e7a551d87507" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x005a58c1e9c52919d16b4033924a1d20c8ece3ea8b4ef31c18dc22063b6f0e37" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xe84e0f602076c3cbbe1fce4a807cd77b7edc0a5402a60a632fa7210fcf45e519" + }, + { + "amount": "65", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xdea46047ed750a8a035be101bb66dc68e57f08b4c7d674a3e7c5fa72aa186b2b" + }, + { + "amount": "120", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x08bbc1418fc1a08ff06ec298c205eb40496e98f9c63636dd750d00c36d4c4852" + }, + { + "amount": "10", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x502c6357954fe005d8d26aeb91cc519e2d23b233aeb90a9fe180bfd8087a630c" + }, + { + "amount": "15", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x699de41fd489c72412a07eac668a95e676433a8a483e4c94340d9f5ea4e5883a" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xfd7e7aad721f06dc963d1e91401e33051c42740740419c2d89ec4b005d4426af" + }, + { + "amount": "26", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x8c0f6f0f3362beecd8ffac3df842e61dbb8634c088871c819473ce7c1f61638f" + }, + { + "amount": "20", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x0b1e9eac4f1ad30ec826525769115b4200f0d67a11039eacc7dec254cae4e6ae" + }, + { + "amount": "40", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x6fec302369b6cc50b5fdd03f14a8ca5f8dc86d30b6f6695916c442d822c64464" + }, + { + "amount": "100", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x51f3812a13b40b8da14240c9e1467b5193302cb45fd99524330c46b561526918" + }, + { + "amount": "30", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x1196cc3f61afe969673421c6a00edaf82b48dda42986b98a4edfdb737a7fc18d" + }, + { + "amount": "25", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0xaa794c4025996e859a907009a44d39eb46f1485042ace3e6f0353f2ab397471a" + }, + { + "amount": "10", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x2cc9394dd362b6834b700c6b5c43dd61e6c07aa6f7e0d5c3e3f3a0b5ca54b01d" + } + ], + "withdrawals": [ + { + "amount": "502", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x19ad0e7dc04098b62f272ea54469979a645df1601ba2fa87bd559a11f2e3ca9e" + }, + { + "amount": "481", + "user": "0xf83aaA5786516F7016DF9ead2CD9F14616dA0A13", + "tranche_id": 11, + "tx": "0x536705dd5d8f7944cd5e3414dbd374bef0d96ba8209ba93c9c19da6a0d4d4a9a" + } + ], + "total_tokens": "1013", + "withdrawn_tokens": "983", + "remaining_tokens": "30" + }, + { + "address": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "deposits": [ + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xc9c9139b8030655aaa74ffd50e310cee570064e1a7a842dcdd1841a7dfac8772" + }, + { + "amount": "40", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x3700d4f9b1b67afde4969a28ce120ecfc63a5570fb05329fc0557272413cfa6f" + }, + { + "amount": "50", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x506b01fcf4d7cc170187ff2f6058f1539e479c062459fc1dcfca0c9c5da28b55" + }, + { + "amount": "60", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x1610a45e4e6cf254dd2344a4f03b81ee4be04e3b4c46b9f1fa5460a500b86c5f" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x973127e641cf01314a44e7560be0b54b1b139bad731e1379358e169f31b606e0" + }, + { + "amount": "100", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x03ebb823c4a3aa2794b9f9dae9b9fb75e19f518cb8fbd1c245fd07144c2a2760" + }, + { + "amount": "46", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xd5bf21ff59df324ce1fadc9acd3edf649904a0be184e91994b6f59255a98170f" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x38ac7e75b875453765de7759023d75161f210354cdb09932a60d8e16277e1d92" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x676bbb8223541f0527e33572dac4641a527d4719e7958bca495950c4ddc25dab" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x8beb66b4f217717342943d8e4ec6f896a5ac4f092f948e3b2dabeaea6269814e" + }, + { + "amount": "40", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xee0d751370f536531a291006f02fa2e9ef656bf4748a3debb52ebf0b1df3f489" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xbe672f18fb03e9f4c0c18e0bb217d0a0c59cfc743ff6cf5d645411cbfc211678" + }, + { + "amount": "26", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x5a254f32930e30d41ac65d8167f68c0f4466b57e3252a9b55507325cdb73260a" + }, + { + "amount": "15", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x72ab24c6b99f55ed26bfe4566a75ae246da44fa9d7f5ef808d9e9b1ff4a91522" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x8b31ef11c3a128fe012330769a26fe225186f7ea96213917a57dfdf6fb9a2070" + }, + { + "amount": "25", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x4ec995a1b1fd81a3b85305d082c2a2f2473a4a66f325d39210975625feee7d50" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x12964fc224054102b56943d319965724026aede86a5fc4720d7746dbaa9bb186" + }, + { + "amount": "55", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x137ae3c2675dde6f8e8f1f836fe70d6eefd6960800f54a2c4a3df9580e867c70" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xa165f6e5d6c13d3fbac05f12b3bd17bef57fca586672f2ca1eae5d8be5b8c8e6" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x44825392d5daa5e24f6549e519f1bac6f56faefdb591493248b4e5ef503a467c" + }, + { + "amount": "26", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x43cb6b735392c7c56efcdbde02ebf7a3d751f4258308a04f5fbf14764ef8fcc4" + }, + { + "amount": "50", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x503bfbc98c6ad751a3a7228ee3da97493b1991c3e5cc3f4a1509203bf9721686" + }, + { + "amount": "40", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x03767d9e7f75b3d7521ac9dbd4f0951aaeffbeaa394fdd82b94661e7876b6167" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xd01f9139e0d2160aa6700d0f0139a2b9cb80da6732d8b6001e5483ccd3bf022e" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x30c2e10886740d032f24791efefbd80b987f18e26eecf24a5ff64dfa1e400303" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x0bf1a6167925139834677da2ff27a5063b8a8c5b6eeac7410f9f29ccb32c382b" + }, + { + "amount": "10", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x94be2ebaa3fecf7deb6129116cd0f9a9f99d67a9391c57c02880b5faf5f9832b" + }, + { + "amount": "26", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x6931ce4ed6dc92ef54f9cc8bd8c4d4f4227d4731c69c40106a413e59dc3bc768" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xe87c6f2bcbe62dea3480cdf272d83fc21be020a56bb18a5e4aaf4e6b6be5640b" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x7c8127ee5e6180ef4b7ed14908065ab78b638d6b5f562cbd0b486af315cb404c" + }, + { + "amount": "20", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xc1764193e20737e8e8745cf18fe0a05298114157a24b5746106defc302b82aa3" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x222f42f4bc2f22cace85ffee472c515055dccc2e764dcd9ee6fc04fe7264aa4e" + }, + { + "amount": "26", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x3d0e53470a98eb33900cfe1ebc82260ee57e2a7a317766f779e5834b551b000c" + }, + { + "amount": "40", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x7ec76919be1a4b071aca253e90c057b867cbc945d9720e767c5137b89441b100" + }, + { + "amount": "30", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xe41284040c10157104bfb27000f56fe5b74cb398b31e04687bc2cb68200c7913" + }, + { + "amount": "15", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xbb621efba31c5e2b2c04c686cc6fdd73360674c528554743f803b8e44f39b84c" + } + ], + "withdrawals": [ + { + "amount": "296", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0xc0fbcdeac8ee69ea6a6be21a7c2865efcc37d5c70d82fc14898aae3651ca3eb7" + }, + { + "amount": "553", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x51a814adf98b7375e0ecd5e61a7f30273906b180b36d335ce0bf4a3dfcfd346e" + }, + { + "amount": "161", + "user": "0xc7eC0d77a1417C97fb455f404c4B425A69a0004d", + "tranche_id": 11, + "tx": "0x4258ab72ce3514ad258afd42861a59ba5b1242684b2313ab4a57b3ae4737ab04" + } + ], + "total_tokens": "1120", + "withdrawn_tokens": "1010", + "remaining_tokens": "110" + }, + { + "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "deposits": [ + { + "amount": "50", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x8134229e16d6bb0540f596b7c23dde5bda09ad0c3c8853f5fd4df939b708b691" + }, + { + "amount": "26", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xf6880b495f4eaaaac264f513101dc1372f8d07397539ba1606561e4516187627" + }, + { + "amount": "30", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x97453e02bd907329d1c3483d23ff54d84c3dd34e65a5a795494e3b287e3af6d3" + }, + { + "amount": "20", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xaf7a554c2b5b6690bf6798f31973ed34b351dd3d9c81335301d681c259c3f057" + }, + { + "amount": "10", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xdb1da0991e2a5a044fa1b6e146358e73cf4628762f6f66e01469e3a46d32860b" + }, + { + "amount": "20", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xd355ef37d32d1c619fcaeccb5d66bfaaecf0e8443f6c9b6b47716e63d31ae27e" + }, + { + "amount": "20", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x2db47f31526593c9c215db918aee1dccb6e1fcbd56fdef5e41f46fcbb0a34c18" + }, + { + "amount": "10", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x6d027468ba87f7347a7f8bc69613a60e3c204a5dffeffdc8479456c0d0a32f31" + }, + { + "amount": "25", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x2f485648f47a24fff0503cada896eca6fee655ca855a93388847ad16a1e71571" + }, + { + "amount": "15", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x9f8576c559ffa9bc1082c100250e6d3a967b110e34b944240588d69298f5c691" + }, + { + "amount": "35", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xf4ced12b2414971d95166c74a7872ec1001ca11981b1df172d940c1131b07941" + }, + { + "amount": "60", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x2c49ec4fdc788960134ee975435dcab673096c167707c0d2f79b4c458e51245c" + }, + { + "amount": "60", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x8b4466d7afd3f36075306d3e4989a74d05bd6af042f0c4e5af9cfd6a5c0ec218" + }, + { + "amount": "100", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xe42b39b0ea87c6c5b36b5828a68f39d929f7d5a67061a291c1d4b35ad4cc6770" + }, + { + "amount": "30", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x913bbc51a588b59b360693e76ff58afb13772944ae97a591bff5d89c2aad3583" + }, + { + "amount": "50", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xa47a83976d0c90976ccb0e27a81e0995c823b39090eab8493685ac1cd2f910cc" + }, + { + "amount": "30", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x555e57b4a7304ad39635c17cee00fe5262e3bc371cb02e289d09275486925109" + }, + { + "amount": "150", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x8871a3e3d762039a37482d2dc91f118345808dd099edc8248186d7532193f44d" + }, + { + "amount": "20", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x7b6bb53d2a3360e3e97e393d43f6b595a15586f02ab30cfb9d1277e351d4c0dd" + }, + { + "amount": "15", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xad0d2fe5f21c7f5483a2a3aac4c694d19e85067df52ab803abb73606c3231354" + }, + { + "amount": "20", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x2368becf6a676e7a6a866d621fc7d6f321b70463f1d7fd00e2f88802d3c8807c" + } + ], + "withdrawals": [ + { + "amount": "226", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0xa7649e2ff32d75b81dfff739fe3fd84cde827a3121c8d393f97b1078ee028afd" + }, + { + "amount": "570", + "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", + "tranche_id": 11, + "tx": "0x818a1a6d0d22a088d468459803255b5f698843f7a89829991e2dc7920d8e8be6" + } + ], + "total_tokens": "796", + "withdrawn_tokens": "796", + "remaining_tokens": "0" + }, + { + "address": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "deposits": [ + { + "amount": "50", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x4f2d5ffff22744dd8bca0cd18653e49d05a921e3b37e0ea8e5e8013338044674" + }, + { + "amount": "50", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x64870b69035b9bbc763e488bbcfafe74d7dc9b382a52e574986d99e6057695fd" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xcc656bde93dc97848442b988966a72e9fb4a27236b999e43aa67ea71a205293a" + }, + { + "amount": "60", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x27088669b9ebcfbf0299f571cf839701b8fa0feb48493c375091ca731475411a" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x65dfad0fb2e1bae848cd90e03a9ea591b3f64e1419d6c56c3c3eca312fae9d60" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x652d4da270a1a5aab43538972a1a9f4922a09791201dac8c9a38386befda71ae" + }, + { + "amount": "10", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x6d2b8e1ece252bb50488134e9ded53f8f56aa797bb5b04a01253adaa808f1613" + }, + { + "amount": "15", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x90a80f78b6be0adaf9c8bdf1ab93b89841e1af1680e93af703a833ad3e488c3e" + }, + { + "amount": "15", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x942b78eab6683f71047e50bd3670399355538ca165c80441a901c200844c2f8d" + }, + { + "amount": "25", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xcb1bd76690836eaff41d027f34263a0aaef9f2e6a0dc02cf07a5dae9a2dcd409" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xf8d79b7f4b99f5f924ec3747514ab1dc76123b9207cf8966a556b3ca99ac46d7" + }, + { + "amount": "30", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x60863c700b947135d53d80d6c76dda6cf9fc6d459040e0cad43bf8bcb14ebae0" + }, + { + "amount": "30", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xca81df945a705678e81d5acf6ff9da732986c394cb25afca898748a5f10f8b3b" + }, + { + "amount": "15", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x2b1077878eb68fdc4254054f2306e04dc35e8e6bb34bcc820a9e62a98078291e" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xe381861fceca568dd5569246ca2d2a2d9e16af374434dc415d8be66574c44eb5" + }, + { + "amount": "20", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x3e7ccd74a5bece44dad8da2b408d3244312aa6f57ce76cf7ca3097ab637863da" + }, + { + "amount": "250", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xec131ba46616cd98500b4c781e0662938873cf861619a56f7f8deefe8f06c8b2" + }, + { + "amount": "35", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x1ba208cb36de855530b983d90ca432cb08ce9f0de2acb4c39ea3c5aa97191020" + } + ], + "withdrawals": [ + { + "amount": "260", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xfcfdc83be424a1379e7735e25f83f7fc9bc69a89607b71f0d6f79f84b18c30e8" + }, + { + "amount": "233.1966562025", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0xd72bc34666f08014c60a07fb1ea4fdeb10bf80668132e8b98248d91a613e6773" + }, + { + "amount": "211.8033437975", + "user": "0x89d0dfb58149fB1FF7471983191F6e0eF5c06dCd", + "tranche_id": 11, + "tx": "0x31901f42c25fbd4ee746b0a16cfad2461a361ec7b8367d28560cfd6d767c6d05" + } + ], + "total_tokens": "705", + "withdrawn_tokens": "705", "remaining_tokens": "0" }, { @@ -27165,177 +27676,6 @@ "withdrawn_tokens": "0", "remaining_tokens": "20" }, - { - "address": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "deposits": [ - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xb0a0a9f1c9378dd7d7be224451678719000362139ef3e510a946563194224e60" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x30fd30b3b342aab9ceab0ea1ed2e30fcce04c35c3207f2d9fcf4041f522301b3" - }, - { - "amount": "30", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x84c451d2a9c70a635b9edc1f1317de9ee1cb50233292cf9aab3e932c38763d97" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x56d5d4c663d66febdb438fe37c5e2d2b73c22e2e67cc8d0be8fad24d110efff6" - }, - { - "amount": "15", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x1090b0020c80af215b3d2cf99aa438395f66c075f085c25ec268abd89af90324" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xf5dff2257044c59c9fc58d94733b7b0a1f074c9938d19a9ae58098a4061ef8f5" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x99183d244d03a354193c4977e526ae955920374eb049bfa5e84f18792ddb5a4d" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x1688a0f2b8ea93a512950e40a1c363b62a93df37974c62296956d4692a3eee3d" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xce821ee743667af65bdf28168344f569a998c55742adbcfbdbc473ffaffd1de0" - }, - { - "amount": "15", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xb96a9b0ce949cda20f8d2b1a9a4fcebdb73bab7d083867bd5c982c93d6a96b2b" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x1b15ad50c424258f2ba258b6a26ec59f97e9a8b1bc5808373209243fc7458385" - }, - { - "amount": "30", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x71c559a8236898d94e5da4d7516b1eac3a4cb42a6c2a1f8734888e119fb1ac2a" - }, - { - "amount": "50", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x0f52a50d0ccd7873524598ad4b1a0fbb45fcf13b5339966cd908775e87a82ea3" - }, - { - "amount": "60", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x02b608830593d41a261bf47cca7898262c440d922e11223d470587cda1329537" - }, - { - "amount": "50", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x6e4e585537ed5bfb59bf42c3f0dc5d61e7323ac5b429eea0da3a163545e5c295" - }, - { - "amount": "30", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x900dc8d64db5815539a3a3b249934734ae1ecc0804165dd42187ddf57d9556fe" - }, - { - "amount": "30", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xd18122ac07c1fb8ba81692e93de1af7f7e1eb9369d5d146eb50e3427818df03d" - }, - { - "amount": "40", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x0124fdc80fed9085d6a17bcc6bc73cc49b650ba004695c244d7b87fa364adb26" - }, - { - "amount": "70", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xe8abc2e77b795dd7e1778f736d585cd6e947fc40025f768cfe6a5030cdd43e6e" - }, - { - "amount": "50", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xf208d0201508456a70945e7699b6545aee9e850cc81b293428d77c68e6496c2a" - }, - { - "amount": "60", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x677f361dac2fa32dedf3d834a61b1da635617a55d1141b8e51348e326664a9e9" - }, - { - "amount": "40", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x3488b96bf3afe013c72b834fa6a6b55e14a2d4a7a2b282c612373f2eafdfbbff" - }, - { - "amount": "30", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x804e8ccdc1e324ba09cb868be1130c7ed8f2dc8a3cadd1723ac203bd37487431" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0xf401af6e3aa2898c52bd65044228494fe3157d9c9c1aae115aae8ac379239224" - }, - { - "amount": "40", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x388703694c5f06e07c8f6e799a139bc4debdcdb5c34e3a8a5897676a2ec19298" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x01c7c74cce6a6f67fd54be275445a0b92df56cfbe9845dc88c7898609f7549d9" - }, - { - "amount": "20", - "user": "0xA260d0f8070b2A85B3C00ADb1f0046f20ca85AAa", - "tranche_id": 11, - "tx": "0x62b105e7c569b195b3a3625869c62e4cd307fbda5b0c1e5931a857e376ef6c09" - } - ], - "withdrawals": [], - "total_tokens": "860", - "withdrawn_tokens": "0", - "remaining_tokens": "860" - }, { "address": "0x3a380f7CFdEeb723228cA57d2795EA215094000d", "deposits": [ @@ -35865,10 +36205,17 @@ "tx": "0x15babf8b91f0c5ce846e2f2d8e225eac0ae69a1e8f65f302808db872fba16384" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "10", + "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5", + "tranche_id": 11, + "tx": "0x3ee3f6067fd4181af09fe85299003f5cc8597fc827c70f1842f4a3b3944b5b79" + } + ], "total_tokens": "10", - "withdrawn_tokens": "0", - "remaining_tokens": "10" + "withdrawn_tokens": "10", + "remaining_tokens": "0" }, { "address": "0xBb82D4d6e4381Ae98f8c33629285867b54D91A03", @@ -35907,10 +36254,17 @@ "tx": "0x52dbec69ebb7cf2c1d48242f1797d2bc7cebefe42a50db1973ef94a55bbb9bac" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "10", + "user": "0x6Ea6bE7D5E4E7EEA7BB5EDB64901B8D8a50905F2", + "tranche_id": 11, + "tx": "0x4884aa353e8b38236dd49b0976c7ec48b9bf2d599fd06bd04ecf3b6c1bb6350a" + } + ], "total_tokens": "10", - "withdrawn_tokens": "0", - "remaining_tokens": "10" + "withdrawn_tokens": "10", + "remaining_tokens": "0" }, { "address": "0xc8F412aAb03973D102818C29e18b2d81338dDb66", @@ -37391,7 +37745,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "700133.348465855088393", - "locked_amount": "683953.534551856306621577785", + "locked_amount": "675780.754705802613353193526", "deposits": [ { "amount": "1998.95815", @@ -38772,8 +39126,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", - "total_removed": "801673.92782257069142952", - "locked_amount": "7724942.9051475689870599993091472776993782", + "total_removed": "802077.86972775802842952", + "locked_amount": "7695962.7525560818016928647242119629467423", "deposits": [ { "amount": "16249.93", @@ -39297,6 +39651,11 @@ "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37", "tx": "0x395df06126723394b02bb2ed3068baba30302632375d8a93e07107a35287cedd" }, + { + "amount": "403.941905187337", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tx": "0x3ba2633848985b36b6efea3cf273e61cebac69a47391e40278b45d0310ce1034" + }, { "amount": "827.191309560501875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -41222,6 +41581,12 @@ "tranche_id": 2, "tx": "0x456cb1389ace0734db0bdfcb557e0fccfb22a5a552d6be85e4393c4ab35f1413" }, + { + "amount": "403.941905187337", + "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", + "tranche_id": 2, + "tx": "0x3ba2633848985b36b6efea3cf273e61cebac69a47391e40278b45d0310ce1034" + }, { "amount": "827.191309560501875", "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b", @@ -42538,8 +42903,8 @@ } ], "total_tokens": "259998.8875", - "withdrawn_tokens": "133151.832514355744375", - "remaining_tokens": "126847.054985644255625" + "withdrawn_tokens": "133555.774419543081375", + "remaining_tokens": "126443.113080456918625" }, { "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c", @@ -44866,8 +45231,8 @@ "tranche_start": "2021-11-05T00:00:00.000Z", "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", - "total_removed": "5734683.846766739237957256", - "locked_amount": "1410172.430074505827841234525428239", + "total_removed": "5735243.926636882158318256", + "locked_amount": "1383418.447683332822286136523652822", "deposits": [ { "amount": "129284.449", @@ -45086,6 +45451,11 @@ "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", "tx": "0xc0adcf3ef80c0942dc22f37eb84e4fe64ee31763eabf2209ab30eeec57ca2662" }, + { + "amount": "560.079870142920361", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tx": "0x58f0d9434f7a7b15ea976adba6ba9b843aacb72164e1c0ad522a4229cb4021dc" + }, { "amount": "1147.2913244855584015", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -48178,6 +48548,12 @@ "tranche_id": 3, "tx": "0xc0adcf3ef80c0942dc22f37eb84e4fe64ee31763eabf2209ab30eeec57ca2662" }, + { + "amount": "560.079870142920361", + "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", + "tranche_id": 3, + "tx": "0x58f0d9434f7a7b15ea976adba6ba9b843aacb72164e1c0ad522a4229cb4021dc" + }, { "amount": "1147.2913244855584015", "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b", @@ -50796,8 +51172,8 @@ } ], "total_tokens": "359123.469575", - "withdrawn_tokens": "324029.44733067414935975", - "remaining_tokens": "35094.02224432585064025" + "withdrawn_tokens": "324589.52720081706972075", + "remaining_tokens": "34533.94237418293027925" }, { "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB", @@ -52188,8 +52564,8 @@ "tranche_start": "2021-10-05T00:00:00.000Z", "tranche_end": "2023-04-05T00:00:00.000Z", "total_added": "5778205.3912159303", - "total_removed": "3353757.81738108986999524", - "locked_amount": "240264.2522341081180510504864763015", + "total_removed": "3362269.76579626473241024", + "locked_amount": "229693.5919846168338849190758594575", "deposits": [ { "amount": "552496.6455", @@ -52333,6 +52709,11 @@ } ], "withdrawals": [ + { + "amount": "8511.948415174862415", + "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", + "tx": "0x057f4b016d6e8290e501d33060430ce96dd10cfda20e7fd672e058478e069c75" + }, { "amount": "7754.747191950749679", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -53926,6 +54307,12 @@ } ], "withdrawals": [ + { + "amount": "8511.948415174862415", + "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", + "tranche_id": 4, + "tx": "0x057f4b016d6e8290e501d33060430ce96dd10cfda20e7fd672e058478e069c75" + }, { "amount": "7754.747191950749679", "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90", @@ -54180,8 +54567,8 @@ } ], "total_tokens": "331498.5873", - "withdrawn_tokens": "309454.479755372490072", - "remaining_tokens": "22044.107544627509928" + "withdrawn_tokens": "317966.428170547352487", + "remaining_tokens": "13532.159129452647513" }, { "address": "0x16da609341ed67750A8BCC5AAa2005471006Cd77", @@ -54284,7 +54671,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "36243.9702435650685", - "locked_amount": "108376.3322165251538325320573313", + "locked_amount": "107081.323510615075578492419381028", "deposits": [ { "amount": "3000", @@ -83465,7 +83852,7 @@ "tranche_start": "2021-12-05T00:00:00.000Z", "tranche_end": "2022-06-05T00:00:00.000Z", "total_added": "171288.42", - "total_removed": "66803.5995794947989", + "total_removed": "67303.5995794947989", "locked_amount": "0", "deposits": [ { @@ -87690,6 +88077,16 @@ } ], "withdrawals": [ + { + "amount": "250", + "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5", + "tx": "0x6cfcab82a2d76dba2f2a9da72116f916e5f2bd93847f373a7a1763ed52220b30" + }, + { + "amount": "250", + "user": "0x6Ea6bE7D5E4E7EEA7BB5EDB64901B8D8a50905F2", + "tx": "0x90a2f1b0b9433267b562077b27b8631274fa41387c81d6e090b3d01d045d446f" + }, { "amount": "202.494610425", "user": "0x76bC9a132e27E9007c2adBfc92E65Bf0C5082B51", @@ -95289,10 +95686,17 @@ "tx": "0xc7dd4c2b995cc486fcd8b7892cd79f8fb393ada004dc68cf66ec82d99b35763c" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "250", + "user": "0x6Ea6bE7D5E4E7EEA7BB5EDB64901B8D8a50905F2", + "tranche_id": 6, + "tx": "0x90a2f1b0b9433267b562077b27b8631274fa41387c81d6e090b3d01d045d446f" + } + ], "total_tokens": "250", - "withdrawn_tokens": "0", - "remaining_tokens": "250" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0xE3315Bf1163Ed22fB6c3FDfCbD79F88CC3566d62", @@ -95319,10 +95723,17 @@ "tx": "0xc7dd4c2b995cc486fcd8b7892cd79f8fb393ada004dc68cf66ec82d99b35763c" } ], - "withdrawals": [], + "withdrawals": [ + { + "amount": "250", + "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5", + "tranche_id": 6, + "tx": "0x6cfcab82a2d76dba2f2a9da72116f916e5f2bd93847f373a7a1763ed52220b30" + } + ], "total_tokens": "250", - "withdrawn_tokens": "0", - "remaining_tokens": "250" + "withdrawn_tokens": "250", + "remaining_tokens": "0" }, { "address": "0x6C4730dCD66D130Da02256aF547B36edc9a15F63", diff --git a/apps/static/src/assets/validator-testnet-network.json b/apps/static/src/assets/validator-testnet-network.json index 1875dbd1d..619004096 100644 --- a/apps/static/src/assets/validator-testnet-network.json +++ b/apps/static/src/assets/validator-testnet-network.json @@ -1,3 +1,6 @@ { - "hosts": ["https://api.validators-testnet.vega.xyz/graphql"] + "hosts": [ + "https://api-validators-testnet.vega.rocks/graphql", + "https://vega-testnet.anyvalid.com/query" + ] } diff --git a/apps/trading-e2e/src/integration/market-info.cy.ts b/apps/trading-e2e/src/integration/market-info.cy.ts index d07b5ca91..f9d86e935 100644 --- a/apps/trading-e2e/src/integration/market-info.cy.ts +++ b/apps/trading-e2e/src/integration/market-info.cy.ts @@ -131,7 +131,6 @@ describe('market info is displayed', { tags: '@smoke' }, () => { cy.get('p.col-span-1').contains('Within 43,200 seconds'); validateMarketDataRow(0, 'Highest Price', '7.97323 '); validateMarketDataRow(1, 'Lowest Price', '6.54701 '); - validateMarketDataRow(2, 'Reference Price', '7.22625 '); }); it('liquidity monitoring parameters displayed', () => { diff --git a/apps/trading-e2e/src/integration/trading-accounts.cy.ts b/apps/trading-e2e/src/integration/trading-accounts.cy.ts index 14e824f4c..ae50a86cc 100644 --- a/apps/trading-e2e/src/integration/trading-accounts.cy.ts +++ b/apps/trading-e2e/src/integration/trading-accounts.cy.ts @@ -22,24 +22,25 @@ describe('accounts', { tags: '@smoke' }, () => { cy.getByTestId('tab-accounts') .get(tradingAccountRowId) - .find('[col-id="breakdown"] [data-testid="breakdown"]') - .should('have.text', 'Breakdown'); + .find('[col-id="accounts-actions"]') + .should('have.text', 'DepositWithdraw'); cy.getByTestId('tab-accounts') .get(tradingAccountRowId) - .find('[col-id="breakdown"] [data-testid="deposit"]') + .find('[data-testid="deposit"]') .should('have.text', 'Deposit'); cy.getByTestId('tab-accounts') .get(tradingAccountRowId) - .find('[col-id="breakdown"] [data-testid="withdraw"]') + .find('[col-id="accounts-actions"] [data-testid="withdraw"]') .should('have.text', 'Withdraw'); cy.getByTestId('tab-accounts') .get(tradingAccountRowId) - .find('[col-id="deposited"]') + .find('[col-id="total"]') .should('have.text', '100,001.01'); }); + describe('sorting by ag-grid columns should work well', () => { it('sorting by asset', () => { cy.getByTestId('Collateral').click(); @@ -78,7 +79,7 @@ describe('accounts', { tags: '@smoke' }, () => { '1,000.00', ]; checkSorting( - 'deposited', + 'total', marketsSortedDefault, marketsSortedAsc, marketsSortedDesc @@ -87,9 +88,27 @@ describe('accounts', { tags: '@smoke' }, () => { it('sorting by used', () => { cy.getByTestId('Collateral').click(); - const marketsSortedDefault = ['0.00', '1.01', '0.01', '0.00', '0.00']; - const marketsSortedAsc = ['0.00', '0.00', '0.00', '0.01', '1.01']; - const marketsSortedDesc = ['1.01', '0.01', '0.00', '0.00', '0.00']; + const marketsSortedDefault = [ + '0.000.00%', + '1.010.00%', + '0.010.00%', + '0.000.00%', + '0.000.00%', + ]; + const marketsSortedAsc = [ + '0.000.00%', + '0.000.00%', + '0.000.00%', + '0.010.00%', + '1.010.00%', + ]; + const marketsSortedDesc = [ + '1.010.00%', + '0.010.00%', + '0.000.00%', + '0.000.00%', + '0.000.00%', + ]; checkSorting( 'used', marketsSortedDefault, @@ -98,32 +117,32 @@ describe('accounts', { tags: '@smoke' }, () => { ); }); - it('sorting by available', () => { + it('sorting by total', () => { cy.getByTestId('Collateral').click(); const marketsSortedDefault = [ '1,000.00002', - '100,000.00', - '1,000.00', + '100,001.01', + '1,000.01', '1,000.00', '1,000.00001', ]; const marketsSortedAsc = [ - '1,000.00', '1,000.00', '1,000.00001', '1,000.00002', - '100,000.00', + '1,000.01', + '100,001.01', ]; const marketsSortedDesc = [ - '100,000.00', + '100,001.01', + '1,000.01', '1,000.00002', '1,000.00001', '1,000.00', - '1,000.00', ]; checkSorting( - 'available', + 'total', marketsSortedDefault, marketsSortedAsc, marketsSortedDesc diff --git a/apps/trading-e2e/src/integration/trading-positions.cy.ts b/apps/trading-e2e/src/integration/trading-positions.cy.ts index bf2b93682..1d4c12b78 100644 --- a/apps/trading-e2e/src/integration/trading-positions.cy.ts +++ b/apps/trading-e2e/src/integration/trading-positions.cy.ts @@ -50,7 +50,6 @@ describe('positions', { tags: '@smoke' }, () => { const emptyCells = [ 'notional', 'markPrice', - 'liquidationPrice', 'currentLeverage', 'averageEntryPrice', ]; @@ -162,8 +161,6 @@ describe('positions', { tags: '@smoke' }, () => { cy.wrap($prices).invoke('text').should('not.be.empty'); }); - cy.get('[col-id="liquidationPrice"]').should('contain.text', '0'); // liquidation price - cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1'); cy.get('[col-id="marginAccountBalance"]') // margin allocated diff --git a/apps/trading/components/banner/banner.tsx b/apps/trading/components/banner/banner.tsx index 05124da22..a61dd082d 100644 --- a/apps/trading/components/banner/banner.tsx +++ b/apps/trading/components/banner/banner.tsx @@ -30,7 +30,7 @@ export const Banner = () => {
    - Mainnet sim 3 is coming soon! + Mainnet sim 3 is live! Learn more
    diff --git a/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx b/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx index d8163a552..55b84c85a 100644 --- a/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx +++ b/apps/trading/lib/hooks/use-vega-transaction-toasts.tsx @@ -523,6 +523,16 @@ const VegaTxCompleteToastsContent = ({ tx }: VegaTxToastContentProps) => {

    {t('Transfer complete')}

    {t('Your transaction has been confirmed ')}

    + {tx.txHash && ( +

    + + {t('View in block explorer')} + +

    + )}
    ); diff --git a/apps/trading/pages/_app.page.tsx b/apps/trading/pages/_app.page.tsx index c1905d8c1..30f99079c 100644 --- a/apps/trading/pages/_app.page.tsx +++ b/apps/trading/pages/_app.page.tsx @@ -83,8 +83,8 @@ function AppBody({ Component }: AppProps) { <div className={gridClasses}> - <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} /> <Banner /> + <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} /> <ViewingBanner /> <main data-testid={location.pathname}> <Component /> diff --git a/libs/accounts/src/lib/accounts-data-provider.spec.ts b/libs/accounts/src/lib/accounts-data-provider.spec.ts index 752cd2dbf..694a7ad6b 100644 --- a/libs/accounts/src/lib/accounts-data-provider.spec.ts +++ b/libs/accounts/src/lib/accounts-data-provider.spec.ts @@ -159,38 +159,50 @@ const accountResult = [ { asset: { __typename: 'Asset', - decimals: 5, id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c', symbol: 'tBTC', + decimals: 5, }, - available: '4000000000000001006031', balance: '4000000000000001006031', - breakdown: [], - deposited: '4000000000000001006031', - type: AccountType.ACCOUNT_TYPE_GENERAL, + type: 'ACCOUNT_TYPE_GENERAL', + available: '4000000000000001006031', used: '0', + total: '4000000000000001006031', + breakdown: [ + { + __typename: 'AccountBalance', + type: 'ACCOUNT_TYPE_GENERAL', + balance: '4000000000000001006031', + market: null, + asset: { + __typename: 'Asset', + id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c', + symbol: 'tBTC', + decimals: 5, + }, + total: '4000000000000001006031', + available: '4000000000000001006031', + used: '4000000000000001006031', + }, + ], }, { asset: { __typename: 'Asset', - decimals: 5, id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61', symbol: 'tDAI', + decimals: 5, }, - available: '5000593078', balance: '5000593078', + type: 'ACCOUNT_TYPE_GENERAL', + available: '5000593078', + used: '406922', + total: '5001000000', breakdown: [ { __typename: 'AccountBalance', - asset: { - __typename: 'Asset', - decimals: 5, - id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61', - symbol: 'tDAI', - }, - available: '5000593078', + type: 'ACCOUNT_TYPE_MARGIN', balance: '406922', - deposited: '5001000000', market: { __typename: 'Market', id: '9c1ee71959e566c484fcea796513137f8a02219cca2e973b7ae72dc29d099581', @@ -202,35 +214,50 @@ const accountResult = [ }, }, }, - type: AccountType.ACCOUNT_TYPE_MARGIN, + asset: { + __typename: 'Asset', + id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61', + symbol: 'tDAI', + decimals: 5, + }, + total: '5001000000', + available: '5000593078', used: '406922', }, + { + __typename: 'AccountBalance', + type: 'ACCOUNT_TYPE_GENERAL', + balance: '5000593078', + market: null, + asset: { + __typename: 'Asset', + id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61', + symbol: 'tDAI', + decimals: 5, + }, + total: '5001000000', + available: '5000593078', + used: '5000593078', + }, ], - deposited: '5001000000', - type: AccountType.ACCOUNT_TYPE_GENERAL, - used: '406922', }, { asset: { __typename: 'Asset', - decimals: 5, id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4', symbol: 'tEURO', + decimals: 5, }, - available: '2996218603', balance: '2996218603', + type: 'ACCOUNT_TYPE_GENERAL', + available: '2996218603', + used: '2781397', + total: '2999000000', breakdown: [ { __typename: 'AccountBalance', - asset: { - __typename: 'Asset', - decimals: 5, - id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4', - symbol: 'tEURO', - }, - available: '2996218603', + type: 'ACCOUNT_TYPE_MARGIN', balance: '2781397', - deposited: '2999000000', market: { __typename: 'Market', id: 'd90fd7c746286625504d7a3f5f420a280875acd3cd611676d9e70acc675f4540', @@ -242,40 +269,91 @@ const accountResult = [ }, }, }, - type: AccountType.ACCOUNT_TYPE_MARGIN, + asset: { + __typename: 'Asset', + id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4', + symbol: 'tEURO', + decimals: 5, + }, + total: '2999000000', + available: '2996218603', used: '2781397', }, + { + __typename: 'AccountBalance', + type: 'ACCOUNT_TYPE_GENERAL', + balance: '2996218603', + market: null, + asset: { + __typename: 'Asset', + id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4', + symbol: 'tEURO', + decimals: 5, + }, + total: '2999000000', + available: '2996218603', + used: '2996218603', + }, ], - deposited: '2999000000', - type: AccountType.ACCOUNT_TYPE_GENERAL, - used: '2781397', }, { asset: { __typename: 'Asset', - decimals: 5, id: '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede', symbol: 'tUSDC', + decimals: 5, }, - available: '1990351587', balance: '1990351587', - breakdown: [], - deposited: '1990351587', - type: AccountType.ACCOUNT_TYPE_GENERAL, + type: 'ACCOUNT_TYPE_GENERAL', + available: '1990351587', used: '0', + total: '1990351587', + breakdown: [ + { + __typename: 'AccountBalance', + type: 'ACCOUNT_TYPE_GENERAL', + balance: '1990351587', + market: null, + asset: { + __typename: 'Asset', + id: '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede', + symbol: 'tUSDC', + decimals: 5, + }, + total: '1990351587', + available: '1990351587', + used: '1990351587', + }, + ], }, { asset: { __typename: 'Asset', - decimals: 5, id: 'XYZalpha', symbol: 'XYZalpha', + decimals: 5, }, - available: '10001000000', balance: '10001000000', - breakdown: [], - deposited: '10001000000', - type: AccountType.ACCOUNT_TYPE_GENERAL, + type: 'ACCOUNT_TYPE_GENERAL', + available: '10001000000', used: '0', + total: '10001000000', + breakdown: [ + { + __typename: 'AccountBalance', + type: 'ACCOUNT_TYPE_GENERAL', + balance: '10001000000', + market: null, + asset: { + __typename: 'Asset', + id: 'XYZalpha', + symbol: 'XYZalpha', + decimals: 5, + }, + total: '10001000000', + available: '10001000000', + used: '10001000000', + }, + ], }, ] as AccountFields[]; diff --git a/libs/accounts/src/lib/accounts-data-provider.ts b/libs/accounts/src/lib/accounts-data-provider.ts index b404dca0b..f8734e9eb 100644 --- a/libs/accounts/src/lib/accounts-data-provider.ts +++ b/libs/accounts/src/lib/accounts-data-provider.ts @@ -99,7 +99,7 @@ export const accountsOnlyDataProvider = makeDataProvider< export interface AccountFields extends Account { available: string; used: string; - deposited: string; + total: string; balance: string; breakdown?: AccountFields[]; } @@ -145,15 +145,17 @@ const getAssetAccountAggregation = ( type: AccountType.ACCOUNT_TYPE_GENERAL, available: available.toString(), used: used.toString(), - deposited: (available + used).toString(), + total: (available + used).toString(), }; const breakdown = accounts - .filter((a) => USE_ACCOUNT_TYPES.includes(a.type)) + .filter((a) => + [...USE_ACCOUNT_TYPES, AccountType.ACCOUNT_TYPE_GENERAL].includes(a.type) + ) .map((a) => ({ ...a, asset: accounts[0].asset, - deposited: balanceAccount.deposited, + total: balanceAccount.total, available: balanceAccount.available, used: a.balance, })) diff --git a/libs/accounts/src/lib/accounts-table.spec.tsx b/libs/accounts/src/lib/accounts-table.spec.tsx index 19919938c..7539a5303 100644 --- a/libs/accounts/src/lib/accounts-table.spec.tsx +++ b/libs/accounts/src/lib/accounts-table.spec.tsx @@ -27,7 +27,7 @@ const singleRow = { }, available: '125600000', used: '125600000', - deposited: '125600000', + total: '251200000', } as AccountFields; const singleRowData = [singleRow]; @@ -42,7 +42,7 @@ describe('AccountsTable', () => { /> ); }); - const expectedHeaders = ['Asset', 'Total', 'Used', 'Available', '']; + const expectedHeaders = ['Asset', 'Used', 'Available', 'Total', '']; const headers = await screen.findAllByRole('columnheader'); expect(headers).toHaveLength(expectedHeaders.length); expect( @@ -65,8 +65,7 @@ describe('AccountsTable', () => { 'tBTC', '1,256.00', '1,256.00', - '1,256.00', - 'Breakdown', + '2,512.00', 'Deposit', 'Withdraw', ]; @@ -88,13 +87,8 @@ describe('AccountsTable', () => { ); }); const cells = await screen.findAllByRole('gridcell'); - const expectedValues = [ - 'tBTC', - '1,256.00', - '1,256.00', - '1,256.00', - 'Breakdown', - ]; + const expectedValues = ['tBTC', '1,256.00', '1,256.00', '2,512.00', '']; + expect(cells.length).toBe(expectedValues.length); cells.forEach((cell, i) => { expect(cell).toHaveTextContent(expectedValues[i]); }); @@ -145,7 +139,7 @@ describe('AccountsTable', () => { }, available: '0', balance: '125600000', - deposited: '125600000', + total: '125600000', market: { __typename: 'Market', id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35', @@ -161,7 +155,7 @@ describe('AccountsTable', () => { used: '125600000', }, ], - deposited: '125600000', + total: '125600000', type: 'ACCOUNT_TYPE_GENERAL', used: '125600000', }, diff --git a/libs/accounts/src/lib/accounts-table.tsx b/libs/accounts/src/lib/accounts-table.tsx index 97e465164..5735ed1e3 100644 --- a/libs/accounts/src/lib/accounts-table.tsx +++ b/libs/accounts/src/lib/accounts-table.tsx @@ -8,7 +8,6 @@ import { t } from '@vegaprotocol/i18n'; import type { VegaICellRendererParams, VegaValueFormatterParams, - VegaValueGetterParams, } from '@vegaprotocol/datagrid'; import { Button, ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit'; import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit'; @@ -17,12 +16,56 @@ import { CenteredGridCellWrapper, } from '@vegaprotocol/datagrid'; import { AgGridColumn } from 'ag-grid-react'; -import type { IDatasource, IGetRowsParams } from 'ag-grid-community'; +import type { IDatasource, IGetRowsParams, RowNode } from 'ag-grid-community'; import type { AgGridReact, AgGridReactProps } from 'ag-grid-react'; import BreakdownTable from './breakdown-table'; import type { AccountFields } from './accounts-data-provider'; import type { Asset } from '@vegaprotocol/types'; import BigNumber from 'bignumber.js'; +import classNames from 'classnames'; + +const colorClass = (percentageUsed: number, neutral = false) => { + return classNames({ + 'text-neutral-500 dark:text-neutral-400': percentageUsed < 75 && !neutral, + 'text-vega-orange': percentageUsed >= 75 && percentageUsed < 90, + 'text-vega-pink': percentageUsed >= 90, + }); +}; + +export const percentageValue = (part?: string, total?: string) => + new BigNumber(part || 0) + .dividedBy(total || 1) + .multipliedBy(100) + .toNumber(); + +const formatWithAssetDecimals = ( + data: AccountFields | undefined, + value: string | undefined +) => { + return ( + data && + data.asset && + isNumeric(value) && + addDecimalsFormatNumber(value, data.asset.decimals) + ); +}; + +export const accountValuesComparator = ( + valueA: string, + valueB: string, + nodeA: RowNode, + nodeB: RowNode +) => { + if (isNumeric(valueA) && isNumeric(valueB)) { + const a = toBigNum(valueA, nodeA.data.asset?.decimals); + const b = toBigNum(valueB, nodeB.data.asset?.decimals); + + if (a.isEqualTo(b)) return 0; + return a.isGreaterThan(b) ? 1 : -1; + } + if (valueA === valueB) return 0; + return valueA > valueB ? 1 : -1; +}; export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> { successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void; @@ -47,7 +90,7 @@ export interface AccountTableProps extends AgGridReactProps { export const AccountTable = forwardRef<AgGridReact, AccountTableProps>( ({ onClickAsset, onClickWithdraw, onClickDeposit, ...props }, ref) => { const [openBreakdown, setOpenBreakdown] = useState(false); - const [breakdown, setBreakdown] = useState<AccountFields[] | null>(null); + const [row, setRow] = useState<AccountFields>(); const pinnedAssetId = props.pinnedAsset?.id; const pinnedAssetRow = useMemo(() => { @@ -60,7 +103,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>( asset: props.pinnedAsset, available: '0', used: '0', - deposited: '0', + total: '0', balance: '0', }; } @@ -81,6 +124,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>( resizable: true, tooltipComponent: TooltipCellComponent, sortable: true, + comparator: accountValuesComparator, }} {...props} pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined} @@ -94,90 +138,64 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>( cellRenderer={({ value, data, - node, }: VegaICellRendererParams<AccountFields, 'asset.symbol'>) => { - return value ? ( - <CenteredGridCellWrapper - className={node.rowPinned ? 'h-[30px]' : undefined} + return ( + <ButtonLink + data-testid="asset" + onClick={() => { + if (data) { + onClickAsset(data.asset.id); + } + }} > - <ButtonLink - data-testid="asset" - onClick={() => { - if (data) { - onClickAsset(data.asset.id); - } - }} - > - {value} - </ButtonLink> - </CenteredGridCellWrapper> - ) : null; - }} - maxWidth={300} - /> - <AgGridColumn - headerName={t('Total')} - type="rightAligned" - field="deposited" - headerTooltip={t( - 'This is the total amount of collateral used plus the amount available in your general account.' - )} - valueGetter={({ - data, - }: VegaValueGetterParams<AccountFields, 'deposited'>) => { - return !data?.deposited - ? undefined - : toBigNum(data.deposited, data.asset.decimals).toNumber(); - }} - maxWidth={300} - cellRenderer={({ - data, - node, - }: VegaICellRendererParams<AccountFields, 'deposited'>) => { - const valueFormatted = - data && - data.asset && - isNumeric(data.deposited) && - addDecimalsFormatNumber(data.deposited, data.asset.decimals); - return node.rowPinned ? ( - <CenteredGridCellWrapper className="h-[30px] justify-end"> - {valueFormatted} - </CenteredGridCellWrapper> - ) : ( - valueFormatted + {value} + </ButtonLink> ); }} + maxWidth={300} /> <AgGridColumn headerName={t('Used')} type="rightAligned" field="used" headerTooltip={t( - 'This is the amount of collateral used from your general account.' + 'Currently allocated to a market as margin or bond. Check the breakdown for details.' )} - valueGetter={({ - data, - }: VegaValueGetterParams<AccountFields, 'used'>) => { - return !data?.used - ? undefined - : toBigNum(data.used, data.asset.decimals).toNumber(); - }} - maxWidth={300} cellRenderer={({ data, - node, + value, }: VegaICellRendererParams<AccountFields, 'used'>) => { - const valueFormatted = - data && - data.asset && - isNumeric(data.used) && - addDecimalsFormatNumber(data.used, data.asset.decimals); - return node.rowPinned ? ( - <CenteredGridCellWrapper className="h-[30px] justify-end"> - {valueFormatted} - </CenteredGridCellWrapper> + if (!data) return null; + const percentageUsed = percentageValue(value, data.total); + const valueFormatted = formatWithAssetDecimals(data, value); + + return data.breakdown ? ( + <> + <ButtonLink + data-testid="breakdown" + onClick={() => { + setOpenBreakdown(!openBreakdown); + setRow(data); + }} + > + <span>{valueFormatted}</span> + </ButtonLink> + <span + className={classNames( + colorClass(percentageUsed), + 'ml-2 inline-block w-14' + )} + > + {percentageUsed.toFixed(2)}% + </span> + </> ) : ( - valueFormatted + <> + <span>{valueFormatted}</span> + <span className="ml-2 inline-block w-14 text-neutral-500 dark:text-neutral-400"> + 0.00% + </span> + </> ); }} /> @@ -186,115 +204,113 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>( field="available" type="rightAligned" headerTooltip={t( - 'This is the amount of collateral available in your general account.' + 'Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.' )} - valueGetter={({ - data, - }: VegaValueGetterParams<AccountFields, 'available'>) => { - return !data?.available - ? undefined - : toBigNum(data.available, data.asset.decimals).toNumber(); - }} - valueFormatter={({ - data, - }: VegaValueFormatterParams<AccountFields, 'available'>) => - data && - data.asset && - isNumeric(data.available) && - addDecimalsFormatNumber(data.available, data.asset.decimals) - } - maxWidth={300} cellRenderer={({ + value, data, - node, }: VegaICellRendererParams<AccountFields, 'available'>) => { - const valueFormatted = - data && - data.asset && - isNumeric(data.available) && - addDecimalsFormatNumber(data.available, data.asset.decimals); - return node.rowPinned ? ( - <CenteredGridCellWrapper className="h-[30px] justify-end"> - {valueFormatted} - </CenteredGridCellWrapper> - ) : ( - valueFormatted + const percentageUsed = percentageValue(data?.used, data?.total); + + return ( + <span className={colorClass(percentageUsed, true)}> + {formatWithAssetDecimals(data, value)} + </span> ); }} /> <AgGridColumn - colId="breakdown" - headerName="" - sortable={false} - minWidth={200} + headerName={t('Total')} type="rightAligned" - cellRenderer={({ + field="total" + headerTooltip={t( + 'The total amount of each asset on this key. Includes used and available collateral.' + )} + valueFormatter={({ data, - }: VegaICellRendererParams<AccountFields>) => { - if (!data) return null; - else { - if ( - data.asset.id === pinnedAssetId && - new BigNumber(data.deposited).isLessThanOrEqualTo(0) - ) { + }: VegaValueFormatterParams<AccountFields, 'total'>) => + formatWithAssetDecimals(data, data?.total) + } + /> + { + <AgGridColumn + colId="accounts-actions" + headerName="" + sortable={false} + minWidth={200} + type="rightAligned" + cellRenderer={({ + data, + }: VegaICellRendererParams<AccountFields>) => { + if (!data) return null; + else { + if ( + data.asset.id === pinnedAssetId && + new BigNumber(data.total).isLessThanOrEqualTo(0) + ) { + return ( + <CenteredGridCellWrapper className="h-[30px] justify-end py-1"> + <Button + size="xs" + variant="primary" + data-testid="deposit" + onClick={() => { + onClickDeposit && onClickDeposit(data.asset.id); + }} + > + {t('Deposit to trade')} + </Button> + </CenteredGridCellWrapper> + ); + } return ( - <CenteredGridCellWrapper className="h-[30px] justify-end py-1"> - <Button - size="xs" - variant="primary" - data-testid="deposit" - onClick={() => { - onClickDeposit && onClickDeposit(data.asset.id); - }} - > - {t('Deposit to trade')} - </Button> - </CenteredGridCellWrapper> + <> + <span className="mx-1" /> + {!props.isReadOnly && ( + <ButtonLink + data-testid="deposit" + onClick={() => { + onClickDeposit && onClickDeposit(data.asset.id); + }} + > + {t('Deposit')} + </ButtonLink> + )} + <span className="mx-1" /> + {!props.isReadOnly && ( + <ButtonLink + data-testid="withdraw" + onClick={() => + onClickWithdraw && onClickWithdraw(data.asset.id) + } + > + {t('Withdraw')} + </ButtonLink> + )} + </> ); } - return ( - <> - <ButtonLink - data-testid="breakdown" - onClick={() => { - setOpenBreakdown(!openBreakdown); - setBreakdown(data.breakdown || null); - }} - > - {t('Breakdown')} - </ButtonLink> - <span className="mx-1" /> - {!props.isReadOnly && ( - <ButtonLink - data-testid="deposit" - onClick={() => { - onClickDeposit && onClickDeposit(data.asset.id); - }} - > - {t('Deposit')} - </ButtonLink> - )} - <span className="mx-1" /> - {!props.isReadOnly && ( - <ButtonLink - data-testid="withdraw" - onClick={() => - onClickWithdraw && onClickWithdraw(data.asset.id) - } - > - {t('Withdraw')} - </ButtonLink> - )} - </> - ); - } - }} - /> + }} + /> + } </AgGrid> <Dialog size="medium" open={openBreakdown} onChange={setOpenBreakdown}> <div className="h-[35vh] w-full m-auto flex flex-col"> - <h1 className="text-xl mb-4">{t('Collateral breakdown')}</h1> - <BreakdownTable data={breakdown} domLayout="autoHeight" /> + <h1 className="text-xl mb-4"> + {row?.asset?.symbol} {t('usage breakdown')} + </h1> + {row && ( + <p className="mb-2 text-sm"> + {t('You have %s %s in total.', [ + addDecimalsFormatNumber(row.total, row.asset.decimals), + row.asset.symbol, + ])} + </p> + )} + <BreakdownTable + data={row?.breakdown || null} + domLayout="autoHeight" + /> </div> </Dialog> </> diff --git a/libs/accounts/src/lib/breakdown-table.spec.tsx b/libs/accounts/src/lib/breakdown-table.spec.tsx index e4f1e31b2..16bb21b80 100644 --- a/libs/accounts/src/lib/breakdown-table.spec.tsx +++ b/libs/accounts/src/lib/breakdown-table.spec.tsx @@ -27,7 +27,7 @@ const singleRow = { }, available: '125600000', used: '125600000', - deposited: '125600000', + total: '251200000', } as AccountFields; const singleRowData = [singleRow]; @@ -37,10 +37,10 @@ describe('BreakdownTable', () => { render(<BreakdownTable data={singleRowData} />); }); const headers = await screen.findAllByRole('columnheader'); - expect(headers).toHaveLength(4); + expect(headers).toHaveLength(3); expect( headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim()) - ).toEqual(['Account type', 'Market', 'Used', 'Balance']); + ).toEqual(['Market', 'Account type', 'Balance']); }); it('should apply correct formatting', async () => { @@ -49,9 +49,9 @@ describe('BreakdownTable', () => { }); const cells = await screen.findAllByRole('gridcell'); const expectedValues = [ - 'Margin', 'BTCUSD Monthly (30 Jun 2022)', - '1,256.001,256.00', + 'Margin', + '1,256.00 (50%)', '1,256.00', '1,256.00', ]; @@ -83,7 +83,7 @@ describe('BreakdownTable', () => { }, available: '0', balance: '125600000', - deposited: '125600000', + total: '125600000', market: { __typename: 'Market', id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35', @@ -99,7 +99,7 @@ describe('BreakdownTable', () => { used: '125600000', }, ], - deposited: '125600000', + total: '125600000', type: 'ACCOUNT_TYPE_GENERAL', used: '125600000', }, diff --git a/libs/accounts/src/lib/breakdown-table.tsx b/libs/accounts/src/lib/breakdown-table.tsx index 4ac287f5b..0d7d63380 100644 --- a/libs/accounts/src/lib/breakdown-table.tsx +++ b/libs/accounts/src/lib/breakdown-table.tsx @@ -1,5 +1,5 @@ import { forwardRef } from 'react'; -import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils'; +import { addDecimalsFormatNumber } from '@vegaprotocol/utils'; import { t } from '@vegaprotocol/i18n'; import { Intent, @@ -13,6 +13,7 @@ import type { ValueProps } from '@vegaprotocol/ui-toolkit'; import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid'; import { AgGridDynamic as AgGrid, PriceCell } from '@vegaprotocol/datagrid'; import type { ValueFormatterParams } from 'ag-grid-community'; +import { accountValuesComparator } from './accounts-table'; export const progressBarValueFormatter = ({ data, @@ -23,24 +24,16 @@ export const progressBarValueFormatter = ({ } const min = BigInt(data.used); const mid = BigInt(data.available); - const max = BigInt(data.deposited); + const max = BigInt(data.total); const range = max > min ? max : min; return { - low: addDecimalsFormatNumber(min.toString(), data.asset.decimals, 4), - high: addDecimalsFormatNumber(mid.toString(), data.asset.decimals, 4), + low: addDecimalsFormatNumber(min.toString(), data.asset.decimals), + high: addDecimalsFormatNumber(mid.toString(), data.asset.decimals), value: range ? Number((min * BigInt(100)) / range) : 0, intent: Intent.Warning, }; }; -export const progressBarHeaderComponentParams = { - template: - '<div class="ag-cell-label-container" role="presentation">' + - ` <span>${t('Available')}</span>` + - ' <span ref="eText" class="ag-header-cell-text"></span>' + - '</div>', -}; - interface BreakdownTableProps extends AgGridReactProps { data: AccountFields[] | null; } @@ -62,8 +55,23 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>( defaultColDef={{ flex: 1, resizable: true, + sortable: true, }} > + <AgGridColumn + headerName={t('Market')} + field="market.tradableInstrument.instrument.name" + valueFormatter={({ + value, + }: VegaValueFormatterParams< + AccountFields, + 'market.tradableInstrument.instrument.name' + >) => { + if (!value) return 'None'; + return value; + }} + minWidth={200} + /> <AgGridColumn headerName={t('Account type')} field="type" @@ -76,42 +84,15 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>( : '' } /> + <AgGridColumn - headerName={t('Market')} - field="market.tradableInstrument.instrument.name" - valueFormatter={({ - value, - }: VegaValueFormatterParams< - AccountFields, - 'market.tradableInstrument.instrument.name' - >) => { - if (!value) return '-'; - return value; - }} - minWidth={200} - /> - <AgGridColumn - headerName={t('Used')} + headerName={t('Balance')} field="used" flex={2} maxWidth={500} - headerComponentParams={progressBarHeaderComponentParams} cellRendererSelector={progressBarCellRendererSelector} valueFormatter={progressBarValueFormatter} - /> - <AgGridColumn - headerName={t('Balance')} - field="balance" - valueFormatter={({ - value, - data, - }: VegaValueFormatterParams<AccountFields, 'balance'>) => { - if (data && data.asset && isNumeric(value)) { - return addDecimalsFormatNumber(value, data.asset.decimals); - } - return '-'; - }} - maxWidth={300} + comparator={accountValuesComparator} /> </AgGrid> ); diff --git a/libs/cypress/src/lib/utils.ts b/libs/cypress/src/lib/utils.ts index e6c81d754..e4cb58ff0 100644 --- a/libs/cypress/src/lib/utils.ts +++ b/libs/cypress/src/lib/utils.ts @@ -53,6 +53,7 @@ export const checkSorting = ( }); checkSortChange(orderTabDesc, column); }; + const checkSortChange = (tabsArr: string[], column: string) => { cy.get('.ag-center-cols-container').within(() => { tabsArr.forEach((entry, i) => { diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx index 7acf78372..d5f0c060a 100644 --- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx +++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx @@ -116,7 +116,7 @@ export const DealTicket = ({ return; } - const hasNoBalance = generalAccountBalance === '0'; + const hasNoBalance = !BigInt(generalAccountBalance); if (hasNoBalance) { setError('summary', { message: SummaryValidationType.NoCollateral, @@ -141,7 +141,6 @@ export const DealTicket = ({ pubKey, setError, clearErrors, - errors.summary, ]); const onSubmit = useCallback( @@ -386,8 +385,12 @@ const SummaryMessage = memo( // If there is no blocking error but user doesn't have enough // balance render the margin warning, but still allow submission - if (BigInt(balance) < BigInt(margin)) { - return <MarginWarning balance={balance} margin={margin} asset={asset} />; + if (BigInt(balance) < BigInt(margin) && BigInt(balance) > BigInt(0)) { + return ( + <div className="mb-2"> + <MarginWarning balance={balance} margin={margin} asset={asset} /> + </div> + ); } // Show auction mode warning if ( diff --git a/libs/ledger/src/lib/ledger-table.tsx b/libs/ledger/src/lib/ledger-table.tsx index 12e9a96c7..679f4dcbe 100644 --- a/libs/ledger/src/lib/ledger-table.tsx +++ b/libs/ledger/src/lib/ledger-table.tsx @@ -134,6 +134,10 @@ export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>( headerName={t('Transfer type')} field="transferType" tooltipField="transferType" + filter={SetFilter} + filterParams={{ + set: TransferTypeMapping, + }} valueFormatter={({ value, }: VegaValueFormatterParams<LedgerEntry, 'transferType'>) => @@ -147,14 +151,9 @@ export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>( value, data, }: VegaValueFormatterParams<LedgerEntry, 'quantity'>) => { - const marketDecimalPlaces = data?.marketSender?.decimalPlaces; const assetDecimalPlaces = data?.asset?.decimals || 0; return value - ? addDecimalsFormatNumber( - value, - assetDecimalPlaces, - marketDecimalPlaces - ) + ? addDecimalsFormatNumber(value, assetDecimalPlaces) : value; }} /> @@ -175,14 +174,9 @@ export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>( value, data, }: VegaValueFormatterParams<LedgerEntry, 'fromAccountBalance'>) => { - const marketDecimalPlaces = data?.marketSender?.decimalPlaces; const assetDecimalPlaces = data?.asset?.decimals || 0; return value - ? addDecimalsFormatNumber( - value, - assetDecimalPlaces, - marketDecimalPlaces - ) + ? addDecimalsFormatNumber(value, assetDecimalPlaces) : value; }} /> @@ -193,14 +187,9 @@ export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>( value, data, }: VegaValueFormatterParams<LedgerEntry, 'toAccountBalance'>) => { - const marketDecimalPlaces = data?.marketReceiver?.decimalPlaces; const assetDecimalPlaces = data?.asset?.decimals || 0; return value - ? addDecimalsFormatNumber( - value, - assetDecimalPlaces, - marketDecimalPlaces - ) + ? addDecimalsFormatNumber(value, assetDecimalPlaces) : value; }} /> diff --git a/libs/market-info/src/components/market-info/info-market.tsx b/libs/market-info/src/components/market-info/info-market.tsx index 2080f5545..0f9195a7e 100644 --- a/libs/market-info/src/components/market-info/info-market.tsx +++ b/libs/market-info/src/components/market-info/info-market.tsx @@ -322,9 +322,8 @@ export const Info = ({ market, onSelect }: InfoProps) => { data={{ highestPrice: bounds.maxValidPrice, lowestPrice: bounds.minValidPrice, - referencePrice: bounds.referencePrice, }} - decimalPlaces={assetDecimals} + decimalPlaces={market.decimalPlaces} assetSymbol={quoteUnit} /> )} diff --git a/libs/positions/src/lib/positions-data-providers.spec.ts b/libs/positions/src/lib/positions-data-providers.spec.ts index 798bb6734..2d6cdcd7e 100644 --- a/libs/positions/src/lib/positions-data-providers.spec.ts +++ b/libs/positions/src/lib/positions-data-providers.spec.ts @@ -213,7 +213,6 @@ describe('getMetrics && rejoinPositionData', () => { expect(metrics[0].marketDecimalPlaces).toEqual(5); expect(metrics[0].positionDecimalPlaces).toEqual(0); expect(metrics[0].decimals).toEqual(5); - expect(metrics[0].liquidationPrice).toEqual('169990'); expect(metrics[0].lowMarginLevel).toEqual(false); expect(metrics[0].markPrice).toEqual('9431775'); expect(metrics[0].marketId).toEqual( @@ -242,7 +241,6 @@ describe('getMetrics && rejoinPositionData', () => { expect(metrics[1].marketDecimalPlaces).toEqual(5); expect(metrics[1].positionDecimalPlaces).toEqual(0); expect(metrics[1].decimals).toEqual(5); - expect(metrics[1].liquidationPrice).toEqual('9830750'); expect(metrics[1].lowMarginLevel).toEqual(false); expect(metrics[1].markPrice).toEqual('869762'); expect(metrics[1].marketId).toEqual( diff --git a/libs/positions/src/lib/positions-data-providers.ts b/libs/positions/src/lib/positions-data-providers.ts index a75157763..a25e66892 100644 --- a/libs/positions/src/lib/positions-data-providers.ts +++ b/libs/positions/src/lib/positions-data-providers.ts @@ -67,7 +67,6 @@ export interface Position { positionDecimalPlaces: number; totalBalance: string; assetSymbol: string; - liquidationPrice: string | undefined; lowMarginLevel: boolean; marketId: string; marketTradingMode: Schema.MarketTradingMode; @@ -140,7 +139,6 @@ export const getMetrics = ( ? new BigNumber(0) : marginAccountBalance.dividedBy(totalBalance).multipliedBy(100); - const marginMaintenance = toBigNum(marginLevel.maintenanceLevel, decimals); const marginSearch = toBigNum(marginLevel.searchLevel, decimals); const marginInitial = toBigNum(marginLevel.initialLevel, decimals); @@ -151,17 +149,6 @@ export const getMetrics = ( .plus(markPrice) : undefined; - const liquidationPrice = markPrice - ? BigNumber.maximum( - 0, - marginMaintenance - .minus(marginAccountBalance) - .minus(generalAccountBalance) - .dividedBy(openVolume) - .plus(markPrice) - ) - : undefined; - const lowMarginLevel = marginAccountBalance.isLessThan( marginSearch.plus(marginInitial.minus(marginSearch).dividedBy(2)) @@ -180,9 +167,6 @@ export const getMetrics = ( market.tradableInstrument.instrument.product.settlementAsset.symbol, totalBalance: totalBalance.multipliedBy(10 ** decimals).toFixed(), lowMarginLevel, - liquidationPrice: liquidationPrice - ? liquidationPrice.multipliedBy(10 ** marketDecimalPlaces).toFixed(0) - : undefined, marketId: market.id, marketTradingMode: market.tradingMode, markPrice: marketData ? marketData.markPrice : undefined, diff --git a/libs/positions/src/lib/positions-table.spec.tsx b/libs/positions/src/lib/positions-table.spec.tsx index 2dde68a29..e5fa8cddb 100644 --- a/libs/positions/src/lib/positions-table.spec.tsx +++ b/libs/positions/src/lib/positions-table.spec.tsx @@ -17,7 +17,6 @@ const singleRow: Position = { decimals: 2, totalBalance: '123456', assetSymbol: 'BTC', - liquidationPrice: '83', lowMarginLevel: false, marketId: 'string', marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS, @@ -50,7 +49,7 @@ it('render correct columns', async () => { }); const headers = screen.getAllByRole('columnheader'); - expect(headers).toHaveLength(12); + expect(headers).toHaveLength(11); expect( headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim()) ).toEqual([ @@ -60,7 +59,6 @@ it('render correct columns', async () => { 'Mark price', 'Settlement asset', 'Entry price', - 'Liquidation price (est)', 'Leverage', 'Margin allocated', 'Realised PNL', @@ -146,33 +144,12 @@ it('displays mark price', async () => { expect(cells[3].textContent).toEqual('-'); }); -it("displays properly entry, liquidation price and liquidation bar and it's intent", async () => { - let result: RenderResult; - await act(async () => { - result = render( - <PositionsTable rowData={singleRowData} isReadOnly={false} /> - ); - }); - let cells = screen.getAllByRole('gridcell'); - const entryPrice = cells[5].firstElementChild?.firstElementChild?.textContent; - expect(entryPrice).toEqual('13.3'); - await act(async () => { - result.rerender( - <PositionsTable - rowData={[{ ...singleRow, lowMarginLevel: true }]} - isReadOnly={false} - /> - ); - }); - cells = screen.getAllByRole('gridcell'); -}); - it('displays leverage', async () => { await act(async () => { render(<PositionsTable rowData={singleRowData} isReadOnly={false} />); }); const cells = screen.getAllByRole('gridcell'); - expect(cells[7].textContent).toEqual('1.1'); + expect(cells[6].textContent).toEqual('1.1'); }); it('displays allocated margin', async () => { @@ -180,7 +157,7 @@ it('displays allocated margin', async () => { render(<PositionsTable rowData={singleRowData} isReadOnly={false} />); }); const cells = screen.getAllByRole('gridcell'); - const cell = cells[8]; + const cell = cells[7]; expect(cell.textContent).toEqual('123,456.00'); }); @@ -189,8 +166,7 @@ it('displays realised and unrealised PNL', async () => { render(<PositionsTable rowData={singleRowData} isReadOnly={false} />); }); const cells = screen.getAllByRole('gridcell'); - expect(cells[9].textContent).toEqual('1.23'); - expect(cells[10].textContent).toEqual('4.56'); + expect(cells[9].textContent).toEqual('4.56'); }); it('displays close button', async () => { @@ -206,7 +182,7 @@ it('displays close button', async () => { ); }); const cells = screen.getAllByRole('gridcell'); - expect(cells[12].textContent).toEqual('Close'); + expect(cells[11].textContent).toEqual('Close'); }); it('do not display close button if openVolume is zero', async () => { @@ -222,7 +198,7 @@ it('do not display close button if openVolume is zero', async () => { ); }); const cells = screen.getAllByRole('gridcell'); - expect(cells[12].textContent).toEqual(''); + expect(cells[11].textContent).toEqual(''); }); describe('PNLCell', () => { diff --git a/libs/positions/src/lib/positions-table.stories.tsx b/libs/positions/src/lib/positions-table.stories.tsx index 07b5044b4..0fcd1f2ae 100644 --- a/libs/positions/src/lib/positions-table.stories.tsx +++ b/libs/positions/src/lib/positions-table.stories.tsx @@ -9,7 +9,9 @@ export default { title: 'PositionsTable', } as Meta; -const Template: Story = (args) => <PositionsTable {...args} />; +const Template: Story = (args) => ( + <PositionsTable {...args} isReadOnly={false} /> +); export const Primary = Template.bind({}); const longPosition: Position = { @@ -27,7 +29,6 @@ const longPosition: Position = { // leverageMaintenance: '0', // leverageRelease: '0', // leverageSearch: '0', - liquidationPrice: '1129935', lowMarginLevel: false, marginAccountBalance: new BigNumber('0').toString(), // marginMaintenance: '0', @@ -42,6 +43,8 @@ const longPosition: Position = { unrealisedPNL: '45', searchPrice: '1132123', updatedAt: '2022-07-27T15:02:58.400Z', + lossSocializationAmount: '0', + status: Schema.PositionStatus.POSITION_STATUS_UNSPECIFIED, }; const shortPosition: Position = { @@ -59,7 +62,6 @@ const shortPosition: Position = { // leverageMaintenance: '0', // leverageRelease: '0', // leverageSearch: '0', - liquidationPrice: '23734', lowMarginLevel: false, marginAccountBalance: new BigNumber('0').toString(), // marginMaintenance: '0', @@ -74,6 +76,8 @@ const shortPosition: Position = { unrealisedPNL: '0', searchPrice: '0', updatedAt: '2022-07-26T14:01:34.800Z', + lossSocializationAmount: '0', + status: Schema.PositionStatus.POSITION_STATUS_UNSPECIFIED, }; Primary.args = { diff --git a/libs/positions/src/lib/positions-table.tsx b/libs/positions/src/lib/positions-table.tsx index 3167e1ef0..71a1da69d 100644 --- a/libs/positions/src/lib/positions-table.tsx +++ b/libs/positions/src/lib/positions-table.tsx @@ -249,40 +249,6 @@ export const PositionsTable = forwardRef<AgGridReact, Props>( ); }} /> - <AgGridColumn - headerName={t('Liquidation price (est)')} - field="liquidationPrice" - type="rightAligned" - cellRendererSelector={(): CellRendererSelectorResult => { - return { - component: PriceFlashCell, - }; - }} - filter="agNumberColumnFilter" - valueGetter={({ - data, - }: VegaValueGetterParams<Position, 'liquidationPrice'>) => { - return data?.liquidationPrice === undefined || !data - ? undefined - : toBigNum( - data.liquidationPrice, - data.marketDecimalPlaces - ).toNumber(); - }} - valueFormatter={({ - data, - }: VegaValueFormatterParams<Position, 'liquidationPrice'>): - | string - | undefined => { - if (!data || data?.liquidationPrice === undefined) { - return undefined; - } - return addDecimalsFormatNumber( - data.liquidationPrice, - data.marketDecimalPlaces - ); - }} - /> <AgGridColumn headerName={t('Leverage')} field="currentLeverage" diff --git a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx index 13379bac5..5f0885541 100644 --- a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx +++ b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx @@ -73,7 +73,7 @@ export const DropdownMenuContent = forwardRef< <DropdownMenuPrimitive.Content {...contentProps} ref={forwardedRef} - className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded z-20" + className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded z-20 dark:text-black" align="start" sideOffset={10} /> diff --git a/libs/ui-toolkit/src/components/progress-bar/grid-progress-bar.tsx b/libs/ui-toolkit/src/components/progress-bar/grid-progress-bar.tsx index 70b4f66a8..c246a457f 100644 --- a/libs/ui-toolkit/src/components/progress-bar/grid-progress-bar.tsx +++ b/libs/ui-toolkit/src/components/progress-bar/grid-progress-bar.tsx @@ -20,8 +20,9 @@ export const ProgressBarCell = ({ valueFormatted }: ValueProps) => { return valueFormatted ? ( <> <div className="flex justify-between leading-tight font-mono"> - <div>{valueFormatted.low}</div> - <div>{valueFormatted.high}</div> + <div> + {valueFormatted.low} ({valueFormatted.value}%) + </div> </div> <ProgressBar value={valueFormatted.value}