feat: update client cli

qlcchain · Apr 12, 2021 · 8bdf66d · 8bdf66d
1 parent 2adbab8
commit 8bdf66d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 8 deletions.
diff --git a/cmd/client/commands/hub_deposit.go b/cmd/client/commands/hub_deposit.go
@@ -26,6 +26,7 @@ func addHubCmd(shell *ishell.Shell) {
 	hEth2NeoCmd(hubCmd)
 	hEth2NeoPendingCmd(hubCmd)
 	hNeo2BscCmd(hubCmd)
+	hBsc2NeoCmd(hubCmd)
 }
 
 func hNeo2EthCmd(parentCmd *ishell.Cmd) {
@@ -125,7 +126,7 @@ func hNeo2Eth() {
 	unsignedParas := fmt.Sprintf(`{
 		"amount": %d,
 		"nep5SenderAddr": "%s",
-		"erc20ReceiverAddr": "%s"
+		"tokenMintedToAddress": "%s"
 	}`, amount, neoUserAddr, ethUserAddress)
 	r, err := post(unsignedParas, fmt.Sprintf("%s/deposit/packNeoTransaction", hubUrl))
 	if err != nil {

diff --git a/cmd/client/commands/hub_withdraw.go b/cmd/client/commands/hub_withdraw.go
@@ -72,3 +72,38 @@ func hEth2NeoPending() {
 
 	fmt.Println("successfully")
 }
+
+func hBsc2NeoCmd(parentCmd *ishell.Cmd) {
+	c := &ishell.Cmd{
+		Name: "bsc2neo",
+		Help: "bsc -> neo",
+		Func: func(c *ishell.Context) {
+			hBsc2Neo()
+		},
+	}
+	parentCmd.AddCmd(c)
+}
+
+func hBsc2Neo() {
+	amount := 110000000
+	ethTx, err := bscTransactionNep5.Burn(bscUserPrivate, neoUserAddr, big.NewInt(int64(amount)))
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println("withdraw send eth tx done: ", ethTx)
+
+	sentParas := fmt.Sprintf(`{
+		"hash":"%s",
+		"chainType":"%s"
+	}`, ethTx, "bsc")
+	r, err := post(sentParas, fmt.Sprintf("%s/withdraw/chainTransactionSent", hubUrl))
+	if err != nil {
+		log.Fatal(err, r)
+	}
+
+	if !waitForSwapState(ethTx, types.SwapStateToString(types.WithDrawDone)) {
+		log.Fatal("fail")
+	}
+
+	fmt.Println("successfully")
+}
diff --git a/cmd/client/commands/qlc_pledge.go b/cmd/client/commands/qlc_pledge.go
@@ -51,7 +51,7 @@ func qQlc2EthPendingCmd(parentCmd *ishell.Cmd) {
 }
 
 func nQlc2Eth() {
-	amount := 900000000
+	amount := 500000000
 
 	// get pledge send block
 	Paras := fmt.Sprintf(`{

diff --git a/cmd/client/commands/qlc_withdraw.go b/cmd/client/commands/qlc_withdraw.go
@@ -33,7 +33,7 @@ func qEth2QlcCmdPending(parentCmd *ishell.Cmd) {
 }
 
 func nEth2Qlc() {
-	amount := 900000
+	amount := 300000000
 	ethTx, err := ethTransactionQLC.Burn(ethUserPrivate, qlcUserAddress, big.NewInt(int64(amount)))
 	if err != nil {
 		log.Fatal(err)

diff --git a/cmd/client/commands/root.go b/cmd/client/commands/root.go
@@ -46,10 +46,10 @@ var (
 	bscUserAddress  = "0x318c6E6613D34a57972f2679d5039E807f048C6E"
 
 	// eth setting (qgas -> eth)
-	ethContractQLC = "0x1aFFc415416f1D157F4603f37aE1AC9011487111"
+	ethContractQGas = "0x1aFFc415416f1D157F4603f37aE1AC9011487111"
 
 	// bsc setting (qgas -> eth)
-	bscContractQLC = "0xF791c6cf47C3650Fb8e65f1Ab0bFaDEfcFD51af5"
+	bscContractQGas = "0xF791c6cf47C3650Fb8e65f1Ab0bFaDEfcFD51af5"
 
 	// qlc setting
 	qlcUserPrivate = "8be0696a2d51dec8e2859dcb8ce2fd7ce7412eb9d6fa8a2089be8e8f1eeb4f0e458779381a8d21312b071729344a0cb49dc1da385993e19d58b5578da44c0df0"
@@ -102,8 +102,8 @@ func initParams(osArgs []string) {
 
 	ethTransactionNep5, _ = eth.NewTransaction(ethUrl, ethContract)
 	bscTransactionNep5, _ = eth.NewTransaction(bscUrl, bscContractNep5)
-	ethTransactionQLC, _ = eth.NewTransaction(ethUrl, ethContractQLC)
-	bscTransactionQLC, _ = eth.NewTransaction(bscUrl, bscContractQLC)
+	ethTransactionQLC, _ = eth.NewTransaction(ethUrl, ethContractQGas)
+	bscTransactionQLC, _ = eth.NewTransaction(bscUrl, bscContractQGas)
 	//defer ethClient.Close()
 
 	log.Println("hub endpoint: ", hubUrl)

diff --git a/pkg/eth/transaction.go b/pkg/eth/transaction.go
@@ -48,12 +48,13 @@ func (t *Transaction) WaitTxVerifyAndConfirmed(txHash common.Hash, txHeight uint
 	cTicker := time.NewTicker(3 * time.Second)
 	cTimer := time.NewTimer(600 * time.Second)
 	client := t.Client()
+	var erro error
 	for {
 		select {
 		case <-cTicker.C:
 			tx, p, err := client.TransactionByHash(context.Background(), txHash)
 			if err != nil {
-				t.logger.Errorf("tx by hash: %s , txHash: %s", err, txHash.String())
+				erro = err
 			}
 			if tx != nil && !p { // if tx not found , p is false
 				if txHeight == 0 {
@@ -67,6 +68,9 @@ func (t *Transaction) WaitTxVerifyAndConfirmed(txHash common.Hash, txHeight uint
 				}
 			}
 		case <-cTimer.C:
+			if erro != nil {
+				t.logger.Errorf("tx by hash: %s , txHash: %s", erro, txHash.String())
+			}
 			return fmt.Errorf("tx by hash timeout: %s", txHash)
 		}
 	}