Merge pull request #686 from enigmampc/v1.0.4

Fix ordering of contract initialization vs message dispatching
scrtlabs · Dec 16, 2020 · 786d3c4 · 786d3c4
2 parents 3aa3d1f + 789295f
commit 786d3c4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/x/compute/internal/keeper/keeper.go b/x/compute/internal/keeper/keeper.go
@@ -342,11 +342,6 @@ func (k Keeper) Instantiate(ctx sdk.Context, codeID uint64, creator /* , admin *
 	events := types.ParseEvents(res.Log, contractAddress)
 	ctx.EventManager().EmitEvents(events)
 
-	err = k.dispatchMessages(ctx, contractAddress, res.Messages)
-	if err != nil {
-		return nil, err
-	}
-
 	// persist instance
 	createdAt := types.NewAbsoluteTxPosition(ctx)
 	instance := types.NewContractInfo(codeID, creator /* admin, */, label, createdAt)
@@ -358,6 +353,11 @@ func (k Keeper) Instantiate(ctx sdk.Context, codeID uint64, creator /* , admin *
 
 	store.Set(types.GetContractLabelPrefix(label), contractAddress)
 
+	err = k.dispatchMessages(ctx, contractAddress, res.Messages)
+	if err != nil {
+		return nil, err
+	}
+
 	// k.appendToContractHistory(ctx, contractAddress, instance.InitialHistory(initMsg))
 	return contractAddress, nil
 }