fix: Eth sign message not work for normal messages (#24)

SimplioOfficial · Nov 3, 2022 · 7244fa7 · 7244fa7
1 parent 332a771
commit 7244fa7
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.1.8
+* Fix Eth sign normal messages (not converted already to hex by the Dapp)
 ## 1.1.7
 * Add supported network check
 ## 1.1.6

diff --git a/example/integration_tests/on_emulator_test.dart b/example/integration_tests/on_emulator_test.dart
@@ -1617,6 +1617,14 @@ void main() {
           ),
           equals(
               '0xce929bf4483308f0e23752d43cb45def3bfafefdaba1b328d8121969ac303fd955acc4dd5520f585ee3691e04e0917f99360fa24a8280805ff25aa879fb83ae81c'));
+      expect(
+          EthSign.message(
+            wallet: wallet,
+            networkId: TWCoinType.TWCoinTypeEthereum,
+            message: 'We are Simplio!',
+          ),
+          equals(
+              '0xc925dc32a276bb6e4089bc161022f6a25819c29a31cf36fdcbcb489dba6f0e5105d77f17a021322f7cfa224a1f962929ff626396d886dd7d0af0bee946d1278d1b'));
     });
     test('Test personalMessage return correct signature', () {
       expect(
@@ -1628,6 +1636,14 @@ void main() {
           ),
           equals(
               '0x2913768a701ea3bea19b5d61d4b70758bf6b805869dea9425edc18e2efa2aa5c61add9bef273d29b4633972a1f35cc5efec23d7c8aeab358efedc2024d555bb01b'));
+      expect(
+          EthSign.personalMessage(
+            wallet: wallet,
+            networkId: TWCoinType.TWCoinTypeEthereum,
+            message: 'We are Simplio!',
+          ),
+          equals(
+              '0x6ac9dd87d1c807a5f69c7fb4b72992a25cf2eafcd2063ceda8b273950e43a95533219e419a0a9201691da1fc128716d282e83c6e9c1bcf3a453805ce628215701b'));
     });
   });
 }
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -375,7 +375,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.7"
+    version: "1.1.8"
   sky_engine:
     dependency: transitive
     description: flutter

diff --git a/lib/src/signing.dart b/lib/src/signing.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:convert/convert.dart';
@@ -35,10 +36,14 @@ class EthSign {
     required int networkId,
     required String message,
   }) {
+    String hexMessage = message;
+    if (message.substring(0, 2) != '0x') {
+      hexMessage = '0x${hex.encode(utf8.encode(message))}';
+    }
     return EthSigUtil.signMessage(
       privateKeyInBytes: wallet.getKeyForCoin(networkId).data(),
       message: Uint8List.fromList(hex.decode(
-        message.substring(2, message.length),
+        hexMessage.substring(2),
       )),
     );
   }
@@ -48,10 +53,14 @@ class EthSign {
     required int networkId,
     required String message,
   }) {
+    String hexMessage = message;
+    if (message.substring(0, 2) != '0x') {
+      hexMessage = '0x${hex.encode(utf8.encode(message))}';
+    }
     return EthSigUtil.signPersonalMessage(
       privateKeyInBytes: wallet.getKeyForCoin(networkId).data(),
       message: Uint8List.fromList(hex.decode(
-        message.substring(2, message.length),
+        hexMessage.substring(2),
       )),
     );
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sio_core_light
 description: Simplio wallet core library for building blockchain transactions, developed in Dart, can be used in Flutter framework.
-version: 1.1.7
+version: 1.1.8
 repository: https://github.com/SimplioOfficial/sio_core_light
 
 environment: