Merge branch 'release/4.7.0' into update-develop-with-release-4.7.0

input-output-hk · Jan 18, 2022 · 6a55a86 · 6a55a86
2 parents 7ec4afd + 2870012
commit 6a55a86
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## vNext
+## 4.7.0
+
+### Features
+
+- Updated Catalyst dates ([PR 2812](https://github.com/input-output-hk/daedalus/pull/2812))
 
 ### Fixes
 

diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -152,6 +152,8 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*"/keccak.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 
 # Sign the whole component deeply
 sign_cmd "$ABS_PATH"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

diff --git a/source/renderer/app/config/votingConfig.js b/source/renderer/app/config/votingConfig.js
@@ -10,8 +10,8 @@ export const VOTING_REGISTRATION_MIN_TRANSACTION_CONFIRMATIONS = isDev ? 2 : 10;
 export const VOTING_REGISTRATION_TRANSACTION_POLLING_INTERVAL = 1000; // 1 second | unit: milliseconds
 export const VOTING_PHASE_CHECK_INTERVAL = 60000; // 60 seconds | unit: milliseconds
 export const VOTING_SNAPSHOT_DATE = new Date('Jan 6, 2022, 11:00 UTC');
-export const VOTING_CAST_START_DATE = new Date('Jan 13, 2022, 11:00 UTC');
-export const VOTING_CAST_END_DATE = new Date('Jan 27, 2022, 11:00 UTC');
-export const VOTING_RESULTS_DATE = new Date('Feb 3, 2022');
+export const VOTING_CAST_START_DATE = new Date('Jan 20, 2022, 11:00 UTC');
+export const VOTING_CAST_END_DATE = new Date('Feb 3, 2022, 11:00 UTC');
+export const VOTING_RESULTS_DATE = new Date('Feb 10, 2022');
 export const VOTING_NEW_SNAPSHOT_DATE = new Date('Apr 7, 2022, 11:00 UTC');
 export const VOTING_REWARD = 1040000; // 1,040,000 USD | Unit: dollar