Skip to content
This repository has been archived by the owner on Oct 24, 2019. It is now read-only.

Commit

Permalink
Merge pull request #15 from lochjin/master
Browse files Browse the repository at this point in the history 
=>Qitmeer
  • Loading branch information
@lochjin
lochjin authored Aug 21, 2019
2 parents 3f280d2 + 61edc47 commit 7f3f9fb
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 51 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 HalalChain
Copyright (c) 2019 Qitmeer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# qx

[![Build Status](https://travis-ci.com/HalalChain/qx.svg?branch=master)](https://travis-ci.com/HalalChain/qx)
[![Build Status](https://travis-ci.com/Qitmeer/qx.svg?branch=master)](https://travis-ci.com/Qitmeer/qx)

qx is a command-line tool that provides a variety of commands for key management and transaction construction, such as random "seed" generation, public/private key encoding etc. qx cab be built and distributed as a single file binary, which works like the swiss army knife of qitmeer


## Installation
### Binary archives
* Binary archives are published at [releases](https://github.com/HalalChain/qx/releases "releases").
* Binary archives are published at [releases](https://github.com/Qitmeer/qx/releases "releases").

### How to build

```shell
~ git clone https://github.com/HalalChain/qx.git
~ git clone https://github.com/Qitmeer/qx.git
~ cd qx
~ go build
~ ./qx
Expand Down
4 changes: 2 additions & 2 deletions core/bip32verflag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package core

import (
"fmt"
"github.com/HalalChain/qitmeer-lib/crypto/bip32"
"github.com/HalalChain/qitmeer-lib/params"
"github.com/Qitmeer/qitmeer-lib/crypto/bip32"
"github.com/Qitmeer/qitmeer-lib/params"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion core/derivepathflag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
package core

import "github.com/HalalChain/qitmeer-lib/wallet"
import "github.com/Qitmeer/qitmeer-lib/wallet"

type DerivePathFlag struct {
Path wallet.DerivationPath
Expand Down
4 changes: 2 additions & 2 deletions core/handle_addr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package core
import (
"encoding/hex"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/encode/base58"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/common/encode/base58"
"github.com/Qitmeer/qitmeer-lib/common/hash"
)

func EcPubKeyToAddress(version []byte, pubkey string) {
Expand Down
6 changes: 3 additions & 3 deletions core/handle_base58.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package core
import (
"encoding/hex"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/encode/base58"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/HalalChain/qitmeer-lib/common/util"
"github.com/Qitmeer/qitmeer-lib/common/encode/base58"
"github.com/Qitmeer/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/common/util"
"github.com/pkg/errors"
"strconv"
)
Expand Down
16 changes: 8 additions & 8 deletions core/handle_crypto.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ package core
import (
"encoding/hex"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/encode/base58"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/HalalChain/qitmeer-lib/crypto/bip32"
"github.com/HalalChain/qitmeer-lib/crypto/bip39"
"github.com/HalalChain/qitmeer-lib/crypto/ecc"
"github.com/HalalChain/qitmeer-lib/crypto/seed"
"github.com/HalalChain/qitmeer-lib/qx"
"github.com/HalalChain/qitmeer-lib/wallet"
"github.com/Qitmeer/qitmeer-lib/common/encode/base58"
"github.com/Qitmeer/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/crypto/bip32"
"github.com/Qitmeer/qitmeer-lib/crypto/bip39"
"github.com/Qitmeer/qitmeer-lib/crypto/ecc"
"github.com/Qitmeer/qitmeer-lib/crypto/seed"
"github.com/Qitmeer/qitmeer-lib/qx"
"github.com/Qitmeer/qitmeer-lib/wallet"
"strconv"
)

Expand Down
6 changes: 3 additions & 3 deletions core/handle_hash.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"crypto"
"encoding/hex"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/HalalChain/qitmeer-lib/common/hash/btc"
"github.com/HalalChain/qitmeer-lib/common/hash/dcr"
"github.com/Qitmeer/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/common/hash/btc"
"github.com/Qitmeer/qitmeer-lib/common/hash/dcr"
)

func Sha256(input string){
Expand Down
12 changes: 6 additions & 6 deletions core/handle_message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"bytes"
"encoding/base64"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/encode/base58"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/HalalChain/qitmeer-lib/common/hash/btc"
"github.com/HalalChain/qitmeer-lib/core/serialization"
"github.com/HalalChain/qitmeer-lib/crypto/ecc"
"github.com/HalalChain/qitmeer-lib/crypto/ecc/secp256k1"
"github.com/Qitmeer/qitmeer-lib/common/encode/base58"
"github.com/Qitmeer/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/common/hash/btc"
"github.com/Qitmeer/qitmeer-lib/core/serialization"
"github.com/Qitmeer/qitmeer-lib/crypto/ecc"
"github.com/Qitmeer/qitmeer-lib/crypto/ecc/secp256k1"
"reflect"
)

Expand Down
2 changes: 1 addition & 1 deletion core/handle_rlp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/encode/rlp"
"github.com/Qitmeer/qitmeer-lib/common/encode/rlp"
"io"
"strings"
)
Expand Down
16 changes: 8 additions & 8 deletions core/handle_tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"bytes"
"encoding/hex"
"fmt"
"github.com/HalalChain/qitmeer-lib/common/hash"
"github.com/HalalChain/qitmeer-lib/common/marshal"
"github.com/HalalChain/qitmeer-lib/core/address"
"github.com/HalalChain/qitmeer-lib/core/json"
"github.com/HalalChain/qitmeer-lib/core/types"
"github.com/HalalChain/qitmeer-lib/engine/txscript"
"github.com/HalalChain/qitmeer-lib/params"
"github.com/HalalChain/qitmeer-lib/qx"
"github.com/Qitmeer/qitmeer-lib/common/hash"
"github.com/Qitmeer/qitmeer-lib/common/marshal"
"github.com/Qitmeer/qitmeer-lib/core/address"
"github.com/Qitmeer/qitmeer-lib/core/json"
"github.com/Qitmeer/qitmeer-lib/core/types"
"github.com/Qitmeer/qitmeer-lib/engine/txscript"
"github.com/Qitmeer/qitmeer-lib/params"
"github.com/Qitmeer/qitmeer-lib/qx"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion core/qitmeer58checkflag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package core

import (
"encoding/hex"
"github.com/HalalChain/qitmeer-lib/params"
"github.com/Qitmeer/qitmeer-lib/params"
)

type QitmeerBase58checkVersionFlag struct {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/HalalChain/qx
module github.com/Qitmeer/qx

go 1.12

require (
github.com/HalalChain/qitmeer-lib v0.0.0-20190721130711-1a6e2f92f260
github.com/Qitmeer/qitmeer-lib v0.0.0-20190821053846-bf695e5493d1
github.com/pkg/errors v0.8.1
github.com/stretchr/testify v1.3.0
)
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
github.com/HalalChain/qitmeer-lib v0.0.0-20190721040406-4411a4bdc58c h1:h/jGU9yVqqm+mPWBXIlPOW8UKq3QW6IbxfArRDRTa90=
github.com/HalalChain/qitmeer-lib v0.0.0-20190721040406-4411a4bdc58c/go.mod h1:x0ckSIpXRVxTMMzJCtUj0vqso3UV8fat2BIjkplRkF4=
github.com/HalalChain/qitmeer-lib v0.0.0-20190721130711-1a6e2f92f260 h1:h35Y+g/5WckgW6dgrXRCwyqP/NuPTaRgmEWGA7DSbuw=
github.com/HalalChain/qitmeer-lib v0.0.0-20190721130711-1a6e2f92f260/go.mod h1:x0ckSIpXRVxTMMzJCtUj0vqso3UV8fat2BIjkplRkF4=
github.com/Qitmeer/qitmeer-lib v0.0.0-20190821053846-bf695e5493d1 h1:kMzA31wyrFAQ6b8HuVstU+5jtZHa5ZRkMycI3bTJ+Qw=
github.com/Qitmeer/qitmeer-lib v0.0.0-20190821053846-bf695e5493d1/go.mod h1:qQJR7/HBuObR1j4+dt6hLCQ8ZxiyuXjaK8ePeptriJk=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dchest/blake256 v1.0.0/go.mod h1:xXNWCE1jsAP8DAjP+rKw2MbeqLczjI3TRx2VK+9OEYY=
Expand Down
6 changes: 3 additions & 3 deletions qx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package main
import (
"flag"
"fmt"
"github.com/HalalChain/qitmeer-lib/crypto/seed"
"github.com/HalalChain/qitmeer-lib/wallet"
"github.com/HalalChain/qx/core"
"github.com/Qitmeer/qitmeer-lib/crypto/seed"
"github.com/Qitmeer/qitmeer-lib/wallet"
"github.com/Qitmeer/qx/core"
"io/ioutil"
"os"
"strings"
Expand Down
6 changes: 3 additions & 3 deletions qx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package main
import (
"encoding/hex"
"github.com/stretchr/testify/assert"
"github.com/HalalChain/qitmeer-lib/common/encode/base58"
"github.com/HalalChain/qitmeer-lib/crypto/bip32"
"github.com/HalalChain/qitmeer-lib/crypto/bip39"
"github.com/Qitmeer/qitmeer-lib/common/encode/base58"
"github.com/Qitmeer/qitmeer-lib/crypto/bip32"
"github.com/Qitmeer/qitmeer-lib/crypto/bip39"
"testing"
)

Expand Down

0 comments on commit 7f3f9fb

Please sign in to comment.