Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #432

Merged
merged 2 commits into from
Aug 26, 2023
Merged

Develop #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd5bdd
add webView.isMessageChannelAlive check for reconnect
RomeroYang Aug 22, 2023
f9cc91f
release 3521
RomeroYang Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [3.5.2-beta]
20230822
1. bump sdk 0.5.5.
2. acala/karura plugin update.
3. add webview.isMessageChannelAlive check for reconnect.

# [3.5.1-beta]
20230726
1. bump sdk 0.5.4+7.
Expand Down
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3511;
CURRENT_PROJECT_VERSION = 3521;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -371,7 +371,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.5.1;
MARKETING_VERSION = 3.5.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -500,7 +500,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3511;
CURRENT_PROJECT_VERSION = 3521;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -519,7 +519,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.5.1;
MARKETING_VERSION = 3.5.2;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -541,7 +541,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3511;
CURRENT_PROJECT_VERSION = 3521;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -560,7 +560,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.5.1;
MARKETING_VERSION = 3.5.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
6 changes: 6 additions & 0 deletions lib/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,12 @@ class _WalletAppState extends State<WalletApp> with WidgetsBindingObserver {
}

_reconnectNode() async {
// isMessageChannelAlive = true means we have new message in last 10s.
if (_service.plugin.sdk.webView.isMessageChannelAlive) {
_startConnectionCheck();
return;
}

print('connection check failed, reconnecting...');
_restartPlugin();

Expand Down
2 changes: 1 addition & 1 deletion lib/common/consts.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const bridge_account = {
'acala': '13YMK2eYoAvStnzReuxBjMrAvPXmmdsURwZvc62PrdXimbNy'
};

const bridge_sdk_version = 35001;
const bridge_sdk_version = 35101;

const show_guide_status_key = 'show_guide_status';

Expand Down
16 changes: 8 additions & 8 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,11 +1147,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
resolved-ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
ref: "0c6d732657ade5ed5a3fdd1955a8dd27c837ece6"
resolved-ref: "0c6d732657ade5ed5a3fdd1955a8dd27c837ece6"
url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
source: git
version: "0.5.4"
version: "0.5.5"
polkawallet_plugin_bifrost:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1192,11 +1192,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "8c28e00da504c293b58215b1199fa3a09f90eabb"
resolved-ref: "8c28e00da504c293b58215b1199fa3a09f90eabb"
ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
resolved-ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
source: git
version: "0.5.4"
version: "0.5.5"
polkawallet_plugin_kusama:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1228,10 +1228,10 @@ packages:
dependency: "direct main"
description:
name: polkawallet_sdk
sha256: "101a9f943d41edceed0942dc3a54079b0f56490a1cd070ed5bacb6b1e8c6d47c"
sha256: e1998d6d17b2b4b3a18b0205ac6b6c29fef7e4af6244fdec10a6e8f2bbef4b60
url: "https://pub.dev"
source: hosted
version: "0.5.4+7"
version: "0.5.5"
polkawallet_ui:
dependency: "direct main"
description:
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.5.1+3511
version: 3.5.2+3521

environment:
sdk: ">=2.10.0 <3.0.0"
Expand Down Expand Up @@ -55,11 +55,11 @@ dependencies:
polkawallet_plugin_acala:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
ref: dcb50c9109ad07da48355281a5bef91e103b5cc4
ref: 0c6d732657ade5ed5a3fdd1955a8dd27c837ece6
polkawallet_plugin_karura:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
ref: 8c28e00da504c293b58215b1199fa3a09f90eabb
ref: af5c2f3a41ecbe443f615da9fd50fc13d2819671
polkawallet_plugin_evm:
git:
url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
Expand Down Expand Up @@ -112,7 +112,7 @@ dependency_overrides:
# polkawallet_plugin_evm:
# path: ../../coding/polkawallet/polkawallet_plugin_evm
polkawallet_ui: ^0.5.4+2
polkawallet_sdk: ^0.5.4+7
polkawallet_sdk: ^0.5.5
# polkawallet_ui:
# path: ../../coding/polkawallet/ui
# polkawallet_sdk:
Expand Down