From 3825bf0488238d120dc85b08bc11a14f4923a66a Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Thu, 8 Sep 2022 20:15:19 +0200
Subject: [PATCH] fix revocation payload

---
 integration_test/identity_revocation.dart | 7 +++----
 lib/providers/substrate_sdk.dart          | 6 +++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/integration_test/identity_revocation.dart b/integration_test/identity_revocation.dart
index a9fd912..d66a408 100644
--- a/integration_test/identity_revocation.dart
+++ b/integration_test/identity_revocation.dart
@@ -1,6 +1,5 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:integration_test/integration_test.dart';
 import 'general_actions.dart';
@@ -10,7 +9,7 @@ void main() async {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   await dotenv.load();
 
-  testWidgets('Certifications state', (testerLoc) async {
+  testWidgets('Identity revocation', (testerLoc) async {
     tester = testerLoc;
     // Connect local node and import test chest in background
     await bkFastStart();
@@ -19,13 +18,13 @@ void main() async {
     await firstOpenChest();
 
     // Revoke test3
-    await spawnBlock(number: 5);
+    await spawnBlock();
     await tapKey(keyOpenWallet(test3.address));
     await tapKey(keyManageMembership);
     await tapKey(keyRevokeIdty);
     await tapKey(keyConfirm);
     spawnBlock(duration: 2000);
-    await waitFor('validé !', timeout: const Duration(seconds: 1));
+    await waitFor('validé !', timeout: const Duration(seconds: 4));
     await tapKey(keyCloseTransactionScreen, duration: 0);
     await waitFor('Membre validé !', reverse: true);
   }, timeout: testTimeout());
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 9a6f7e5..9aa2006 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -851,8 +851,9 @@ newKeySig: $newKeySig""");
     final genesisHash = HEX.decode(genesisHashString.substring(2)) as Uint8List;
     final idtyIndexBytes = _int32bytes(idtyIndex);
     // final pubkey = await addressToPubkey(address);
+    // final pubkeyHexa = '0x${HEX.encode(pubkey)}';
     final messageToSign =
-        Uint8List.fromList(prefix + idtyIndexBytes + genesisHash);
+        Uint8List.fromList(prefix + genesisHash + idtyIndexBytes);
     final revocationSig = await _signMessage(messageToSign, address, password);
 
     final txInfo = TxInfoData(
@@ -861,6 +862,9 @@ newKeySig: $newKeySig""");
       sender,
     );
 
+    log.d('''DEBUGG: messageToSign: $messageToSign
+revocationSig: $revocationSig''');
+
     final txOptions = [idtyIndex, address, revocationSig];
     return await _executeCall(txInfo, txOptions, password);
   }