move linkID input to the end

iden3 · Sep 25, 2023 · b25a64d · b25a64d
1 parent b5e30f3
commit b25a64d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/credentialAtomicQueryV3.go b/credentialAtomicQueryV3.go
@@ -310,7 +310,6 @@ func (ao *AtomicQueryV3PubSignals) PubSignalsUnmarshal(data []byte) error {
 	// merklized
 	// userID
 	// issuerAuthState
-	// linkID
 	// proofType
 	// requestID
 	// issuerID
@@ -325,6 +324,7 @@ func (ao *AtomicQueryV3PubSignals) PubSignalsUnmarshal(data []byte) error {
 	// value
 	// issuerClaimIdenState
 	// operatorOutput
+	// linkID
 
 	// 17 is a number of fields in AtomicQueryV3PubSignals, values length could be
 	// different base on the circuit configuration. The length could be modified by set value
@@ -361,24 +361,12 @@ func (ao *AtomicQueryV3PubSignals) PubSignalsUnmarshal(data []byte) error {
 	}
 	fieldIdx++
 
-	// - operatorOutput
-	// if ao.OperatorOutput, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
-	// 	return fmt.Errorf("invalid operator output value: '%s'", sVals[fieldIdx])
-	// }
-	// fieldIdx++
-
-	var ok bool
-	// - linkID
-	if ao.LinkID, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
-		return fmt.Errorf("invalid link ID value: '%s'", sVals[fieldIdx])
-	}
-	fieldIdx++
-
 	if ao.ProofType, err = strconv.Atoi(sVals[fieldIdx]); err != nil {
 		return err
 	}
 	fieldIdx++
 
+	var ok bool
 	// - requestID
 	if ao.RequestID, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
 		return fmt.Errorf("invalid requestID value: '%s'", sVals[fieldIdx])
@@ -457,6 +445,18 @@ func (ao *AtomicQueryV3PubSignals) PubSignalsUnmarshal(data []byte) error {
 	if ao.IssuerClaimIdenState, err = merkletree.NewHashFromString(sVals[fieldIdx]); err != nil {
 		return err
 	}
+	fieldIdx++
+
+	// - operatorOutput
+	// if ao.OperatorOutput, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
+	// 	return fmt.Errorf("invalid operator output value: '%s'", sVals[fieldIdx])
+	// }
+	// fieldIdx++
+
+	// - linkID
+	if ao.LinkID, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
+		return fmt.Errorf("invalid link ID value: '%s'", sVals[fieldIdx])
+	}
 
 	return nil
 }

diff --git a/credentialAtomicQueryV3OnChain.go b/credentialAtomicQueryV3OnChain.go
@@ -388,7 +388,6 @@ func (ao *AtomicQueryV3OnChainPubSignals) PubSignalsUnmarshal(data []byte) error
 	// userID
 	// circuitQueryHash
 	// issuerAuthState // sig specific
-	// linkID
 	// proofType
 	// requestID
 	// challenge
@@ -399,6 +398,7 @@ func (ao *AtomicQueryV3OnChainPubSignals) PubSignalsUnmarshal(data []byte) error
 	// timestamp
 	// issuerClaimIdenState // mtp specific
 	// operatorOutput
+	// linkID
 
 	var sVals []string
 	err := json.Unmarshal(data, &sVals)
@@ -433,18 +433,6 @@ func (ao *AtomicQueryV3OnChainPubSignals) PubSignalsUnmarshal(data []byte) error
 	}
 	fieldIdx++
 
-	// - operatorOutput
-	// if ao.OperatorOutput, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
-	// 	return fmt.Errorf("invalid operator output value: '%s'", sVals[fieldIdx])
-	// }
-	// fieldIdx++
-
-	// - linkID
-	if ao.LinkID, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
-		return fmt.Errorf("invalid link ID value: '%s'", sVals[fieldIdx])
-	}
-	fieldIdx++
-
 	// - proofType
 	if ao.ProofType, err = strconv.Atoi(sVals[fieldIdx]); err != nil {
 		return fmt.Errorf("invalid proofType value: '%s'", sVals[fieldIdx])
@@ -498,6 +486,18 @@ func (ao *AtomicQueryV3OnChainPubSignals) PubSignalsUnmarshal(data []byte) error
 	if ao.IssuerClaimIdenState, err = merkletree.NewHashFromString(sVals[fieldIdx]); err != nil {
 		return fmt.Errorf("invalid IssuerClaimIdenState value: '%s'", sVals[fieldIdx])
 	}
+	fieldIdx++
+
+	// - operatorOutput
+	// if ao.OperatorOutput, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
+	// 	return fmt.Errorf("invalid operator output value: '%s'", sVals[fieldIdx])
+	// }
+	// fieldIdx++
+
+	// - linkID
+	if ao.LinkID, ok = big.NewInt(0).SetString(sVals[fieldIdx], 10); !ok {
+		return fmt.Errorf("invalid link ID value: '%s'", sVals[fieldIdx])
+	}
 
 	return nil
 }

diff --git a/credentialAtomicQueryV3OnChain_test.go b/credentialAtomicQueryV3OnChain_test.go
@@ -211,7 +211,6 @@ func TestAtomicQueryV3OnChainOutputs_Sig_CircuitUnmarshal(t *testing.T) {
  "7002038488948284767652984010448061038733120594540539539730565455904340350321",
  "2943483356559152311923412925436024635269538717812859789851139200242297094",
  "0",
- "0",
  "23",
  "10",
  "20177832565449474772630743317224985532862797657496372535616634430055981993180",
@@ -220,6 +219,7 @@ func TestAtomicQueryV3OnChainOutputs_Sig_CircuitUnmarshal(t *testing.T) {
  "20177832565449474772630743317224985532862797657496372535616634430055981993180",
  "1642074362",
  "0",
+ "0",
  "0"
 ]`))
 	require.NoError(t, err)
@@ -276,7 +276,6 @@ func TestAtomicQueryV3OnChainOutputs_MTP_CircuitUnmarshal(t *testing.T) {
  "26109404700696283154998654512117952420503675471097392618762221546565140481",
  "7002038488948284767652984010448061038733120594540539539730565455904340350321",
  "0",
- "0",
  "1",
  "23",
  "10",
@@ -286,6 +285,7 @@ func TestAtomicQueryV3OnChainOutputs_MTP_CircuitUnmarshal(t *testing.T) {
  "20177832565449474772630743317224985532862797657496372535616634430055981993180",
  "1642074362",
  "2943483356559152311923412925436024635269538717812859789851139200242297094",
+ "0",
  "0"
 ]`))
 	require.NoError(t, err)

diff --git a/credentialAtomicQueryV3_test.go b/credentialAtomicQueryV3_test.go
@@ -165,7 +165,6 @@ func TestAtomicQueryV3Outputs_Sig_CircuitUnmarshal(t *testing.T) {
  "23148936466334350744548790012294489365207440754509988986684797708370051073",
  "2943483356559152311923412925436024635269538717812859789851139200242297094",
  "0",
- "0",
  "23",
  "21933750065545691586450392143787330185992517860945727248803138245838110721",
  "1",
@@ -241,7 +240,8 @@ func TestAtomicQueryV3Outputs_Sig_CircuitUnmarshal(t *testing.T) {
  "0",
  "0",
  "0",
- "0"
+ "0",
+"0"
 ]`))
 	require.NoError(t, err)
 
@@ -289,7 +289,6 @@ func TestAtomicQueryV3Outputs_MTP_CircuitUnmarshal(t *testing.T) {
  "0",
  "19104853439462320209059061537253618984153217267677512271018416655565783041",
  "0",
- "0",
  "1",
  "23",
  "23528770672049181535970744460798517976688641688582489375761566420828291073",
@@ -366,6 +365,7 @@ func TestAtomicQueryV3Outputs_MTP_CircuitUnmarshal(t *testing.T) {
  "0",
  "0",
  "5687720250943511874245715094520098014548846873346473635855112185560372332782",
+ "0",
  "0"
 ]`))
 	require.NoError(t, err)