Fix an issue where short public key wasn't set

TimeleapLabs · Feb 7, 2024 · 6cd3964 · 6cd3964
1 parent d356984
commit 6cd3964
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/src/constants/constants.go b/src/constants/constants.go
@@ -1,4 +1,4 @@
 package constants
 
-var Version = "0.11.2"
-var ProtocolVersion = "0.11.2"
+var Version = "0.11.3"
+var ProtocolVersion = "0.11.3"
diff --git a/src/ent/migrate/schema.go b/src/ent/migrate/schema.go
diff --git a/src/ent/runtime.go b/src/ent/runtime.go
diff --git a/src/ent/schema/signer.go b/src/ent/schema/signer.go
@@ -16,8 +16,7 @@ type Signer struct {
 func (Signer) Fields() []ent.Field {
 	return []ent.Field{
 		field.String("name").NotEmpty(),
-		//field.Bytes("key").MaxLen(96).Unique().NotEmpty(),
-		field.Bytes("key").MaxLen(96),
+		field.Bytes("key").MaxLen(96).Unique().NotEmpty(),
 		field.Bytes("shortkey").MaxLen(96).Unique().NotEmpty(),
 		field.Int64("points"),
 	}
@@ -33,8 +32,8 @@ func (Signer) Edges() []ent.Edge {
 // Indexes of the DataSet.
 func (Signer) Indexes() []ent.Index {
 	return []ent.Index{
-		// index.Fields("key").
-		// 	Unique(),
+		index.Fields("key").
+			Unique(),
 		index.Fields("shortkey").
 			Unique(),
 	}

diff --git a/src/plugins/uniswap/uniswap.go b/src/plugins/uniswap/uniswap.go
@@ -304,8 +304,6 @@ func Start() {
 	var sk *big.Int
 	var pk *bls12381.G2Affine
 	var pkBytes [96]byte
-	var spk *bls12381.G1Affine
-	var spkBytes [48]byte
 
 	if config.Secrets.InConfig("secretKey") {
 
@@ -317,9 +315,6 @@ func Start() {
 		pk = bls.GetPublicKey(sk)
 		pkBytes = pk.Bytes()
 
-		spk = bls.GetShortPublicKey(sk)
-		spkBytes = spk.Bytes()
-
 	} else {
 		sk, pk, err = bls.GenerateKeyPair()
 		pkBytes = pk.Bytes()
@@ -334,6 +329,9 @@ func Start() {
 		}
 	}
 
+	spk := bls.GetShortPublicKey(sk)
+	spkBytes := spk.Bytes()
+
 	if err != nil {
 		panic(err)
 	}