Skip to content

Commit

Permalink
Merge pull request #324 from threshold-network/rewards-allocation-for…
Browse files Browse the repository at this point in the history
…-dec-1st

Rewards allocation for Dec 1st 2022

This commit adds a merkle tree computed in threshold-network/merkle-distribution
to Threshold Token Dashboard. It also sets the version of tbtc-v2.ts dependency
to 1.0.0-dev.11(from yarn.lock), this is the exact version used to build the
T-dapp in v1.3.x, to fix CI build. The build-and-test job fails because upgrades
the tbtc-v2.ts to the latest version with the development tag and the T-dapp is
not up to date with these changes. We do not want to bump dependencies on the
release branch. The mainnet and preview jobs builds the dapp with
--frozen-lockfile flag and yarn.lock points to the 1.0.0-dev.11. Thanks to this
all builds should use the same version 1.0.0-dev.11 of the tbtc-v2.ts
dependency.
  • Loading branch information
michalsmiarowski authored Dec 1, 2022
2 parents b33aa8d + 61d969a commit 2af8320
Show file tree
Hide file tree
Showing 4 changed files with 1,795 additions and 1,764 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@keep-network/random-beacon": "2.0.0",
"@keep-network/tbtc": "1.1.0",
"@keep-network/tbtc-v2": "development",
"@keep-network/tbtc-v2.ts": "development",
"@keep-network/tbtc-v2.ts": "1.0.0-dev.11",
"@ledgerhq/hw-app-eth": "^6.9.0",
"@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
"@ledgerhq/hw-transport-webhid": "^6.7.0",
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useNextRewardsDropDate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const rewardsDistributionDates = [
1667260800,
// 1 December 2022 00:00:00 GTM
1669852800,
// 1 January 2023 00:00:00 GTM
1672531200,
]

export const useNextRewardsDropDate = () => {
Expand Down
Loading

0 comments on commit 2af8320

Please sign in to comment.