deep-stack/laconicd-deprecated
4
0
Fork 0
forked from cerc-io/laconicd-deprecated
Code Pull Requests Activity

fix upgrade

Browse Source
This commit is contained in:
0xmuralik
2023-01-05 10:39:34 +05:30
parent 6b18cc47e2
commit ded812f60c
344 changed files with 488 additions and 3426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/evm/client/cli/query.go
-8
View File
@@ -1,21 +1,13 @@
package cli
import (
<<<<<<< HEAD
rpctypes "github.com/cerc-io/laconicd/rpc/types"
=======
rpctypes "github.com/cerc-io/laconicd/rpc/types"
>>>>>>> v0.20.0
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
<<<<<<< HEAD
"github.com/cerc-io/laconicd/x/evm/types"
=======
"github.com/cerc-io/laconicd/x/evm/types"
>>>>>>> v0.20.0
)
// GetQueryCmd returns the parent command for all x/bank CLi query commands.
x/evm/client/cli/tx.go
-5
View File
@@ -12,13 +12,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
<<<<<<< HEAD
rpctypes "github.com/cerc-io/laconicd/rpc/types"
"github.com/cerc-io/laconicd/x/evm/types"
=======
rpctypes "github.com/cerc-io/laconicd/rpc/types"
"github.com/cerc-io/laconicd/x/evm/types"
>>>>>>> v0.20.0
)
// GetTxCmd returns the transaction commands for this module