Merge remote-tracking branch 'origin/main' into chore/chrysalis-upgra…

…de-bindings

.github/workflows/ci.test.yml

@@ -1,6 +1,6 @@
 name: Test
 
-on: 
+on:
   pull_request:
   push:
     branches:

manual-patches/neon_temp_buf.patch

@@ -0,0 +1,13 @@
+diff --git a/native/src/neon.cc b/native/src/neon.cc
+index 7b2981b..164d3cc 100644
+--- a/native/src/neon.cc
++++ b/native/src/neon.cc
+@@ -227,7 +227,7 @@ extern "C" size_t Neon_ArrayBuffer_Data(v8::Isolate *isolate, void **base_out, v
+   // the contents.
+   //
+   // https://github.com/electron/electron/issues/29893
+-  #if _MSC_VER && NODE_MODULE_VERSION >= 89
++  #if _MSC_VER && NODE_MODULE_VERSION >= 87
+     v8::Local<v8::Object> local;
+     node::Buffer::New(isolate, buffer, 0, buffer->ByteLength()).ToLocal(&local);
+     return Neon_Buffer_Data(isolate, base_out, local);

manual-patches/openssl_fips.patch

@@ -0,0 +1,13 @@
+diff --git a/gyp/pylib/gyp/input.py b/gyp/pylib/gyp/input.py
+index d9699a0..e51ee7b 100644
+--- a/gyp/pylib/gyp/input.py
++++ b/gyp/pylib/gyp/input.py
+@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
+         else:
+             ast_code = compile(cond_expr_expanded, "<string>", "eval")
+             cached_conditions_asts[cond_expr_expanded] = ast_code
+-        env = {"__builtins__": {}, "v": StrictVersion}
++        env = {"__builtins__": {"openssl_fips": ""}, "v": StrictVersion}
+         if eval(ast_code, env, variables):
+             return true_dict
+         return false_dict

manual-patches/windows_cargo_toml.patch

@@ -0,0 +1,20 @@
+diff --git a/packages/backend/bindings/node/native/Cargo.toml b/packages/backend/bindings/node/native/Cargo.toml
+index 0292e483b..dfb22776e 100644
+--- a/packages/backend/bindings/node/native/Cargo.toml
++++ b/packages/backend/bindings/node/native/Cargo.toml
+@@ -22,6 +22,15 @@ tokio = { version = "1.28.0", default-features = false }
+ once_cell = { version = "1.8.0", default-features = false }
+ firefly-actor-system = { path = "../../.." }
+
++[package.metadata.patch.neon-sys]
++version = "0.10.1"
++patches = [
++    { path = "neon_temp_buf.patch", source = "GithubPrDiff" },
++]
++
++[patch.crates-io]
++neon-sys = { path = './target/patch/neon-sys-0.10.1' }
++
+ [profile.release]
+ # Build with debug symbols included
+ debug = true

packages/backend/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 exclude = ["/bindings", "/api-wrapper"]
 
 [dependencies]
-tokio = { version = "1.12.0", default-features = false }
+tokio = { version = "1.28.0", default-features = false }
 once_cell = { version = "1.8.0", default-features = false }
 
 iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", branch = "firefly-desktop", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }

packages/backend/bindings/node/native/Cargo.toml

@@ -12,14 +12,14 @@ name = "node_neon"
 crate-type = ["cdylib"]
 
 [build-dependencies]
-neon-build = "0.5.0"
+neon-build = "0.10.1"
 
 [dependencies]
 iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", branch = "firefly-desktop", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
 futures = { version = "0.3.17", default-features = false }
-neon = "0.5.0"
+neon = "0.10.1"
 serde_json = { version = "1.0.68", default-features = false }
-tokio = { version = "1.12.0", default-features = false }
+tokio = { version = "1.28.0", default-features = false }
 once_cell = { version = "1.8.0", default-features = false }
 firefly-actor-system = { path = "../../.." }
 

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "description": "Official IOTA wallet on desktop",
     "main": "public/build/main.js",
     "repository": "[email protected]:iotaledger/firefly.git",

packages/shared/lib/participation/constants.ts

@@ -5,12 +5,12 @@ import { Participation, StakingAirdrop } from './types'
 /**
  * The starting date of the next staking period.
  */
-export const ASSEMBLY_EVENT_START_DATE = new Date('February 11, 2023')
+export const ASSEMBLY_EVENT_START_DATE = new Date('May 19, 2023')
 
 /**
  * The staking event ID for Assembly.
  */
-export const ASSEMBLY_EVENT_ID = 'e4a155210e0bc125b489e4d49cdb82368e19682b29e7da9a6d4f2ca2a8bd25b9'
+export const ASSEMBLY_EVENT_ID = 'a0e2605db376b5236961e0b05c753700fc8d6b061bd4564289fcfda936bcd59b'
 
 /**
  * The staking event ID for Shimmer.
@@ -50,7 +50,7 @@ export const STAKING_AIRDROP_TOKENS: { [key in StakingAirdrop]: string } = {
  */
 export const PARTICIPATION_POLL_DURATION = 10 * MILLISECONDS_PER_SECOND
 
-export const ASSEMBLY_STAKING_BLOG_POST_URL = 'https://blog.iota.org/iota-staking-for-assembly-round-5/'
+export const ASSEMBLY_STAKING_BLOG_POST_URL = 'https://blog.iota.org/iota-staking-for-assembly-round-6/'
 
 export const REMOTE_STAKING_RESULT_URL: string =
     'https://raw.githubusercontent.com/iotaledger/participation-events/master/results/staking/'
@@ -71,6 +71,7 @@ export const ASSEMBLY_STAKING_RESULT_FILES: string[] = [
     'assembly_02.json',
     'assembly_03.json',
     'assembly_04.json',
+    'assembly_05.json',
 ]
 
 /**
@@ -81,13 +82,13 @@ export const SHIMMER_STAKING_RESULT_FILES: string[] = ['shimmer.json']
 /**
  * The number of the last completed Assembly staking period.
  */
-export const LAST_ASSEMBLY_STAKING_PERIOD = 4
+export const LAST_ASSEMBLY_STAKING_PERIOD = 5
 
 /**
  * The number of the current Assembly staking period.
  * Set to 0 if no current event
  */
-export const CURRENT_ASSEMBLY_STAKING_PERIOD = 5
+export const CURRENT_ASSEMBLY_STAKING_PERIOD = 6
 
 /**
  * The number of the last completed Shimmer staking period.