fix consistency

Author: oXtxNt9U

packages/evm-service/source/instances/evm-contract-events.test.ts

@@ -59,7 +59,7 @@ describe<{
 		const [sender, other] = wallets;
 		const voter = getAddress(sender.address);
 		const validator = getAddress(other.address);
-		const blsPublicKey = `0x${"aa".repeat(48)}`;
+		const blsPublicKey = "aa".repeat(48);
 
 		const consensusContract = getContractAddress({ from: voter, nonce: 0n });
 		const usernamesContract = getContractAddress({ from: voter, nonce: 1n });
@@ -102,7 +102,7 @@ describe<{
 		const usernamesTxHash = getRandomTxHash();
 
 		for (const [nonce, txHash, to, functionName, args] of [
-			[2n, consensusTxHash, consensusContract, "emitConsensusEvents", [voter, validator, blsPublicKey]],
+			[2n, consensusTxHash, consensusContract, "emitConsensusEvents", [voter, validator, `0x${blsPublicKey}`]],
 			[3n, usernamesTxHash, usernamesContract, "emitUsernameEvents", [voter]],
 		] as const) {
 			const { receipt } = await evm.process({
@@ -127,27 +127,27 @@ describe<{
 		assert.equal(
 			events.map(normalize),
 			[
-				{ event: "Voted", txHash: `0x${consensusTxHash}`, txIndex: 0, validator, voter },
-				{ event: "Unvoted", txHash: `0x${consensusTxHash}`, txIndex: 0, validator, voter },
-				{ addr: voter, blsPublicKey, event: "ValidatorRegistered", txHash: `0x${consensusTxHash}`, txIndex: 0 },
-				{ addr: voter, event: "ValidatorResigned", txHash: `0x${consensusTxHash}`, txIndex: 0 },
-				{ addr: voter, blsPublicKey, event: "ValidatorUpdated", txHash: `0x${consensusTxHash}`, txIndex: 0 },
+				{ event: "Voted", txHash: consensusTxHash, txIndex: 0, validator, voter },
+				{ event: "Unvoted", txHash: consensusTxHash, txIndex: 0, validator, voter },
+				{ addr: voter, blsPublicKey, event: "ValidatorRegistered", txHash: consensusTxHash, txIndex: 0 },
+				{ addr: voter, event: "ValidatorResigned", txHash: consensusTxHash, txIndex: 0 },
+				{ addr: voter, blsPublicKey, event: "ValidatorUpdated", txHash: consensusTxHash, txIndex: 0 },
 				{
 					addr: voter,
 					event: "UsernameRegistered",
-					txHash: `0x${usernamesTxHash}`,
+					txHash: usernamesTxHash,
 					txIndex: 1,
 					username: "alice",
 				},
 				{
 					addr: voter,
 					event: "UsernameRegistered",
 					previousUsername: "alice",
-					txHash: `0x${usernamesTxHash}`,
+					txHash: usernamesTxHash,
 					txIndex: 1,
 					username: "bob",
 				},
-				{ addr: voter, event: "UsernameResigned", txHash: `0x${usernamesTxHash}`, txIndex: 1, username: "bob" },
+				{ addr: voter, event: "UsernameResigned", txHash: usernamesTxHash, txIndex: 1, username: "bob" },
 			].map(normalize),
 		);
 

packages/evm/bindings/src/result.rs

@@ -85,7 +85,7 @@ impl JsContractEvent {
     pub fn new(event: ContractEvent) -> Self {
         let mut js_event = Self {
             event: event.data.name().to_string(),
-            tx_hash: event.tx_hash.to_string(),
+            tx_hash: format!("{:x}", event.tx_hash),
             tx_index: event.tx_index,
             ..Default::default()
         };
@@ -105,7 +105,7 @@ impl JsContractEvent {
                 bls_public_key,
             } => {
                 js_event.addr = Some(addr.to_checksum(None));
-                js_event.bls_public_key = Some(bls_public_key.to_string());
+                js_event.bls_public_key = Some(bls_public_key.encode_hex());
             }
             ContractEventData::ValidatorResigned { addr } => {
                 js_event.addr = Some(addr.to_checksum(None));

packages/processor/source/block-processor.test.ts

@@ -18,8 +18,8 @@ describe<{
 
 	const blockData = { hash: blockHash, number: 3 };
 	const contractEvents: Contracts.Evm.ContractEvent[] = [
-		{ event: "Voted", txHash: `0x${"1".repeat(64)}`, txIndex: 0, validator, voter },
-		{ addr: validator, event: "ValidatorResigned", txHash: `0x${"2".repeat(64)}`, txIndex: 1 },
+		{ event: "Voted", txHash: "1".repeat(64), txIndex: 0, validator, voter },
+		{ addr: validator, event: "ValidatorResigned", txHash: "2".repeat(64), txIndex: 1 },
 	];
 
 	beforeEach((context) => {