Automatic update on Mon Dec 13 01:05:32 UTC 2021

Author: GitHub

pkg/cothority/byzcoin/bcadmin/commands.go

@@ -853,6 +853,10 @@ var cmds = cli.Commands{
 				EnvVar: "BC",
 				Usage:  "the ByzCoin config to use (required)",
 			},
+			cli.BoolFlag{
+				Name:  "roster",
+				Usage: "the full roster of the config",
+			},
 		},
 	},
 

pkg/cothority/byzcoin/bcadmin/main.go

@@ -1729,6 +1729,7 @@ func getInfo(c *cli.Context) error {
 		return err
 	}
 
+	log.Info("Fetching the latest config")
 	cl.UpdateNodes()
 	var bcCfg byzcoin.ChainConfig
 	if _, err := cl.GetInstance(byzcoin.ConfigInstanceID,
@@ -1740,6 +1741,17 @@ func getInfo(c *cli.Context) error {
 		"%v",
 		cfg.String(), bcArg, bcCfg)
 
+	if c.Bool("roster") {
+		group := app.Group{
+			Roster: &bcCfg.Roster,
+		}
+		groupToml, err := group.Toml(cothority.Suite)
+		if err != nil {
+			return xerrors.Errorf("couldn't create toml: %v", err)
+		}
+		log.Infof("Full roster is:\n%s", groupToml.String())
+	}
+
 	return nil
 }
 

pkg/cothority/darc/darc_test.go

@@ -748,3 +748,19 @@ func TestParseIdentity(t *testing.T) {
 	// ToLower() because common.Address uses address checksum (EIP-55)
 	require.Equal(t, in, strings.ToLower(i.String()))
 }
+
+// Test any identity
+func testIdentity(t *testing.T, sig Signer) {
+	msg := []byte("something secret")
+	signed, err := sig.Sign(msg)
+	require.NoError(t, err)
+
+	id := sig.Identity()
+	require.NoError(t, id.Verify(msg, signed))
+	require.Error(t, id.Verify([]byte("wrong message"), signed))
+}
+
+// Test the different identities available - currently only Ed25519.
+func TestIdentities(t *testing.T) {
+	testIdentity(t, NewSignerEd25519(nil, nil))
+}

pkg/cothority/personhood/service_test.go

@@ -180,12 +180,24 @@ func TestService_EmailRecover(t *testing.T) {
 	require.Equal(t, uint64(2000), newUserCoin.Value)
 	require.Equal(t, contracts.SpawnerCoin, newUserCoin.Name)
 
+	// Test wrong email
 	reply, err := ts.s.EmailRecover(&EmailRecover{
 		Email: "linus.gasser2@epfl.ch",
 	})
 	require.Error(t, err)
 	require.Equal(t, EREUnknown, reply.Status)
 
+	// Test correct email
+	ts.dummyEmail.Reset()
+	reply, err = ts.s.EmailRecover(&EmailRecover{
+		Email: "linus.gasser@epfl.ch",
+	})
+	// Need to wait for the update to go through the network.
+	require.NoError(t, err)
+	require.Equal(t, ERERecovered, reply.Status)
+	time.Sleep(time.Second)
+
+	// Test correct email a 2nd time
 	ts.dummyEmail.Reset()
 	reply, err = ts.s.EmailRecover(&EmailRecover{
 		Email: "linus.gasser@epfl.ch",

pkg/cothority/personhood/user/user.go

@@ -288,13 +288,16 @@ func (u User) createRecovery(otherUser User,
 	if err := newUserSigner.EvolveFrom(&otherUser.SignerDarc); err != nil {
 		return xerrors.Errorf("couldn't evolve signer darc: %v", err)
 	}
-	newExpr := newUserSigner.Rules.GetSignExpr().AddOrElement(
+	newSignExpr := newUserSigner.Rules.GetSignExpr().AddOrElement(
 		recoveryDeviceIdentity.String())
-	if err := newUserSigner.Rules.UpdateSign(newExpr); err != nil {
+	if err := newUserSigner.Rules.UpdateSign(newSignExpr); err != nil {
 		return xerrors.Errorf("couldn't update signer darc: %v", err)
 	}
+
+	newEvolveExpr := newUserSigner.Rules.Get(byzcoin.ContractDarcInvokeEvolve).
+		AddOrElement(recoveryDeviceIdentity.String())
 	if err := newUserSigner.Rules.UpdateRule(byzcoin.ContractDarcInvokeEvolve,
-		newExpr); err != nil {
+		newEvolveExpr); err != nil {
 		return xerrors.Errorf("couldn't update signer darc: %v", err)
 	}
 	newUserSignerBuf, err := newUserSigner.ToProto()
@@ -394,6 +397,17 @@ func (u *User) UpdateCredential() error {
 	return nil
 }
 
+// UpdateSignerDarc fetches the latest version of the signer darc.
+func (u *User) UpdateSignerDarc() error {
+	if _, err := u.cl.GetInstance(
+		byzcoin.NewInstanceID(u.SignerDarc.GetBaseID()),
+		byzcoin.ContractDarcID,
+		&u.SignerDarc); err != nil {
+		return xerrors.Errorf("couldn't get signer darc: %v", err)
+	}
+	return nil
+}
+
 func (u User) getActiveSpawner() ActiveSpawner {
 	return u.Spawner.Start(u.CoinID, u.Signer)
 }

pkg/cothority/personhood/user/user_test.go

@@ -146,8 +146,18 @@ func TestUser_Recover(t *testing.T) {
 
 	recoverStr, err := user.Recover(user2.CredIID, "https://something.com")
 	require.NoError(t, err)
+	require.NoError(t, user2.UpdateSignerDarc())
 
 	user2recover, err := NewFromURL(ut.Client, recoverStr)
 	require.NoError(t, err)
 	require.Equal(t, user2.CredIID, user2recover.CredIID)
+	require.NoError(t, user2.UpdateSignerDarc())
+
+	// Recover a second time
+	recoverStr, err = user.Recover(user2.CredIID, "https://something.com")
+	require.NoError(t, err)
+
+	user2recover, err = NewFromURL(ut.Client, recoverStr)
+	require.NoError(t, err)
+	require.Equal(t, user2.CredIID, user2recover.CredIID)
 }