Skip to content

HIP-1056 Account BlockItem to RecordItem transformers #10314

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

Merged
merged 10 commits into from
Feb 13, 2025
Merged

HIP-1056 Account BlockItem to RecordItem transformers #10314

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b7f1cfd
Added Account Transformers and tests.
HarshSawarkar Feb 6, 2025
b3d3ce1
Merge branch 'main' of https://github.com/hashgraph/hedera-mirror-nod…
HarshSawarkar Feb 7, 2025
509ebbb
Merge branch 'main' of https://github.com/hashgraph/hedera-mirror-nod…
HarshSawarkar Feb 11, 2025
6cd489e
Updated the CryptoCreateTransformer and CryptoUpdateTransformer to ad…
HarshSawarkar Feb 11, 2025
13de9d8
Removed unnecessary code.
HarshSawarkar Feb 11, 2025
40dd308
Adding test for evmAddress changes.
HarshSawarkar Feb 12, 2025
90d7bd7
Adding test for evmAddress changes.
HarshSawarkar Feb 13, 2025
f4b8e0f
Updated the transformer for transactionBody argument.
HarshSawarkar Feb 13, 2025
04b5546
Merge branch 'main' of https://github.com/hashgraph/hedera-mirror-nod…
HarshSawarkar Feb 13, 2025
8f130fb
Fixed Spotless error.
HarshSawarkar Feb 13, 2025
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: 5 additions & 1 deletion ...com/hedera/mirror/importer/downloader/block/transformer/AbstractBlockItemTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public TransactionRecord getTransactionRecord(BlockItem blockItem, TransactionBo
transactionRecordBuilder.setScheduleRef(transactionResult.getScheduleRef());
}

updateTransactionRecord(blockItem, transactionRecordBuilder);
updateTransactionRecord(blockItem, transactionBody, transactionRecordBuilder);
return transactionRecordBuilder.build();
}

Expand All @@ -64,4 +64,8 @@ protected void updateTransactionRecord(BlockItem blockItem, TransactionRecord.Bu
private ByteString calculateTransactionHash(ByteString signedTransactionBytes) {
return DomainUtils.fromBytes(DIGEST.digest(DomainUtils.toBytes(signedTransactionBytes)));
}

protected void updateTransactionRecord(BlockItem blockItem, TransactionBody transactionBody, TransactionRecord.Builder transactionRecordBuilder){
updateTransactionRecord(blockItem, transactionRecordBuilder);
}
}
58 changes: 58 additions & 0 deletions ...java/com/hedera/mirror/importer/downloader/block/transformer/CryptoCreateTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Copyright (C) 2025 Hedera Hashgraph, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.hedera.mirror.importer.downloader.block.transformer;

import static com.hedera.hapi.block.stream.output.protoc.StateIdentifier.STATE_ID_ALIASES;

import com.hedera.mirror.common.domain.transaction.BlockItem;
import com.hedera.mirror.common.domain.transaction.TransactionType;
import com.hedera.mirror.common.util.DomainUtils;
import com.hederahashgraph.api.proto.java.TransactionBody;
import com.hederahashgraph.api.proto.java.TransactionRecord;
import jakarta.inject.Named;

@Named
final class CryptoCreateTransformer extends AbstractBlockItemTransformer {

@Override
protected void updateTransactionRecord(BlockItem blockItem, TransactionBody transactionBody, TransactionRecord.Builder transactionRecordBuilder) {
if (!blockItem.successful()) {
return;
}

var alias = transactionBody.getCryptoCreateAccount().getAlias();
if (alias.size() == DomainUtils.EVM_ADDRESS_LENGTH) {
transactionRecordBuilder.setEvmAddress(alias);
}

var receiptBuilder = transactionRecordBuilder.getReceiptBuilder();
for (var transactionOutput : blockItem.transactionOutput()) {
if (transactionOutput.hasAccountCreate()) {
var output = transactionOutput.getAccountCreate();
if (output.hasCreatedAccountId()) {
receiptBuilder.setAccountID(output.getCreatedAccountId());
return;
}
}
}
}

@Override
public TransactionType getType() {
return TransactionType.CRYPTOCREATEACCOUNT;
}
}
221 changes: 221 additions & 0 deletions ...r/src/test/java/com/hedera/mirror/importer/downloader/block/BlockFileTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@
import com.hedera.mirror.importer.parser.domain.BlockItemBuilder;
import com.hedera.mirror.importer.parser.domain.RecordItemBuilder;
import com.hedera.mirror.importer.parser.domain.RecordItemBuilder.TransferType;
import com.hederahashgraph.api.proto.java.AccountID;
import com.hederahashgraph.api.proto.java.ResponseCodeEnum;
import com.hederahashgraph.api.proto.java.ScheduleID;
import com.hederahashgraph.api.proto.java.SignedTransaction;
import com.hederahashgraph.api.proto.java.Transaction;
import com.hederahashgraph.api.proto.java.TransactionBody;
import com.hederahashgraph.api.proto.java.TransactionID;
import com.hederahashgraph.api.proto.java.TransactionReceipt;
import com.hederahashgraph.api.proto.java.TransactionRecord;
Expand Down Expand Up @@ -109,6 +111,224 @@ void cryptoTransfer(TransferType transferType) {
});
}

@Test
void cryptoCreateTransform() {
var alias = recordItemBuilder.bytes(20);
var expectedRecordItem = recordItemBuilder
.cryptoCreate()
.record(r -> r.setEvmAddress(alias))
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);
var blockItem = blockItemBuilder.cryptoCreate(expectedRecordItem).build();
var expectedAccountId =
blockItem.transactionOutput().getFirst().getAccountCreate().getCreatedAccountId();

var blockFile = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFile);

// then
assertRecordFile(recordFile, blockFile, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash)
.returns(
expectedAccountId,
transactionRecord -> transactionRecord.getReceipt().getAccountID())
.returns(alias, TransactionRecord::getEvmAddress));
}

@Test
void cryptoCreateUnsuccessfulTransform() {
var expectedRecordItem = recordItemBuilder
.cryptoCreate()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.receipt(r -> r.clearAccountID().setStatus(ResponseCodeEnum.INVALID_TRANSACTION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);
var blockItem = blockItemBuilder.cryptoCreate(expectedRecordItem).build();

var blockFile = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFile);

// then
assertRecordFile(recordFile, blockFile, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash)
.returns(
AccountID.getDefaultInstance(),
transactionRecord -> transactionRecord.getReceipt().getAccountID()));
}

@Test
void cryptoUpdateTransform() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoUpdate()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void cryptoAddLiveHashTransform() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoAddLiveHash()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void cryptoDeleteLiveHashTransform() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoDeleteLiveHash()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void cryptoDeleteAllowanceTransform() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoDeleteAllowance()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void cryptoApproveAllowanceTransform() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoApproveAllowance()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void cryptoDelete() {
// given
var expectedRecordItem = recordItemBuilder
.cryptoDelete()
.recordItem(r -> r.hapiVersion(HAPI_VERSION))
.build();

var expectedTransactionHash = getExpectedTransactionHash(expectedRecordItem);

var blockItem = blockItemBuilder.defaultRecordItem(expectedRecordItem).build();
var blockFie = blockFileBuilder.items(List.of(blockItem)).build();

// when
var recordFile = blockFileTransformer.transform(blockFie);

// then
assertRecordFile(recordFile, blockFie, items -> assertThat(items)
.hasSize(1)
.first()
.satisfies(item -> assertRecordItem(item, expectedRecordItem))
.returns(null, RecordItem::getPrevious)
.extracting(RecordItem::getTransactionRecord)
.returns(expectedTransactionHash, TransactionRecord::getTransactionHash));
}

@Test
void corruptedTransactionBodyBytes() {
// given
Expand Down Expand Up @@ -743,6 +963,7 @@ private void assertRecordItem(RecordItem recordItem, RecordItem expectedRecordIt
"transactionRecord.transactionID_.memoizedSize",
"transactionRecord.transactionID_.transactionValidStart_.memoizedIsInitialized",
"transactionRecord.transactionID_.transactionValidStart_.memoizedSize",
"transactionRecord.receipt_.accountID_.memoizedHashCode",
"transactionRecord.receipt_.fileID_.memoizedHashCode",
"transactionRecord.receipt_.fileID_.memoizedSize",
"transactionRecord.receipt_.fileID_.memoizedIsInitialized",
Expand Down
30 changes: 30 additions & 0 deletions ...ror-importer/src/test/java/com/hedera/mirror/importer/parser/domain/BlockItemBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

package com.hedera.mirror.importer.parser.domain;

import static com.hedera.hapi.block.stream.output.protoc.StateIdentifier.STATE_ID_ALIASES;
import static com.hedera.hapi.block.stream.output.protoc.StateIdentifier.STATE_ID_SCHEDULES_BY_ID;

import com.hedera.hapi.block.stream.output.protoc.CallContractOutput;
import com.hedera.hapi.block.stream.output.protoc.CreateAccountOutput;
import com.hedera.hapi.block.stream.output.protoc.CreateScheduleOutput;
import com.hedera.hapi.block.stream.output.protoc.CryptoTransferOutput;
import com.hedera.hapi.block.stream.output.protoc.MapChangeKey;
Expand All @@ -34,7 +36,9 @@
import com.hedera.mirror.common.domain.transaction.BlockItem;
import com.hedera.mirror.common.domain.transaction.RecordItem;
import com.hedera.mirror.importer.util.Utility;
import com.hederahashgraph.api.proto.java.Account;
import com.hederahashgraph.api.proto.java.AssessedCustomFee;
import com.hederahashgraph.api.proto.java.CryptoCreate;
import com.hederahashgraph.api.proto.java.FileID;
import com.hederahashgraph.api.proto.java.Schedule;
import com.hederahashgraph.api.proto.java.Timestamp;
Expand Down Expand Up @@ -178,6 +182,27 @@ public BlockItemBuilder.Builder unknown(RecordItem recordItem) {
recordItem.getTransaction(), transactionResult(recordItem), List.of(), Collections.emptyList());
}

public BlockItemBuilder.Builder cryptoCreate() {
var recordItem = recordItemBuilder.cryptoCreate().build();
return cryptoCreate(recordItem);
}

public BlockItemBuilder.Builder cryptoCreate(RecordItem recordItem) {
var transactionRecord = recordItem.getTransactionRecord();
var accountId = transactionRecord.getReceipt().getAccountID();
var transactionOutput = TransactionOutput.newBuilder()
.setAccountCreate(CreateAccountOutput.newBuilder()
.setCreatedAccountId(accountId)
.build())
.build();

return new BlockItemBuilder.Builder(
recordItem.getTransaction(),
transactionResult(recordItem),
List.of(transactionOutput),
Collections.emptyList());
}

public Builder fileAppend(RecordItem recordItem) {
return new BlockItemBuilder.Builder(
recordItem.getTransaction(), transactionResult(recordItem), List.of(), Collections.emptyList());
Expand All @@ -200,6 +225,11 @@ public Builder fileUpdate(RecordItem recordItem) {
recordItem.getTransaction(), transactionResult(recordItem), List.of(), Collections.emptyList());
}

public BlockItemBuilder.Builder defaultRecordItem(RecordItem recordItem) {
return new BlockItemBuilder.Builder(
recordItem.getTransaction(), transactionResult(recordItem), List.of(), Collections.emptyList());
}

public Builder consensusCreateTopic(RecordItem recordItem) {
var id = recordItem.getTransactionRecord().getReceipt().getTopicID().getTopicNum();
var topicId = TopicID.newBuilder().setTopicNum(id).build();
Expand Down
Loading