Implement CryptoCreate handle method

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/MonoTransactionDispatcher.java

@@ -16,8 +16,10 @@
 
 package com.hedera.node.app.workflows.dispatcher;
 
+import static com.hedera.hapi.node.base.ResponseCodeEnum.MAX_ENTITIES_IN_PRICE_REGIME_HAVE_BEEN_CREATED;
 import static java.util.Objects.requireNonNull;
 
+import com.hedera.hapi.node.base.AccountID;
 import com.hedera.hapi.node.base.TopicID;
 import com.hedera.node.app.service.consensus.impl.WritableTopicStore;
 import com.hedera.node.app.service.consensus.impl.records.ConsensusCreateTopicRecordBuilder;
@@ -26,8 +28,11 @@
 import com.hedera.node.app.service.mono.context.properties.GlobalDynamicProperties;
 import com.hedera.node.app.service.mono.pbj.PbjConverter;
 import com.hedera.node.app.service.mono.state.validation.UsageLimits;
+import com.hedera.node.app.service.token.impl.WritableAccountStore;
 import com.hedera.node.app.service.token.impl.WritableTokenRelationStore;
+import com.hedera.node.app.service.token.impl.records.CryptoCreateRecordBuilder;
 import com.hedera.node.app.spi.meta.HandleContext;
+import com.hedera.node.app.spi.workflows.HandleException;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -69,6 +74,20 @@ protected void finishConsensusCreateTopic(
         topicStore.commit();
     }
 
+    @Override
+    protected void finishCryptoCreate(
+            @NonNull final CryptoCreateRecordBuilder recordBuilder, @NonNull final WritableAccountStore accountStore) {
+        // If accounts can't be created, due to the usage of a price regime, throw an exception
+        if (!usageLimits.areCreatableAccounts(1)) {
+            throw new HandleException(MAX_ENTITIES_IN_PRICE_REGIME_HAVE_BEEN_CREATED);
+        }
+        // Adapt the record builder outcome for mono-service
+        txnCtx.setCreated(PbjConverter.fromPbj(AccountID.newBuilder()
+                .accountNum(recordBuilder.getCreatedAccount())
+                .build()));
+        accountStore.commit();
+    }
+
     @Override
     protected void finishConsensusUpdateTopic(@NonNull WritableTopicStore topicStore) {
         topicStore.commit();

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java

@@ -29,8 +29,10 @@
 import com.hedera.node.app.service.consensus.impl.records.ConsensusCreateTopicRecordBuilder;
 import com.hedera.node.app.service.consensus.impl.records.ConsensusSubmitMessageRecordBuilder;
 import com.hedera.node.app.service.mono.context.properties.GlobalDynamicProperties;
+import com.hedera.node.app.service.token.impl.WritableAccountStore;
 import com.hedera.node.app.service.token.impl.WritableTokenRelationStore;
 import com.hedera.node.app.service.token.impl.WritableTokenStore;
+import com.hedera.node.app.service.token.impl.records.CryptoCreateRecordBuilder;
 import com.hedera.node.app.spi.meta.HandleContext;
 import com.hedera.node.app.spi.workflows.HandleException;
 import com.hedera.node.app.spi.workflows.PreCheckException;
@@ -103,6 +105,7 @@
                     txn, writableStoreFactory.createTokenRelStore());
             case TOKEN_PAUSE -> dispatchTokenPause(txn, writableStoreFactory.createTokenStore());
             case TOKEN_UNPAUSE -> dispatchTokenUnpause(txn, writableStoreFactory.createTokenStore());
+            case CRYPTO_CREATE -> dispatchCryptoCreate(txn, writableStoreFactory.createAccountStore());
             default -> throw new IllegalArgumentException(TYPE_NOT_SUPPORTED);
         }
     }
@@ -361,4 +364,30 @@
         handler.handle(tokenPause, tokenStore);
         tokenStore.commit();
     }
+
+    /**
+     * Dispatches the crypto create transaction to the appropriate handler.
+     * @param cryptoCreate the crypto create transaction body
+     * @param accountStore the writable account store
+     */
+    private void dispatchCryptoCreate(
+            @NonNull final TransactionBody cryptoCreate, @NonNull final WritableAccountStore accountStore) {
+        final var handler = handlers.cryptoCreateHandler();
+        final var recordBuilder = handler.newRecordBuilder();
+        handler.handle(handleContext, cryptoCreate, accountStore, recordBuilder);
+        finishCryptoCreate(recordBuilder, accountStore);
+    }
+
+    /**
+     * A temporary hook to isolate logic that we expect to move to a workflow, but
+     * is currently needed when running with facility implementations that are adapters
+     * for either {@code mono-service} logic or integration tests.
+     *
+     * @param recordBuilder the completed record builder for the creation
+     * @param accountStore the account store used for the creation
+     */
+    protected void finishCryptoCreate(
+            @NonNull final CryptoCreateRecordBuilder recordBuilder, @NonNull final WritableAccountStore accountStore) {
+        // No-op by default
+    }
 }

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/WorkingStateWritableStoreFactory.java

@@ -21,6 +21,7 @@
 import com.hedera.node.app.service.consensus.ConsensusService;
 import com.hedera.node.app.service.consensus.impl.WritableTopicStore;
 import com.hedera.node.app.service.token.TokenService;
+import com.hedera.node.app.service.token.impl.WritableAccountStore;
 import com.hedera.node.app.service.token.impl.WritableTokenRelationStore;
 import com.hedera.node.app.service.token.impl.WritableTokenStore;
 import com.hedera.node.app.state.HederaState;
@@ -74,4 +75,10 @@ public WritableTokenRelationStore createTokenRelStore() {
         final var tokenStates = stateAccessor.getHederaState().createWritableStates(TokenService.NAME);
         return new WritableTokenRelationStore(tokenStates);
     }
+
+    @Override
+    public WritableAccountStore createAccountStore() {
+        final var tokenStates = stateAccessor.getHederaState().createWritableStates(TokenService.NAME);
+        return new WritableAccountStore(tokenStates);
+    }
 }

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/WritableStoreFactory.java

@@ -17,6 +17,7 @@
 package com.hedera.node.app.workflows.dispatcher;
 
 import com.hedera.node.app.service.consensus.impl.WritableTopicStore;
+import com.hedera.node.app.service.token.impl.WritableAccountStore;
 import com.hedera.node.app.service.token.impl.WritableTokenRelationStore;
 import com.hedera.node.app.service.token.impl.WritableTokenStore;
 
@@ -43,5 +44,12 @@ public interface WritableStoreFactory {
      *
      * @return a new {@link WritableTokenRelationStore}
      */
-    public WritableTokenRelationStore createTokenRelStore();
+    WritableTokenRelationStore createTokenRelStore();
+
+    /**
+     * Get a {@link WritableAccountStore}.
+     *
+     * @return a new {@link WritableAccountStore}
+     */
+    WritableAccountStore createAccountStore();
 }

hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/dispatcher/MonoTransactionDispatcherTest.java

@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
@@ -114,6 +115,7 @@
 import com.hedera.node.app.service.schedule.impl.handlers.ScheduleDeleteHandler;
 import com.hedera.node.app.service.schedule.impl.handlers.ScheduleSignHandler;
 import com.hedera.node.app.service.token.ReadableAccountStore;
+import com.hedera.node.app.service.token.impl.WritableAccountStore;
 import com.hedera.node.app.service.token.impl.WritableTokenRelationStore;
 import com.hedera.node.app.service.token.impl.WritableTokenStore;
 import com.hedera.node.app.service.token.impl.handlers.CryptoAddLiveHashHandler;
@@ -139,9 +141,11 @@
 import com.hedera.node.app.service.token.impl.handlers.TokenUnfreezeAccountHandler;
 import com.hedera.node.app.service.token.impl.handlers.TokenUnpauseHandler;
 import com.hedera.node.app.service.token.impl.handlers.TokenUpdateHandler;
+import com.hedera.node.app.service.token.impl.records.CreateAccountRecordBuilder;
 import com.hedera.node.app.service.util.impl.handlers.UtilPrngHandler;
 import com.hedera.node.app.spi.meta.HandleContext;
 import com.hedera.node.app.spi.state.ReadableStates;
+import com.hedera.node.app.spi.workflows.HandleException;
 import com.hedera.node.app.spi.workflows.PreCheckException;
 import com.hedera.node.app.spi.workflows.TransactionHandler;
 import com.hedera.node.app.state.HederaState;
@@ -311,14 +315,17 @@ class MonoTransactionDispatcherTest {
     private GlobalDynamicProperties dynamicProperties;
 
     @Mock
-    private WritableStoreFactory writableStoreFactory;
+    private WorkingStateWritableStoreFactory writableStoreFactory;
 
     @Mock
     private WritableTopicStore writableTopicStore;
 
     @Mock
     private WritableTokenStore writableTokenStore;
 
+    @Mock
+    private WritableAccountStore writableAccountStore;
+
     @Mock
     private WritableTokenRelationStore writableTokenRelStore;
 
@@ -569,6 +576,41 @@ void dispatchesTokenUnpauseAsExpected() {
         verify(writableTokenStore).commit();
     }
 
+    @Test
+    void dispatchesCryptoCreateAsExpected() {
+        final var createBuilder = mock(CreateAccountRecordBuilder.class);
+
+        given(cryptoCreateHandler.newRecordBuilder()).willReturn(createBuilder);
+        given(createBuilder.getCreatedAccount()).willReturn(666L);
+        given(writableStoreFactory.createAccountStore()).willReturn(writableAccountStore);
+        given(usageLimits.areCreatableAccounts(1)).willReturn(true);
+
+        dispatcher.dispatchHandle(HederaFunctionality.CRYPTO_CREATE, transactionBody, writableStoreFactory);
+
+        verify(txnCtx)
+                .setCreated(PbjConverter.fromPbj(
+                        AccountID.newBuilder().accountNum(666L).build()));
+        verify(writableAccountStore).commit();
+    }
+
+    @Test
+    void doesntCommitWhenUsageLimitsExceeded() {
+        final var createBuilder = mock(CreateAccountRecordBuilder.class);
+
+        given(cryptoCreateHandler.newRecordBuilder()).willReturn(createBuilder);
+        given(writableStoreFactory.createAccountStore()).willReturn(writableAccountStore);
+        given(usageLimits.areCreatableAccounts(1)).willReturn(false);
+
+        assertThatThrownBy(() -> dispatcher.dispatchHandle(
+                        HederaFunctionality.CRYPTO_CREATE, transactionBody, writableStoreFactory))
+                .isInstanceOf(HandleException.class);
+
+        verify(txnCtx, never())
+                .setCreated(PbjConverter.fromPbj(
+                        AccountID.newBuilder().accountNum(666L).build()));
+        verify(writableAccountStore, never()).commit();
+    }
+
     @Test
     void cannotDispatchUnsupportedOperations() {
         assertThatThrownBy(() -> dispatcher.dispatchHandle(

hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/dispatcher/WorkingStateWritableStoreFactoryTest.java

@@ -21,6 +21,7 @@
 import static org.mockito.BDDMockito.given;
 
 import com.hedera.node.app.service.consensus.ConsensusService;
+import com.hedera.node.app.service.token.TokenService;
 import com.hedera.node.app.spi.state.WritableStates;
 import com.hedera.node.app.state.HederaState;
 import com.hedera.node.app.state.WorkingStateAccessor;
@@ -64,24 +65,32 @@ void createsWritableStore() {
     @Test
     void returnsTopicStore() {
         workingStateAccessor.setHederaState(state);
-        given(state.createWritableStates("ConsensusService")).willReturn(writableStates);
+        given(state.createWritableStates(ConsensusService.NAME)).willReturn(writableStates);
         final var store = subject.createTopicStore();
         assertNotNull(store);
     }
 
     @Test
     void returnsTokenStore() {
         workingStateAccessor.setHederaState(state);
-        given(state.createWritableStates("TokenService")).willReturn(writableStates);
+        given(state.createWritableStates(TokenService.NAME)).willReturn(writableStates);
         final var store = subject.createTokenStore();
         assertNotNull(store);
     }
 
     @Test
     void returnsTokenRelStore() {
         workingStateAccessor.setHederaState(state);
-        given(state.createWritableStates("TokenService")).willReturn(writableStates);
+        given(state.createWritableStates(TokenService.NAME)).willReturn(writableStates);
         final var store = subject.createTokenRelStore();
         assertNotNull(store);
     }
+
+    @Test
+    void returnsAccountStore() {
+        workingStateAccessor.setHederaState(state);
+        given(state.createWritableStates(TokenService.NAME)).willReturn(writableStates);
+        final var store = subject.createAccountStore();
+        assertNotNull(store);
+    }
 }

hedera-node/hedera-consensus-service-impl/src/test/java/com/hedera/node/app/service/consensus/impl/test/handlers/AdapterUtils.java

@@ -69,9 +69,9 @@
 import com.hedera.hapi.node.base.AccountID;
 import com.hedera.hapi.node.base.Key;
 import com.hedera.hapi.node.state.token.Account;
+import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance;
 import com.hedera.hapi.node.state.token.AccountCryptoAllowance;
 import com.hedera.hapi.node.state.token.AccountFungibleTokenAllowance;
-import com.hedera.hapi.node.state.token.AccountTokenAllowance;
 import com.hedera.node.app.service.mono.state.virtual.EntityNumValue;
 import com.hedera.node.app.service.mono.state.virtual.EntityNumVirtualKey;
 import com.hedera.node.app.service.token.ReadableAccountStore;
@@ -142,21 +142,19 @@ class SigReqAdapterUtils {
         private static final String ACCOUNTS_KEY = "ACCOUNTS";
 
         private static AccountCryptoAllowance cryptoAllowances = AccountCryptoAllowance.newBuilder()
-                .accountNum(DEFAULT_PAYER.getAccountNum())
+                .spenderNum(DEFAULT_PAYER.getAccountNum())
                 .amount(500L)
                 .build();
         private static AccountFungibleTokenAllowance fungibleTokenAllowances =
                 AccountFungibleTokenAllowance.newBuilder()
-                        .tokenAllowanceKey(AccountTokenAllowance.newBuilder()
-                                .tokenNum(KNOWN_TOKEN_NO_SPECIAL_KEYS.getTokenNum())
-                                .accountNum(DEFAULT_PAYER.getAccountNum())
-                                .build())
+                        .tokenNum(KNOWN_TOKEN_NO_SPECIAL_KEYS.getTokenNum())
+                        .spenderNum(DEFAULT_PAYER.getAccountNum())
                         .amount(10_000L)
                         .build();
 
-        private static AccountTokenAllowance nftAllowances = AccountTokenAllowance.newBuilder()
+        private static AccountApprovalForAllAllowance nftAllowances = AccountApprovalForAllAllowance.newBuilder()
                 .tokenNum(KNOWN_TOKEN_WITH_WIPE.getTokenNum())
-                .accountNum(DEFAULT_PAYER.getAccountNum())
+                .spenderNum(DEFAULT_PAYER.getAccountNum())
                 .build();
 
         private static ReadableKVState<EntityNumVirtualKey, Account> wellKnownAccountsState() {
@@ -261,7 +259,7 @@ private static Account toPbjAccount(
                 boolean receiverSigRequired,
                 List<AccountCryptoAllowance> cryptoAllowances,
                 List<AccountFungibleTokenAllowance> fungibleTokenAllowances,
-                List<AccountTokenAllowance> nftTokenAllowances) {
+                List<AccountApprovalForAllAllowance> nftTokenAllowances) {
             return new Account(
                     number,
                     Bytes.EMPTY,
@@ -293,7 +291,8 @@ private static Account toPbjAccount(
                     nftTokenAllowances,
                     fungibleTokenAllowances,
                     2,
-                    false);
+                    false,
+                    null);
         }
     }
 }

hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/test/handlers/ScheduleDeleteHandlerParityTest.java

@@ -74,9 +74,9 @@
 import com.hedera.hapi.node.base.Key;
 import com.hedera.hapi.node.base.ScheduleID;
 import com.hedera.hapi.node.state.token.Account;
+import com.hedera.hapi.node.state.token.AccountApprovalForAllAllowance;
 import com.hedera.hapi.node.state.token.AccountCryptoAllowance;
 import com.hedera.hapi.node.state.token.AccountFungibleTokenAllowance;
-import com.hedera.hapi.node.state.token.AccountTokenAllowance;
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.node.app.service.mono.pbj.PbjConverter;
 import com.hedera.node.app.service.mono.state.virtual.EntityNumVirtualKey;
@@ -210,21 +210,19 @@ public class SigReqAdapterUtils {
         private static final String ACCOUNTS_KEY = "ACCOUNTS";
 
         private static AccountCryptoAllowance cryptoAllowances = AccountCryptoAllowance.newBuilder()
-                .accountNum(DEFAULT_PAYER.getAccountNum())
+                .spenderNum(DEFAULT_PAYER.getAccountNum())
                 .amount(500L)
                 .build();
         private static AccountFungibleTokenAllowance fungibleTokenAllowances =
                 AccountFungibleTokenAllowance.newBuilder()
-                        .tokenAllowanceKey(AccountTokenAllowance.newBuilder()
-                                .tokenNum(KNOWN_TOKEN_NO_SPECIAL_KEYS.getTokenNum())
-                                .accountNum(DEFAULT_PAYER.getAccountNum())
-                                .build())
+                        .tokenNum(KNOWN_TOKEN_NO_SPECIAL_KEYS.getTokenNum())
+                        .spenderNum(DEFAULT_PAYER.getAccountNum())
                         .amount(10_000L)
                         .build();
 
-        private static AccountTokenAllowance nftAllowances = AccountTokenAllowance.newBuilder()
+        private static AccountApprovalForAllAllowance nftAllowances = AccountApprovalForAllAllowance.newBuilder()
                 .tokenNum(KNOWN_TOKEN_WITH_WIPE.getTokenNum())
-                .accountNum(DEFAULT_PAYER.getAccountNum())
+                .spenderNum(DEFAULT_PAYER.getAccountNum())
                 .build();
 
         public static Map<EntityNumVirtualKey, Account> wellKnownAccountStoreAt() {
@@ -325,7 +323,7 @@ private static Account toPbjAccount(
                 boolean receiverSigRequired,
                 List<AccountCryptoAllowance> cryptoAllowances,
                 List<AccountFungibleTokenAllowance> fungibleTokenAllowances,
-                List<AccountTokenAllowance> nftTokenAllowances) {
+                List<AccountApprovalForAllAllowance> nftTokenAllowances) {
             return new Account(
                     number,
                     Bytes.EMPTY,
@@ -357,7 +355,8 @@ private static Account toPbjAccount(
                     nftTokenAllowances,
                     fungibleTokenAllowances,
                     2,
-                    false);
+                    false,
+                    null);
         }
     }
 }