feedback

x/nexus/keeper/general_message.go

@@ -31,7 +31,7 @@ func getProcessingMessageKey(destinationChain exported.ChainName, id string) key
 // GenerateMessageID generates a unique general message ID, and returns the message ID, current transacation ID and a unique integer nonce
 // The message ID is just a concatenation of the transaction ID and the nonce
 func (k Keeper) GenerateMessageID(ctx sdk.Context) (string, []byte, uint64) {
-	hash, nonce := k.NextID(ctx)
+	hash, nonce := k.nextID(ctx)
 
 	return fmt.Sprintf("0x%s-%d", hex.EncodeToString(hash[:]), nonce), hash[:], nonce
 }

x/nexus/keeper/msg_id_generator.go

@@ -15,8 +15,13 @@ func getTxHash(ctx sdk.Context) [32]byte {
 	return sha256.Sum256(ctx.TxBytes())
 }
 
-// NextID returns the transaction hash of the current transaction and the incremented nonce
-func (k Keeper) NextID(ctx sdk.Context) ([32]byte, uint64) {
+// IncrID increments the nonce
+func (k Keeper) IncrID(ctx sdk.Context) {
+	utils.NewCounter[uint64](messageNonceKey, k.getStore(ctx)).Incr(ctx)
+}
+
+// nextID returns the transaction hash of the current transaction and the incremented nonce
+func (k Keeper) nextID(ctx sdk.Context) ([32]byte, uint64) {
 	return getTxHash(ctx), utils.NewCounter[uint64](messageNonceKey, k.getStore(ctx)).Incr(ctx)
 }
 

x/nexus/keeper/wasmer_engine.go

@@ -38,7 +38,7 @@ func (w *WasmerEngine) Instantiate(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.msgIDGenerator.NextID(getCtx(querier))
+	defer w.msgIDGenerator.IncrID(getCtx(querier))
 
 	return w.WasmerEngine.Instantiate(checksum, env, info, initMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -56,7 +56,7 @@ func (w *WasmerEngine) Execute(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.msgIDGenerator.NextID(getCtx(querier))
+	defer w.msgIDGenerator.IncrID(getCtx(querier))
 
 	return w.WasmerEngine.Execute(code, env, info, executeMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -73,7 +73,7 @@ func (w *WasmerEngine) Migrate(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.msgIDGenerator.NextID(getCtx(querier))
+	defer w.msgIDGenerator.IncrID(getCtx(querier))
 
 	return w.WasmerEngine.Migrate(checksum, env, migrateMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -90,7 +90,7 @@ func (w *WasmerEngine) Sudo(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.msgIDGenerator.NextID(getCtx(querier))
+	defer w.msgIDGenerator.IncrID(getCtx(querier))
 
 	return w.WasmerEngine.Sudo(checksum, env, sudoMsg, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }
@@ -107,7 +107,7 @@ func (w *WasmerEngine) Reply(
 	gasLimit uint64,
 	deserCost wasmvmtypes.UFraction,
 ) (*wasmvmtypes.Response, uint64, error) {
-	defer w.msgIDGenerator.NextID(getCtx(querier))
+	defer w.msgIDGenerator.IncrID(getCtx(querier))
 
 	return w.WasmerEngine.Reply(checksum, env, reply, store, goapi, querier, gasMeter, gasLimit, deserCost)
 }

x/nexus/types/expected_keepers.go

@@ -54,7 +54,7 @@ type Nexus interface {
 
 // MsgIDGenerator provides functionality to generate msg IDs
 type MsgIDGenerator interface {
-	NextID(ctx sdk.Context) ([32]byte, uint64)
+	IncrID(ctx sdk.Context)
 	CurrID(ctx sdk.Context) ([32]byte, uint64)
 }