Feature/recover wallet

Makefile

@@ -4,6 +4,9 @@ export BITCOIN_NET
 run_bitcoind:
 	./scripts/run_bitcoind.sh
 
+reindex_bitciond:
+	./scripts/run_bitcoind.sh --reindex
+
 stop_bitcoind:
 	./scripts/stop_bitcoind.sh
 

internal/wallet/address.go

@@ -15,7 +15,8 @@ func (w *Wallet) NewPubkey() (pub *btcec.PublicKey, err error) {
 	if err != nil {
 		return nil, err
 	}
-	pub = (mAddr.(waddrmgr.ManagedPubKeyAddress)).PubKey()
+	mpka := mAddr.(waddrmgr.ManagedPubKeyAddress)
+	pub = mpka.PubKey()
 	return pub, err
 }
 
@@ -29,6 +30,34 @@ func (w *Wallet) NewAddress() (btcutil.Address, error) {
 	return maddr.Address(), nil
 }
 
+// ImportAddress imports an address by creating addresses until reaching to it
+// It stops after creating 100 addresses to avoid infinite loop
+func (w *Wallet) ImportAddress(addr btcutil.Address) error {
+	var maddr waddrmgr.ManagedAddress
+	err := walletdb.View(w.db, func(tx walletdb.ReadTx) (e error) {
+		ns := tx.ReadBucket(waddrmgrNamespaceKey)
+		maddr, e = w.manager.Address(ns, addr)
+		return e
+	})
+	if err == nil && maddr != nil {
+		return nil
+	}
+
+	// generate new addresses until reaching to the target address
+	for i := 0; i < 100; i++ {
+		newAddr, err := w.NewAddress()
+		if err != nil {
+			return err
+		}
+
+		if newAddr.EncodeAddress() == addr.EncodeAddress() {
+			return nil
+		}
+	}
+
+	return errors.New("failed to import address")
+}
+
 // newAddress returns a new ManagedAddress
 // NOTE: this function calls NextExternalAddresses to generate a ManagadAdddress.
 func (w *Wallet) newAddress() (waddrmgr.ManagedAddress, error) {

pkg/cmd/dlccli/contracts_deals_fix.go

@@ -13,38 +13,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var dlcid string
-var osigfile string
-var contractorType int
-
-func runFixDeal(cmd *cobra.Command, args []string) {
-	c := initCotractor()
-
-	osig := parseOracleSignedMsg()
-
-	idxs := []int{}
-	n := len(osig.Sigs)
-	for i := 0; i < n; i++ {
-		idxs = append(idxs, i)
-	}
-	err := c.builder.FixDeal(osig, idxs)
-	errorHandler(err)
-
-	cetx, err := c.builder.SignedContractExecutionTx()
-	errorHandler(err)
-
-	cetxHex, err := utils.TxToHex(cetx)
-	errorHandler(err)
-	fmt.Printf("\nCETx hex:\n%s\n", cetxHex)
-
-	cltx, err := c.builder.SignedClosingTx(cetx)
-	errorHandler(err)
-	cltxHex, err := utils.TxToHex(cltx)
-	errorHandler(err)
-	fmt.Printf("\nClosingTx hex:\n%s\n", cltxHex)
-}
-
-func initCotractor() *Contractor {
+func initCotractor(
+	dlcid, walletDir, walletName, pubpass, privpass string, contractorType int) *Contractor {
 	w, wdb := openWallet(pubpass, walletDir, walletName)
 	err := w.Unlock([]byte(privpass))
 	errorHandler(err)
@@ -69,7 +39,7 @@ func initCotractor() *Contractor {
 	}
 }
 
-func parseOracleSignedMsg() *oracle.SignedMsg {
+func parseOracleSignedMsg(osigfile string) *oracle.SignedMsg {
 	data, err := ioutil.ReadFile(osigfile)
 	errorHandler(err)
 
@@ -81,10 +51,44 @@ func parseOracleSignedMsg() *oracle.SignedMsg {
 }
 
 func initFixDealCmd() *cobra.Command {
+	var dlcid string
+	var osigfile string
+	var contractorType int
+	var walletName string
+	var pubpass string
+	var privpass string
+
 	var cmd = &cobra.Command{
 		Use:   "fix",
 		Short: "Fix deal",
-		Run:   runFixDeal,
+		Run: func(cmd *cobra.Command, args []string) {
+			c := initCotractor(
+				dlcid, walletDir, walletName, pubpass, privpass, contractorType)
+
+			osig := parseOracleSignedMsg(osigfile)
+
+			idxs := []int{}
+			n := len(osig.Sigs)
+			for i := 0; i < n; i++ {
+				idxs = append(idxs, i)
+			}
+			err := c.builder.FixDeal(osig, idxs)
+			errorHandler(err)
+
+			cetx, err := c.builder.SignedContractExecutionTx()
+			errorHandler(err)
+
+			cetxHex, err := utils.TxToHex(cetx)
+			errorHandler(err)
+			fmt.Printf("\nCETx hex:\n%s\n", cetxHex)
+
+			cltx, err := c.builder.SignedClosingTx(cetx)
+			errorHandler(err)
+			cltxHex, err := utils.TxToHex(cltx)
+			errorHandler(err)
+			fmt.Printf("\nClosingTx hex:\n%s\n", cltxHex)
+
+		},
 	}
 
 	cmd.Flags().StringVar(&dlcid, "dlcid", "", "Contract ID")