Skip to content

P
plugin
Commit 38e6e486 authored by hezhengjun's avatar hezhengjun Committed by vipwzw
Browse files
Options

add contract address set for evm tx

parent c39e8f14
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
plugin/dapp/dex/boss/deploy/chain33/farmCmd.go
View file @ 38e6e486
...@@ -4,6 +4,9 @@ import ( ...@@ -4,6 +4,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/33cn/chain33/common/address"
chain33Types "github.com/33cn/chain33/types"
"github.com/33cn/plugin/plugin/dapp/dex/contracts/pancake-farm/src/masterChef" "github.com/33cn/plugin/plugin/dapp/dex/contracts/pancake-farm/src/masterChef"
"github.com/33cn/plugin/plugin/dapp/dex/contracts/pancake-farm/src/syrupBar" "github.com/33cn/plugin/plugin/dapp/dex/contracts/pancake-farm/src/syrupBar"
evmAbi "github.com/33cn/plugin/plugin/dapp/evm/executor/abi" evmAbi "github.com/33cn/plugin/plugin/dapp/evm/executor/abi"
...@@ -104,9 +107,10 @@ func AddPool2Farm(cmd *cobra.Command, args []string) { ...@@ -104,9 +107,10 @@ func AddPool2Farm(cmd *cobra.Command, args []string) {
fmt.Println("AddPool2FarmHandle", "Failed to do abi.Pack due to:", err.Error()) fmt.Println("AddPool2FarmHandle", "Failed to do abi.Pack due to:", err.Error())
return return
} }
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData} exector := chain33Types.GetExecName("evm", paraName)
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData, ContractAddr: address.ExecAddress(exector)}
data, err := createEvmTx(chainID, &action, paraName+"evm", caller, masterChefAddrStr, expire, rpcLaddr, feeInt64) data, err := createEvmTx(chainID, &action, exector, caller, masterChefAddrStr, expire, rpcLaddr, feeInt64)
if err != nil { if err != nil {
fmt.Println("AddPool2FarmHandle", "Failed to do createEvmTx due to:", err.Error()) fmt.Println("AddPool2FarmHandle", "Failed to do createEvmTx due to:", err.Error())
return return
...@@ -170,9 +174,10 @@ func UpdateAllocPoint(cmd *cobra.Command, args []string) { ...@@ -170,9 +174,10 @@ func UpdateAllocPoint(cmd *cobra.Command, args []string) {
fmt.Println("UpdateAllocPoint", "Failed to do abi.Pack due to:", err.Error()) fmt.Println("UpdateAllocPoint", "Failed to do abi.Pack due to:", err.Error())
return return
} }
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData} exector := chain33Types.GetExecName("evm", paraName)
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData, ContractAddr: address.ExecAddress(exector)}
data, err := createEvmTx(chainID, &action, paraName+"evm", caller, masterChefAddrStr, expire, rpcLaddr, feeInt64) data, err := createEvmTx(chainID, &action, exector, caller, masterChefAddrStr, expire, rpcLaddr, feeInt64)
if err != nil { if err != nil {
fmt.Println("UpdateAllocPoint", "Failed to do createEvmTx due to:", err.Error()) fmt.Println("UpdateAllocPoint", "Failed to do createEvmTx due to:", err.Error())
return return
...@@ -229,9 +234,10 @@ func TransferOwnerShip(cmd *cobra.Command, args []string) { ...@@ -229,9 +234,10 @@ func TransferOwnerShip(cmd *cobra.Command, args []string) {
fmt.Println("TransferOwnerShip", "Failed to do abi.Pack due to:", err.Error()) fmt.Println("TransferOwnerShip", "Failed to do abi.Pack due to:", err.Error())
return return
} }
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData} exector := chain33Types.GetExecName("evm", paraName)
action := evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData, ContractAddr: address.ExecAddress(exector)}
data, err := createEvmTx(chainID, &action, paraName+"evm", caller, contract, expire, rpcLaddr, feeInt64) data, err := createEvmTx(chainID, &action, exector, caller, contract, expire, rpcLaddr, feeInt64)
if err != nil { if err != nil {
fmt.Println("TransferOwnerShip", "Failed to do createEvmTx due to:", err.Error()) fmt.Println("TransferOwnerShip", "Failed to do createEvmTx due to:", err.Error())
return return
......
plugin/dapp/dex/boss/deploy/chain33/offline/farmCmd.go
View file @ 38e6e486
...@@ -328,7 +328,7 @@ func addPool(cmd *cobra.Command, args []string) { ...@@ -328,7 +328,7 @@ func addPool(cmd *cobra.Command, args []string) {
fmt.Println("AddPool2FarmHandle", "Failed to do abi.Pack due to:", err.Error()) fmt.Println("AddPool2FarmHandle", "Failed to do abi.Pack due to:", err.Error())
return return
} }
action := &evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData} action := &evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData, ContractAddr: masterChefAddrStr}
content, txHash, err := utils.CallContractAndSign(info, action, masterChefAddrStr) content, txHash, err := utils.CallContractAndSign(info, action, masterChefAddrStr)
if nil != err { if nil != err {
fmt.Println("Failed to create master chef due to cause:", err.Error()) fmt.Println("Failed to create master chef due to cause:", err.Error())
...@@ -414,7 +414,7 @@ func updateAllocPoint(cmd *cobra.Command, args []string) { ...@@ -414,7 +414,7 @@ func updateAllocPoint(cmd *cobra.Command, args []string) {
fmt.Println("UpdateAllocPoint", "Failed to do abi.Pack due to:", err.Error()) fmt.Println("UpdateAllocPoint", "Failed to do abi.Pack due to:", err.Error())
return return
} }
action := &evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData} action := &evmtypes.EVMContractAction{Amount: 0, GasLimit: 0, GasPrice: 0, Note: parameter, Para: packData, ContractAddr: masterChefAddrStr}
content, txHash, err := utils.CallContractAndSign(info, action, masterChefAddrStr) content, txHash, err := utils.CallContractAndSign(info, action, masterChefAddrStr)
if nil != err { if nil != err {
fmt.Println("Failed to create master chef due to cause:", err.Error()) fmt.Println("Failed to create master chef due to cause:", err.Error())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment