Merge remote-tracking branch 'benma/adalite'

benma · benma · commit 472658b27acc · 2021-10-23T12:13:56.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.0
+
+- Whitelist adalite.io
+
 ## 1.4.0
 
 - Whitelist Chrome and Firefox extensions
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bitbox-bridge/Cargo.toml b/bitbox-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bitbox-bridge"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Niklas Claesson <nicke.claesson@gmail.com>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/bitbox-bridge/release/windows/wix/Product.wxs b/bitbox-bridge/release/windows/wix/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <!-- ProductCode should change with every release -->
-  <?define ProductCode = "{ddf4b648-48b7-4855-9945-6e9e81c4951b}"?>
+  <?define ProductCode = "{6a589df4-d463-443d-96ee-e0846f547bc9}"?>
   <!-- UpgradeCode should stay the same foverever (this is the real ID of the app)-->
   <?define UpgradeCode = "{dfe7eecb-5dc0-4c30-ba78-a9eff36efa31}"?>
 
diff --git a/bitbox-bridge/src/web.rs b/bitbox-bridge/src/web.rs
@@ -59,6 +59,8 @@ fn is_valid_origin(host: &str) -> bool {
         || host == "myetherwallet.com"
         || host.ends_with(".pocketbitcoin.com")
         || host == "pocketbitcoin.com"
+        || host.ends_with(".adalite.io")
+        || host == "adalite.io"
 }
 
 fn add_origin(

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ fn is_valid_origin(host: &str) -> bool {`
`59`	`59`	`\|\| host == "myetherwallet.com"`
`60`	`60`	`\|\| host.ends_with(".pocketbitcoin.com")`
`61`	`61`	`\|\| host == "pocketbitcoin.com"`
	`62`	`+ \|\| host.ends_with(".adalite.io")`
	`63`	`+ \|\| host == "adalite.io"`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`fn add_origin(`