From 7379b1fcdb387c4632be8148dd26eb409092bc7f Mon Sep 17 00:00:00 2001 From: faza Date: Wed, 15 Sep 2021 19:14:27 +0530 Subject: [PATCH 1/2] Fix wallet address --- cmd/git-remote-gitopia/gitopia.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/git-remote-gitopia/gitopia.go b/cmd/git-remote-gitopia/gitopia.go index 3f52f8e..c3b0a69 100644 --- a/cmd/git-remote-gitopia/gitopia.go +++ b/cmd/git-remote-gitopia/gitopia.go @@ -7,6 +7,7 @@ import ( "fmt" "net/http" "os" + "strconv" "strings" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" @@ -180,7 +181,8 @@ func (h *GitopiaHandler) Push(remote *core.Remote, local string, remoteRef strin } // Generate private key - derivedPriv, err := hd.Secp256k1.Derive()(gitopiaWallet.Mnemonic, "", gitopiaWallet.HDpath) + hdPath := gitopiaWallet.HDpath + strconv.Itoa(gitopiaWallet.PathIncrement) + derivedPriv, err := hd.Secp256k1.Derive()(gitopiaWallet.Mnemonic, "", hdPath) if err != nil { return "", err } From ebe6aa09bb82b9eb169eec643b4cf5da63f1e839 Mon Sep 17 00:00:00 2001 From: faza Date: Wed, 15 Sep 2021 19:47:01 +0530 Subject: [PATCH 2/2] Seal the sdk config only once --- cmd/git-remote-gitopia/gitopia.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/git-remote-gitopia/gitopia.go b/cmd/git-remote-gitopia/gitopia.go index c3b0a69..c5710d3 100644 --- a/cmd/git-remote-gitopia/gitopia.go +++ b/cmd/git-remote-gitopia/gitopia.go @@ -103,6 +103,10 @@ func (h *GitopiaHandler) Initialize(remote *core.Remote) error { h.remoteRepository = *res.Repository + config := sdk.GetConfig() + config.SetBech32PrefixForAccount(AccountAddressPrefix, AccountPubKeyPrefix) + config.Seal() + return nil } @@ -188,11 +192,6 @@ func (h *GitopiaHandler) Push(remote *core.Remote, local string, remoteRef strin } privKey := hd.Secp256k1.Generate()(derivedPriv) - - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(AccountAddressPrefix, AccountPubKeyPrefix) - config.Seal() - walletAddress := sdk.AccAddress(privKey.PubKey().Address()) havePushPermission, err := h.havePushPermission(walletAddress.String())