Implement cli writer into all commands

ChainSafe · Oct 18, 2021 · 99f1966 · 99f1966
1 parent 7ac53f3
commit 99f1966
Show file tree

Hide file tree

Showing 30 changed files with 63 additions and 112 deletions.
diff --git a/chains/evm/cli/account/account.go b/chains/evm/cli/account/account.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
 	"github.com/ChainSafe/chainbridge-core/crypto/secp256k1"
@@ -73,6 +74,7 @@ func importPrivKey(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	log.Debug().Msgf("filepath: %s", res)
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
 
@@ -82,6 +84,7 @@ func generateKeyPair(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	log.Debug().Msgf("Addr: %s,  PrivKey %x", kp.CommonAddress().String(), kp.Encode())
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
 

diff --git a/chains/evm/cli/admin/add-admin.go b/chains/evm/cli/admin/add-admin.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,7 @@ func addAdmin(cmd *cobra.Command, args []string) {
 Adding admin
 Admin address: %s
 Bridge address: %s`, adminAddress, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/add-relayer.go b/chains/evm/cli/admin/add-relayer.go
@@ -7,8 +7,10 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -37,7 +39,7 @@ func AddRelayerEVMCMD(cmd *cobra.Command, args []string, txFabric calls.TxFabric
 	relayerAddress := cmd.Flag("relayer").Value.String()
 	bridgeAddress := cmd.Flag("bridge").Value.String()
 	log.Debug().Msgf(`
-Adding relayer 
+Adding relayer
 Relayer address: %s
 Bridge address: %s`, relayerAddress, bridgeAddress)
 
@@ -77,5 +79,6 @@ Bridge address: %s`, relayerAddress, bridgeAddress)
 		log.Info().Msgf("%s added as relayer", relayerAddress)
 		return err
 	}
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
diff --git a/chains/evm/cli/admin/is-relayer.go b/chains/evm/cli/admin/is-relayer.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
 	"github.com/ethereum/go-ethereum"
@@ -19,7 +20,7 @@ var isRelayerCmd = &cobra.Command{
 	Use:   "is-relayer",
 	Short: "Check if an address is registered as a relayer",
 	Long:  "Check if an address is registered as a relayer",
-	RunE:   func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		txFabric := evmtransaction.NewTransaction
 		return IsRelayer(cmd, args, txFabric)
 	},
@@ -103,6 +104,6 @@ func IsRelayer(cmd *cobra.Command, args []string, txFabric calls.TxFabric) error
 	} else {
 		log.Info().Msgf("Address %s is relayer", relayer.String())
 	}
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
-
diff --git a/chains/evm/cli/admin/pause.go b/chains/evm/cli/admin/pause.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -21,6 +22,7 @@ func pause(cmd *cobra.Command, args []string) {
 	log.Debug().Msgf(`
 Pausing
 Bridge address: %s`, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/remove-admin.go b/chains/evm/cli/admin/remove-admin.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,7 @@ func removeAdmin(cmd *cobra.Command, args []string) {
 Removing admin
 Admin address: %s
 Bridge address: %s`, adminAddress, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/remove-relayer.go b/chains/evm/cli/admin/remove-relayer.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -21,9 +22,10 @@ func removeRelayer(cmd *cobra.Command, args []string) {
 	relayerAddress := cmd.Flag("relayer").Value
 	bridgeAddress := cmd.Flag("bridge").Value
 	log.Debug().Msgf(`
-Removing relayer 
+Removing relayer
 Relayer address: %s
 Bridge address: %s`, relayerAddress, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/set-deposit-nonce.go b/chains/evm/cli/admin/set-deposit-nonce.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
 	"github.com/ethereum/go-ethereum/common"
@@ -92,5 +93,6 @@ Bridge Address: %s`, domainId, depositNonce, bridgeAddress)
 		return err
 	}
 	log.Info().Msgf("[domain ID: %v] successfully set nonce: %v at address: %s", domainId, depositNonce, bridgeAddr.String())
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
diff --git a/chains/evm/cli/admin/set-fee.go b/chains/evm/cli/admin/set-fee.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,7 @@ func setFee(cmd *cobra.Command, args []string) {
 Setting new fee
 Fee amount: %s
 Bridge address: %s`, feeAmount, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/set-threshold.go b/chains/evm/cli/admin/set-threshold.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,7 @@ func setThreshold(cmd *cobra.Command, args []string) {
 Setting new threshold
 Threshold: %d
 Bridge address: %s`, threshold, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/unpause.go b/chains/evm/cli/admin/unpause.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -21,6 +22,7 @@ func unpause(cmd *cobra.Command, args []string) {
 	log.Debug().Msgf(`
 Unpausing
 Bridge address: %s`, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/admin/withdraw.go b/chains/evm/cli/admin/withdraw.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -39,6 +40,7 @@ Handler: %s
 Token: %s
 Recipient: %s
 Decimals: %v`, amount, id, bridgeAddress, handler, token, recipient, decimals)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/bridge/cancel-proposal.go b/chains/evm/cli/bridge/cancel-proposal.go
@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -30,6 +31,7 @@ Admin address: %s
 Bridge address: %s
 Chain ID: %d
 Deposit nonce: %d`, adminAddress, bridgeAddress, domainId, depositNonce)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/bridge/query-proposal.go b/chains/evm/cli/bridge/query-proposal.go
@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -30,6 +31,7 @@ Chain ID: %d
 Deposit nonce: %d
 Data hash: %s
 Bridge address: %s`, domainId, depositNonce, dataHash, bridgeAddress)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/bridge/query-resource.go b/chains/evm/cli/bridge/query-resource.go
@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,7 @@ func queryResource(cmd *cobra.Command, args []string) {
 Querying resource
 Handler address: %s
 Resource ID: %s`, handlerAddress, resourceId)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/bridge/register-generic-resource.go b/chains/evm/cli/bridge/register-generic-resource.go
@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
@@ -40,6 +41,7 @@ Deposit: %s
 Execute: %s
 Hash: %v
 `, handlerAddress, resourceId, bridgeAddress, targetAddress, deposit, execute, hash)
+	writer.WriteCliDataToFile(cmd)
 }
 
 /*

diff --git a/chains/evm/cli/bridge/register-resource.go b/chains/evm/cli/bridge/register-resource.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
 	"github.com/ethereum/go-ethereum/common"
@@ -98,5 +99,6 @@ Bridge address: %s
 	}
 
 	fmt.Println("Resource registered")
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }
diff --git a/chains/evm/cli/bridge/set-burn.go b/chains/evm/cli/bridge/set-burn.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/evm/calls"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/flags"
+	"github.com/ChainSafe/chainbridge-core/chains/evm/cli/writer"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmclient"
 	"github.com/ChainSafe/chainbridge-core/chains/evm/evmtransaction"
 	"github.com/ethereum/go-ethereum/common"
@@ -79,5 +80,6 @@ func SetBurnCmd(cmd *cobra.Command, args []string, txFabric calls.TxFabric) erro
 		return err
 	}
 	log.Info().Msg("Burnable set")
+	writer.WriteCliDataToFile(cmd)
 	return nil
 }