add dkgIdMapping

Author: kc1116

contracts/epochs/FlowEpoch.cdc

@@ -215,6 +215,7 @@ access(all) contract FlowEpoch {
 
         // TODO(EFM, #6213): include id->index mapping
         dkgPubKeys: [String],
+        dkgIdMapping: {String: Int},
     )
 
     /// Contains specific metadata about a particular epoch
@@ -526,6 +527,7 @@ access(all) contract FlowEpoch {
             targetEndTime: UInt64,
             clusterQCVoteData: [FlowClusterQC.ClusterQCVoteData],
             dkgPubKeys: [String],
+            dkgIdMapping: {String: Int},
             ) {
             self.recoverEpochPreChecks(
                 startView: startView, 
@@ -562,6 +564,7 @@ access(all) contract FlowEpoch {
                 targetEndTime: targetEndTime,
                 clusterQCVoteData: clusterQCVoteData,
                 dkgPubKeys: dkgPubKeys,
+                dkgIdMapping: dkgIdMapping,
             )
         }
 
@@ -622,6 +625,7 @@ access(all) contract FlowEpoch {
             clusterAssignments: [[String]],
             clusterQCVoteData: [FlowClusterQC.ClusterQCVoteData],
             dkgPubKeys: [String],
+            dkgIdMapping: {String: Int},
             nodeIDs: [String]) 
         {
             // sanity check recovery epoch counter should increment current epoch counter
@@ -667,6 +671,7 @@ access(all) contract FlowEpoch {
                 targetEndTime: targetEndTime,
                 clusterQCVoteData: clusterQCVoteData,
                 dkgPubKeys: dkgPubKeys,
+                dkgIdMapping: dkgIdMapping,
             )
 
             /// Start a new Epoch, which increments the current epoch counter
@@ -689,6 +694,7 @@ access(all) contract FlowEpoch {
             clusterAssignments: [[String]],
             clusterQCVoteData: [FlowClusterQC.ClusterQCVoteData],
             dkgPubKeys: [String],
+            dkgIdMapping: {String: Int},
             nodeIDs: [String]) 
         { 
             // sanity check recovery epoch counter should be the current epoch counter
@@ -729,6 +735,7 @@ access(all) contract FlowEpoch {
                 targetEndTime: targetEndTime,
                 clusterQCVoteData: clusterQCVoteData,
                 dkgPubKeys: dkgPubKeys,
+                dkgIdMapping: dkgIdMapping,
             )
         }
 

lib/go/contracts/internal/assets/assets.go

@@ -148,6 +148,7 @@ type EpochRecover struct {
 	targetEndTime      uint64
 	numberClusterQCs   int
 	dkgPubKeys         []string
+	dkgIdMapping       cadence.Dictionary
 }
 
 type EpochRecoverEvent flow.Event
@@ -850,6 +851,7 @@ func verifyEpochRecover(
 	assertEqual(t, cadence.NewUInt64(expectedRecover.targetEndTime), emittedEvent.TargetEndTime())
 	assertEqual(t, expectedRecover.numberClusterQCs, len(emittedEvent.ClusterQCVoteData().Values))
 	assertEqual(t, len(expectedRecover.dkgPubKeys), len(emittedEvent.DKGPubKeys().Values))
+	assertEqual(t, len(expectedRecover.dkgIdMapping.Pairs), len(emittedEvent.DKGPubKeys().Values))
 }
 
 func getEpochMetadata(t *testing.T, b emulator.Emulator, env templates.Environment, counter cadence.Value) map[string]cadence.Value {

lib/go/templates/internal/assets/assets.go

@@ -1602,7 +1602,7 @@ func TestEpochRecover(t *testing.T) {
 			)
 			args := getRecoveryTxArgs(env, ids, startView, stakingEndView, endView, targetDuration, targetEndTime, startEpochCounter)
 			// overwrite the current epoch by setting unsafe overwrite to true
-			args[10] = cadence.NewBool(true)
+			args[11] = cadence.NewBool(true)
 			tx := createTxWithTemplateAndAuthorizer(b, templates.GenerateRecoverEpochScript(env), idTableAddress)
 			for _, arg := range args {
 				tx.AddArgument(arg)
@@ -1709,6 +1709,7 @@ func TestEpochRecover(t *testing.T) {
 							clusterAssignments: [[String]],
 							clusterQCVoteData: [FlowClusterQC.ClusterQCVoteData],
 							dkgPubKeys: [String],
+							dkgIdMapping: {String: Int},
 							nodeIDs: [String],
 							unsafeAllowOverwrite: Bool) {
 
@@ -1726,6 +1727,7 @@ func TestEpochRecover(t *testing.T) {
 								clusterAssignments: clusterAssignments,
 								clusterQCVoteData: clusterQCVoteData,
 								dkgPubKeys: dkgPubKeys,
+								dkgIdMapping: dkgIdMapping,
 								nodeIDs: nodeIDs
 							)
 					}
@@ -1994,7 +1996,6 @@ func getRecoveryTxArgs(
 	for i, id := range nodeIds {
 		nodeIDs[i], _ = cadence.NewString(id)
 	}
-
 	clusterQcVoteData := convertClusterQcsCdc(env, collectorClusters)
 	return []cadence.Value{
 		cadence.NewUInt64(epochCounter),
@@ -2006,6 +2007,10 @@ func getRecoveryTxArgs(
 		cadence.NewArray(collectorClusters), // collectorClusters
 		cadence.NewArray(clusterQcVoteData), // clusterQCVoteData
 		cadence.NewArray(dkgPubKeysCdc),
+		cadence.NewDictionary([]cadence.KeyValuePair{{
+			Key:   cadence.String(nodeIds[0]),
+			Value: cadence.NewInt(0),
+		}}),
 		cadence.NewArray(nodeIDs),
 		cadence.NewBool(false), // recover EFM with a new epoch, set unsafeAllowOverwrite to false
 	}
@@ -2030,6 +2035,13 @@ func verifyEpochRecoverGovernanceTx(
 	args []cadence.Value,
 ) {
 	dkgPubKeys := make([]string, len(args[8].(cadence.Array).Values))
+	dkgIdMappingKVP := make([]cadence.KeyValuePair, len(dkgPubKeys))
+	for i, _ := range dkgPubKeys {
+		dkgIdMappingKVP[i] = cadence.KeyValuePair{
+			Key:   cadence.String(fmt.Sprintf("node_%d", i)),
+			Value: cadence.NewInt(i),
+		}
+	}
 	for i, dkgKeyCdc := range args[8].(cadence.Array).Values {
 		dkgPubKeys[i] = strings.ReplaceAll(dkgKeyCdc.String(), `"`, "")
 	}
@@ -2066,6 +2078,7 @@ func verifyEpochRecoverGovernanceTx(
 		targetEndTime:      targetEndTime,
 		numberClusterQCs:   len(args[6].(cadence.Array).Values),
 		dkgPubKeys:         dkgPubKeys,
+		dkgIdMapping:       cadence.NewDictionary(dkgIdMappingKVP),
 	}
 	verifyEpochRecover(t, adapter, idTableAddress, expectedRecoverEvent)
 }

lib/go/test/epoch_test_helpers.go

@@ -20,6 +20,7 @@ transaction(recoveryEpochCounter: UInt64,
             clusterAssignments: [[String]],
             clusterQCVoteData: [FlowClusterQC.ClusterQCVoteData],
             dkgPubKeys: [String],
+            dkgIdMapping: {String: Int},
             nodeIDs: [String],
             unsafeAllowOverwrite: Bool) {
 
@@ -40,6 +41,7 @@ transaction(recoveryEpochCounter: UInt64,
                 clusterAssignments: clusterAssignments,
                 clusterQCVoteData: clusterQCVoteData,
                 dkgPubKeys: dkgPubKeys,
+                dkgIdMapping: dkgIdMapping,
                 nodeIDs: nodeIDs
             )
         } else {
@@ -57,6 +59,7 @@ transaction(recoveryEpochCounter: UInt64,
                 clusterAssignments: clusterAssignments,
                 clusterQCVoteData: clusterQCVoteData,
                 dkgPubKeys: dkgPubKeys,
+                dkgIdMapping: dkgIdMapping,
                 nodeIDs: nodeIDs
             )
         }