feat: (cherry-pick) try using non-zero realm/shard (#18732)

Signed-off-by: Luke Lee <[email protected]>
Signed-off-by: Valentin Tronkov <[email protected]>
Signed-off-by: Zhivko Kelchev <[email protected]>
Signed-off-by: ibankov <[email protected]>
Signed-off-by: Neeharika-Sompalli <[email protected]>
Signed-off-by: Derek Riley <[email protected]>
Co-authored-by: lukelee-sl <[email protected]>
Co-authored-by: Valentin Tronkov <[email protected]>
Co-authored-by: Zhivko Kelchev <[email protected]>
Co-authored-by: ibankov <[email protected]>
Co-authored-by: Valentin Tronkov <[email protected]>
Co-authored-by: Neeharika-Sompalli <[email protected]>
Co-authored-by: Neeharika Sompalli <[email protected]>

Author: 6 people

hedera-node/configuration/dev/application.properties

@@ -14,6 +14,8 @@ staking.fees.stakingRewardPercentage=10
 # Needed for Restart and Reconnect HapiTests that run many transactions of each type
 bootstrap.throttleDefsJson.resource=genesis/throttles-dev.json
 ledger.id=0x03
+hedera.shard=0
+hedera.realm=0
 blockStream.streamMode=BOTH
 nodes.enableDAB=true
 blockStream.blockFileDir=data/blockStreams

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockImplUtils.java

@@ -78,7 +78,7 @@
 public class BlockImplUtils {
     private static final int UNKNOWN_STATE_ID = -1;
     private static final IntFunction<String> UPGRADE_DATA_FILE_FORMAT =
-            n -> String.format("UPGRADE_DATA\\[FileID\\[shardNum=\\d, realmNum=\\d, fileNum=%s]]", n);
+            n -> String.format("UPGRADE_DATA\\[FileID\\[shardNum=\\d+, realmNum=\\d+, fileNum=%s]]", n);
 
     /**
      * Prevent instantiation

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/StateNetworkInfo.java

@@ -14,9 +14,11 @@
 import com.hedera.node.app.ids.schemas.V0590EntityIdSchema;
 import com.hedera.node.app.service.addressbook.AddressBookService;
 import com.hedera.node.config.ConfigProvider;
+import com.hedera.node.config.data.HederaConfig;
 import com.hedera.node.config.data.LedgerConfig;
 import com.hedera.node.internal.network.Network;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
+import com.swirlds.config.api.Configuration;
 import com.swirlds.state.State;
 import com.swirlds.state.lifecycle.info.NetworkInfo;
 import com.swirlds.state.lifecycle.info.NodeInfo;
@@ -62,6 +64,8 @@ public class StateNetworkInfo implements NetworkInfo {
      */
     private volatile Map<Long, NodeInfo> nodeInfos;
 
+    private final Configuration configuration;
+
     /**
      * Constructs a new network information provider from the given state, roster, selfID, and configuration provider.
      *
@@ -81,6 +85,7 @@ public StateNetworkInfo(
         requireNonNull(configProvider);
         this.activeRoster = requireNonNull(roster);
         this.genesisNetworkSupplier = requireNonNull(genesisNetworkSupplier);
+        this.configuration = configProvider.getConfiguration();
         this.ledgerId = configProvider
                 .getConfiguration()
                 .getConfigData(LedgerConfig.class)
@@ -155,6 +160,7 @@ private Map<Long, NodeInfo> nodeInfosFrom(@NonNull final State state) {
         } else {
             final ReadableKVState<EntityNumber, Node> nodes =
                     state.getReadableStates(AddressBookService.NAME).get(NODES_KEY);
+            final var hederaConfig = configuration.getConfigData(HederaConfig.class);
             for (final var rosterEntry : activeRoster.rosterEntries()) {
                 // At genesis the node store is derived from the roster, hence must have info for every
                 // node id; and from then on, the roster is derived from the node store, and hence the
@@ -171,6 +177,8 @@ private Map<Long, NodeInfo> nodeInfosFrom(@NonNull final State state) {
                             fromRosterEntry(
                                     rosterEntry,
                                     AccountID.newBuilder()
+                                            .shardNum(hederaConfig.shard())
+                                            .realmNum(hederaConfig.realm())
                                             .accountNum(rosterEntry.nodeId() + 3)
                                             .build()));
                     log.error("Roster includes a node {} that is not found in node store", rosterEntry.nodeId());

hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/handle/steps/HollowAccountCompletionsTest.java

@@ -30,6 +30,7 @@
 import com.hedera.node.app.service.token.ReadableAccountStore;
 import com.hedera.node.app.signature.AppKeyVerifier;
 import com.hedera.node.app.signature.impl.SignatureVerificationImpl;
+import com.hedera.node.app.spi.fixtures.ids.FakeEntityIdFactoryImpl;
 import com.hedera.node.app.spi.signatures.SignatureVerification;
 import com.hedera.node.app.spi.workflows.HandleContext;
 import com.hedera.node.app.store.ReadableStoreFactory;
@@ -38,6 +39,7 @@
 import com.hedera.node.app.workflows.handle.record.RecordStreamBuilder;
 import com.hedera.node.app.workflows.handle.stack.SavepointStackImpl;
 import com.hedera.node.app.workflows.prehandle.PreHandleResult;
+import com.hedera.node.config.data.HederaConfig;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import java.time.Instant;
 import java.util.Collections;
@@ -189,15 +191,18 @@ void skipDummyHollowAccountsFromCryptoCreateHandler() {
     void completeHollowAccountsWithEthereumTransaction() {
         when(parentTxn.functionality()).thenReturn(ETHEREUM_TRANSACTION);
         final var alias = Bytes.fromHex("89abcdef89abcdef89abcdef89abcdef89abcdef");
-        final var hollowId = AccountID.newBuilder().accountNum(1234).build();
+        final var hederaConfig = DEFAULT_CONFIG.getConfigData(HederaConfig.class);
+        final var idFactory = new FakeEntityIdFactoryImpl(hederaConfig.shard(), hederaConfig.realm());
+        final var hollowId = idFactory.newAccountId(1234);
         final var hollowAccount = Account.newBuilder()
                 .alias(alias)
                 .key(IMMUTABILITY_SENTINEL_KEY)
                 .accountId(hollowId)
                 .build();
         final var ethTxSigs = new EthTxSigs(Bytes.EMPTY.toByteArray(), alias.toByteArray());
         when(ethereumTransactionHandler.maybeEthTxSigsFor(any(), any(), any())).thenReturn(ethTxSigs);
-        when(accountStore.getAccountIDByAlias(0, 0, alias)).thenReturn(hollowId);
+        when(accountStore.getAccountIDByAlias(hederaConfig.shard(), hederaConfig.realm(), alias))
+                .thenReturn(hollowId);
         when(accountStore.getAccountById(hollowId)).thenReturn(hollowAccount);
         final var txnBody = TransactionBody.newBuilder()
                 .transactionID(TransactionID.newBuilder()

hedera-node/hedera-file-service-impl/build.gradle.kts

@@ -16,5 +16,5 @@ testModuleInfo {
     requires("org.junit.jupiter.api")
     requires("org.mockito")
     requires("org.mockito.junit.jupiter")
-    requires("com.swirlds.config.extensions.test.fixtures")
+    runtimeOnly("com.swirlds.config.extensions.test.fixtures")
 }

hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/FileTestBase.java

@@ -26,6 +26,7 @@
 import com.hedera.node.app.spi.ids.WritableEntityCounters;
 import com.hedera.node.app.spi.store.StoreFactory;
 import com.hedera.node.app.spi.workflows.HandleContext;
+import com.hedera.node.config.data.HederaConfig;
 import com.hedera.node.config.testfixtures.HederaTestConfigBuilder;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.config.api.Configuration;
@@ -102,10 +103,12 @@ public class FileTestBase {
 
     protected final KeyList anotherKeys = B_KEY_LIST.keyList();
 
-    private final long SHARD = 5L;
-    private final long REALM = 10L;
+    protected final long SHARD =
+            DEFAULT_CONFIG.getConfigData(HederaConfig.class).shard();
+    protected final long REALM =
+            DEFAULT_CONFIG.getConfigData(HederaConfig.class).realm();
 
-    private final EntityIdFactory idFactory = new FakeEntityIdFactoryImpl(SHARD, REALM);
+    protected final EntityIdFactory idFactory = new FakeEntityIdFactoryImpl(SHARD, REALM);
 
     protected final FileID WELL_KNOWN_FILE_ID = idFactory.newFileId(1_234L);
     protected final FileID WELL_KNOWN_UPGRADE_FILE_ID = idFactory.newFileId(150L);

hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/WritableUpgradeFileStoreTest.java

@@ -17,7 +17,7 @@
 @ExtendWith(MockitoExtension.class)
 class WritableUpgradeFileStoreTest extends FileTestBase {
     private File file;
-    protected final FileID UPGRADE_FILE_ID = new FileID(5, 10, 150);
+    protected final FileID UPGRADE_FILE_ID = new FileID(SHARD, REALM, 150);
 
     @Test
     void throwsIfNullValuesAsArgs() {

hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileCreateTest.java

@@ -36,7 +36,6 @@
 import com.hedera.node.app.service.file.impl.records.CreateFileStreamBuilder;
 import com.hedera.node.app.service.file.impl.test.FileTestBase;
 import com.hedera.node.app.service.token.ReadableAccountStore;
-import com.hedera.node.app.spi.fixtures.ids.FakeEntityIdFactoryImpl;
 import com.hedera.node.app.spi.fixtures.workflows.FakePreHandleContext;
 import com.hedera.node.app.spi.ids.EntityNumGenerator;
 import com.hedera.node.app.spi.validation.AttributeValidator;
@@ -52,7 +51,6 @@
 import com.hedera.node.config.types.LongPair;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.config.api.Configuration;
-import com.swirlds.state.lifecycle.EntityIdFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -97,9 +95,6 @@ class FileCreateTest extends FileTestBase {
     private WritableFileStore fileStore;
     private FileCreateHandler subject;
 
-    private long SHARD = 5L;
-    private long REALM = 10L;
-
     private TransactionBody newCreateTxn(KeyList keys, long expirationTime) {
         return newCreateTxn(keys, expirationTime, ShardID.DEFAULT.shardNum(), RealmID.DEFAULT.realmNum());
     }
@@ -216,7 +211,6 @@ void handleWorksAsExpected() {
 
         subject.handle(handleContext);
 
-        final EntityIdFactory idFactory = new FakeEntityIdFactoryImpl(5L, 10L);
         final FileID createdFileId = idFactory.newFileId(1_234L);
         final var createdFile = fileStore.get(createdFileId);
         assertTrue(createdFile.isPresent());
@@ -251,7 +245,6 @@ void handleDoesntRequireKeys() {
 
         subject.handle(handleContext);
 
-        final EntityIdFactory idFactory = new FakeEntityIdFactoryImpl(5L, 10L);
         final FileID createdFileId = idFactory.newFileId(1_234L);
         final var createdFile = fileStore.get(createdFileId);
         assertTrue(createdFile.isPresent());

hedera-node/hedera-file-service-impl/src/test/java/com/hedera/node/app/service/file/impl/test/handlers/FileGetContentsHandlerTest.java

@@ -31,12 +31,9 @@
 import com.hedera.node.app.service.file.impl.handlers.FileGetContentsHandler;
 import com.hedera.node.app.service.file.impl.schemas.V0490FileSchema;
 import com.hedera.node.app.service.file.impl.test.FileTestBase;
-import com.hedera.node.app.spi.fixtures.ids.FakeEntityIdFactoryImpl;
 import com.hedera.node.app.spi.workflows.QueryContext;
 import com.hedera.node.config.data.FilesConfig;
-import com.hedera.node.config.testfixtures.HederaTestConfigBuilder;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.config.api.Configuration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -57,18 +54,8 @@ class FileGetContentsHandlerTest extends FileTestBase {
 
     private FileGetContentsHandler subject;
 
-    private Configuration config;
-
     @BeforeEach
     void setUp() {
-        config = HederaTestConfigBuilder.create()
-                .withValue("cryptoCreateWithAlias.enabled", true)
-                .withValue("ledger.maxAutoAssociations", 5000)
-                .withValue("entities.limitTokenAssociations", false)
-                .withValue("tokens.maxPerAccount", 1000)
-                .withValue("hedera.shard", 5L)
-                .withValue("hedera.realm", 10L)
-                .getOrCreateConfig();
         subject = new FileGetContentsHandler(usageEstimator, genesisSchema);
     }
 
@@ -194,7 +181,7 @@ void getsResponseIfOkResponse() {
                 .nodeTransactionPrecheckCode(ResponseCodeEnum.OK)
                 .build();
         final var expectedContent = getExpectedContent();
-        given(handleContext.configuration()).willReturn(config);
+        given(context.configuration()).willReturn(DEFAULT_CONFIG);
         final var query = createGetFileContentQueryFromEntityId(fileId.fileNum());
         when(context.query()).thenReturn(query);
         when(context.createStore(ReadableFileStore.class)).thenReturn(readableStore);
@@ -235,7 +222,7 @@ private Query createGetFileContentQuery(final FileID fileId) {
     }
 
     private Query createGetFileContentQuery(long fileNum) {
-        final var fileId = FileID.newBuilder().fileNum(fileNum).build();
+        final var fileId = idFactory.newFileId(fileNum);
         final var data = FileGetContentsQuery.newBuilder()
                 .fileID(fileId)
                 .header(QueryHeader.newBuilder().payment(Transaction.DEFAULT).build())
@@ -246,10 +233,7 @@ private Query createGetFileContentQuery(long fileNum) {
 
     private Query createGetFileContentQueryFromEntityId(long fileNum) {
 
-        final FileID fileID = new FakeEntityIdFactoryImpl(
-                        Long.parseLong(config.getValue("hedera.shard")),
-                        Long.parseLong(config.getValue("hedera.realm")))
-                .newFileId(fileNum);
+        final FileID fileID = idFactory.newFileId(fileNum);
         final var data = FileGetContentsQuery.newBuilder()
                 .fileID(fileID)
                 .header(QueryHeader.newBuilder().payment(Transaction.DEFAULT).build())

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/TransactionProcessor.java

@@ -304,15 +304,19 @@ private InvolvedParties partiesWhenContractNotRequired(
                 updater.setupTopLevelLazyCreate(requireNonNull(parties.receiverAddress));
             } else {
                 updater.setContractNotRequired();
-                parties =
-                        new InvolvedParties(sender, relayer, contractIDToBesuAddress(transaction.contractIdOrThrow()));
+                parties = new InvolvedParties(
+                        sender,
+                        relayer,
+                        contractIDToBesuAddress(updater.entityIdFactory(), transaction.contractIdOrThrow()));
             }
         } else {
             updater.setContractNotRequired();
             parties = new InvolvedParties(
                     sender,
                     relayer,
-                    to != null ? to.getAddress() : contractIDToBesuAddress(transaction.contractIdOrThrow()));
+                    to != null
+                            ? to.getAddress()
+                            : contractIDToBesuAddress(updater.entityIdFactory(), transaction.contractIdOrThrow()));
         }
         return parties;
     }