Merge pull request #111 from eqlabs/latenssi/fix-109-110

Fix issues #109 and #110

templates/config.go

@@ -32,7 +32,10 @@ func parseConfig() *config {
 			if len(ss) > 2 {
 				token.lcName = ss[2]
 			}
-			cachedConfig.enabledTokens[ss[0]] = token
+			// Use all lowercase as the key so we can do case insenstive matchig
+			// in URLs
+			key := strings.ToLower(ss[0])
+			cachedConfig.enabledTokens[key] = token
 		}
 	}
 

templates/token.go

@@ -20,10 +20,10 @@ func EnabledTokens() map[string]Token {
 }
 
 func NewToken(name string) (*Token, error) {
-	// Assume the name is in declaration name format
-	token, ok := EnabledTokens()[name]
+	key := strings.ToLower(name)
+	token, ok := EnabledTokens()[key]
 	if !ok {
-		return nil, fmt.Errorf("token %s not enabled, make sure to use the declaration name format", name)
+		return nil, fmt.Errorf("token %s not enabled", name)
 	}
 	return &token, nil
 }

transactions/transactions.go

@@ -45,6 +45,11 @@ func New(
 	// Authorizers sign the payload
 	// TODO: support multiple keys per account?
 	for _, a := range authorizers {
+		// If account is also the payer, it must only sign the envelope
+		if a.Address == payer.Address {
+			continue
+		}
+
 		if err := builder.Tx.SignPayload(a.Address, a.Key.Index, a.Signer); err != nil {
 			return err
 		}