chore : update gomod -> v2

9bc7391c · XinFeng Liu · 2db71d78 · 9bc7391c · 9bc7391c · 9bc7391c
Commit 9bc7391c authored 3 years ago by XinFeng Liu
60 changed files
--- a/alert/sdk_alert.go
+++ b/alert/sdk_alert.go
@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"net/http"

-	"chainmaker.org/chainmaker/common/httputils"
-	"chainmaker.org/chainmaker/common/json"
+	"chainmaker.org/chainmaker/common/v2/httputils"
+	"chainmaker.org/chainmaker/common/v2/json"
 )

 const (

--- a/ca/ca_client.go
+++ b/ca/ca_client.go
@@ -13,7 +13,7 @@ import (
 	"errors"
 	"fmt"

-	"chainmaker.org/chainmaker/common/log"
+	"chainmaker.org/chainmaker/common/v2/log"

 	"github.com/tjfoc/gmsm/sm2"
 	"github.com/tjfoc/gmtls"

--- a/ca/ca_server.go
+++ b/ca/ca_server.go
@@ -13,7 +13,7 @@ import (
 	"errors"
 	"fmt"

-	"chainmaker.org/chainmaker/common/log"
+	"chainmaker.org/chainmaker/common/v2/log"

 	"github.com/tjfoc/gmsm/sm2"
 	"github.com/tjfoc/gmtls"

--- a/cert/cert.go
+++ b/cert/cert.go
@@ -24,12 +24,12 @@ import (
 	"path/filepath"
 	"time"

-	bcx509 "chainmaker.org/chainmaker/common/crypto/x509"
+	bcx509 "chainmaker.org/chainmaker/common/v2/crypto/x509"
 	"github.com/tjfoc/gmsm/sm2"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/asym"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 )

 const (

--- a/cert/cert_test.go
+++ b/cert/cert_test.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/asym/asym.go
+++ b/crypto/asym/asym.go
@@ -26,9 +26,9 @@ import (
 	"path/filepath"
 	"strings"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/asym/ecdsa"
-	"chainmaker.org/chainmaker/common/crypto/asym/rsa"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym/ecdsa"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym/rsa"
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/tjfoc/gmsm/sm2"
 )

--- a/crypto/asym/asym_test.go
+++ b/crypto/asym/asym_test.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/asym/ecdsa/pk.go
+++ b/crypto/asym/ecdsa/pk.go
@@ -19,8 +19,8 @@ import (
 	"errors"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/tjfoc/gmsm/sm2"
 )

--- a/crypto/asym/ecdsa/sk.go
+++ b/crypto/asym/ecdsa/sk.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/tjfoc/gmsm/sm2"
 )

--- a/crypto/asym/ecdsa/sk_test.go
+++ b/crypto/asym/ecdsa/sk_test.go
@@ -14,7 +14,7 @@ import (
 	"os"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/asym/rsa/pk.go
+++ b/crypto/asym/rsa/pk.go
@@ -17,8 +17,8 @@ import (
 	"encoding/pem"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 )

 type PublicKey struct {

--- a/crypto/asym/rsa/sk.go
+++ b/crypto/asym/rsa/sk.go
@@ -17,8 +17,8 @@ import (
 	"encoding/pem"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 )

 var defaultRSAOpts = &crypto.EncOpts{

--- a/crypto/asym/rsa/sk_test.go
+++ b/crypto/asym/rsa/sk_test.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/bulletproofs/bulletproofs_fast.go
+++ b/crypto/bulletproofs/bulletproofs_fast.go
@@ -11,7 +11,7 @@ package bulletproofs

 import "C"
 import (
-	"chainmaker.org/chainmaker/common/crypto/bulletproofs/bulletproofs_cgo"
+	"chainmaker.org/chainmaker/common/v2/crypto/bulletproofs/bulletproofs_cgo"
 )

 type bulletproofs struct{}

--- a/crypto/bulletproofs/bulletproofs_slow.go
+++ b/crypto/bulletproofs/bulletproofs_slow.go
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0

 package bulletproofs

-import "chainmaker.org/chainmaker/common/crypto/bulletproofs/bulletproofs_nocgo"
+import "chainmaker.org/chainmaker/common/v2/crypto/bulletproofs/bulletproofs_nocgo"

 // ProveRandomOpening Generate proof with randomly pick opening
 // x: prove x is in the range [0, 2^64)

--- a/crypto/hash/hash.go
+++ b/crypto/hash/hash.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"hash"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/tjfoc/gmsm/sm3"
 	"golang.org/x/crypto/sha3"
 )

--- a/crypto/hash/hash_test.go
+++ b/crypto/hash/hash_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/hash/merkle.go
+++ b/crypto/hash/merkle.go
@@ -11,7 +11,7 @@ import (
 	"crypto/sha256"
 	"math"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 )

 var h = sha256.New()

--- a/crypto/hash/merkle_test.go
+++ b/crypto/hash/merkle_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"

-	"chainmaker.org/chainmaker/common/random/uuid"
+	"chainmaker.org/chainmaker/common/v2/random/uuid"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/hibe/hibe_amd64/hibe.go
+++ b/crypto/hibe/hibe_amd64/hibe.go
@@ -14,9 +14,9 @@ import (
 	"fmt"
 	"strings"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 const (

--- a/crypto/hibe/hibe_amd64/hibe/core.go
+++ b/crypto/hibe/hibe_amd64/hibe/core.go
@@ -48,7 +48,7 @@ import (
 	"io"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 // Params represents the system parameters for a hierarchy.

--- a/crypto/hibe/hibe_amd64/hibe/core_test.go
+++ b/crypto/hibe/hibe_amd64/hibe/core_test.go
@@ -7,7 +7,7 @@ import (
 	"math/big"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 var LINEAR_HIERARCHY = []*big.Int{big.NewInt(1), big.NewInt(2), big.NewInt(3)}

--- a/crypto/hibe/hibe_amd64/hibe/utils.go
+++ b/crypto/hibe/hibe_amd64/hibe/utils.go
@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 // geSize is the base size in bytes of a marshalled group element. The size of

--- a/crypto/hibe/hibe_amd64/hibe/utils_test.go
+++ b/crypto/hibe/hibe_amd64/hibe/utils_test.go
@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 var ID = []string{"a", "b", "c"}

--- a/crypto/hibe/hibe_amd64/hibe_test.go
+++ b/crypto/hibe/hibe_amd64/hibe_test.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/hibe/hibe_amd64/hibeutils.go
+++ b/crypto/hibe/hibe_amd64/hibeutils.go
@@ -15,10 +15,10 @@ import (
 	"reflect"
 	"strings"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/sym"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym"
 )

 // ValidateId is used to validate id format

--- a/crypto/hibe/hibe_fast.go
+++ b/crypto/hibe/hibe_fast.go
@@ -13,10 +13,10 @@ import (
 	"io"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe/bn256"
 )

 type Params = hibe.Params

--- a/crypto/hibe/hibe_fast_test.go
+++ b/crypto/hibe/hibe_fast_test.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_amd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_amd64/hibe"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/hibe/hibe_noamd64/hibe.go
+++ b/crypto/hibe/hibe_noamd64/hibe.go
@@ -14,9 +14,9 @@ import (
 	"fmt"
 	"strings"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 const (

--- a/crypto/hibe/hibe_noamd64/hibe/core.go
+++ b/crypto/hibe/hibe_noamd64/hibe/core.go
@@ -48,7 +48,7 @@ import (
 	"io"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 // Params represents the system parameters for a hierarchy.

--- a/crypto/hibe/hibe_noamd64/hibe/core_test.go
+++ b/crypto/hibe/hibe_noamd64/hibe/core_test.go
@@ -7,7 +7,7 @@ import (
 	"math/big"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 var LINEAR_HIERARCHY = []*big.Int{big.NewInt(1), big.NewInt(2), big.NewInt(3)}

--- a/crypto/hibe/hibe_noamd64/hibe/utils.go
+++ b/crypto/hibe/hibe_noamd64/hibe/utils.go
@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 // geSize is the base size in bytes of a marshalled group element. The size of

--- a/crypto/hibe/hibe_noamd64/hibe/utils_test.go
+++ b/crypto/hibe/hibe_noamd64/hibe/utils_test.go
@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 var ID = []string{"a", "b", "c"}

--- a/crypto/hibe/hibe_noamd64/hibeutils.go
+++ b/crypto/hibe/hibe_noamd64/hibeutils.go
@@ -15,10 +15,10 @@ import (
 	"reflect"
 	"strings"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hash"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/sym"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym"
 )

 // ValidateId is used to validate id format

--- a/crypto/hibe/hibe_slow.go
+++ b/crypto/hibe/hibe_slow.go
@@ -13,10 +13,10 @@ import (
 	"io"
 	"math/big"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe/bn256"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe/bn256"
 )

 type Params = hibe.Params

--- a/crypto/hibe/hibe_slow_test.go
+++ b/crypto/hibe/hibe_slow_test.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/hibe/hibe_noamd64/hibe"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/hibe/hibe_noamd64/hibe"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/pkcs11/ecdsakey.go
+++ b/crypto/pkcs11/ecdsakey.go
@@ -13,9 +13,9 @@ import (
 	"fmt"
 	"math/big"

-	bccrypto "chainmaker.org/chainmaker/common/crypto"
-	bcecdsa "chainmaker.org/chainmaker/common/crypto/asym/ecdsa"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	bccrypto "chainmaker.org/chainmaker/common/v2/crypto"
+	bcecdsa "chainmaker.org/chainmaker/common/v2/crypto/asym/ecdsa"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 	"github.com/miekg/pkcs11"
 	"github.com/tjfoc/gmsm/sm2"
 	"github.com/tjfoc/gmsm/sm3"

--- a/crypto/pkcs11/pkcs11.go
+++ b/crypto/pkcs11/pkcs11.go
@@ -16,10 +16,10 @@ import (
 	"fmt"
 	"math/big"

-	bccrypto "chainmaker.org/chainmaker/common/crypto"
-	bcecdsa "chainmaker.org/chainmaker/common/crypto/asym/ecdsa"
-	bcrsa "chainmaker.org/chainmaker/common/crypto/asym/rsa"
-	"chainmaker.org/chainmaker/common/crypto/hash"
+	bccrypto "chainmaker.org/chainmaker/common/v2/crypto"
+	bcecdsa "chainmaker.org/chainmaker/common/v2/crypto/asym/ecdsa"
+	bcrsa "chainmaker.org/chainmaker/common/v2/crypto/asym/rsa"
+	"chainmaker.org/chainmaker/common/v2/crypto/hash"
 	"github.com/miekg/pkcs11"
 	"github.com/tjfoc/gmsm/sm2"
 )

--- a/crypto/pkcs11/rsakey.go
+++ b/crypto/pkcs11/rsakey.go
@@ -11,7 +11,7 @@ import (
 	"crypto"
 	"fmt"

-	bccrypto "chainmaker.org/chainmaker/common/crypto"
+	bccrypto "chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/miekg/pkcs11"
 )


--- a/crypto/sym/aes/aes.go
+++ b/crypto/sym/aes/aes.go
@@ -15,9 +15,9 @@ import (
 	"encoding/hex"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/sym/modes"
-	"chainmaker.org/chainmaker/common/crypto/sym/util"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/modes"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/util"
 )

 const (

--- a/crypto/sym/aes/aes_test.go
+++ b/crypto/sym/aes/aes_test.go
@@ -12,8 +12,8 @@ import (
 	"encoding/hex"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/sym/modes"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/modes"

 	"crypto/rand"
 	"testing"

--- a/crypto/sym/sm4/sm4.go
+++ b/crypto/sym/sm4/sm4.go
@@ -12,9 +12,9 @@ import (
 	"crypto/rand"
 	"encoding/hex"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/sym/modes"
-	"chainmaker.org/chainmaker/common/crypto/sym/util"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/modes"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/util"
 	"github.com/tjfoc/gmsm/sm4"
 )


--- a/crypto/sym/sym.go
+++ b/crypto/sym/sym.go
@@ -12,9 +12,9 @@ import (
 	"errors"
 	"fmt"

-	"chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/sym/aes"
-	"chainmaker.org/chainmaker/common/crypto/sym/sm4"
+	"chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/aes"
+	"chainmaker.org/chainmaker/common/v2/crypto/sym/sm4"
 )

 var (

--- a/crypto/sym/sym_test.go
+++ b/crypto/sym/sym_test.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"testing"

-	"chainmaker.org/chainmaker/common/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto"
 	"github.com/stretchr/testify/require"
 )


--- a/crypto/tee/verify.go
+++ b/crypto/tee/verify.go
@@ -12,10 +12,10 @@ import (
 	"encoding/pem"
 	"fmt"

-	bccrypto "chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/asym"
-	"chainmaker.org/chainmaker/common/crypto/asym/rsa"
-	bcx509 "chainmaker.org/chainmaker/common/crypto/x509"
+	bccrypto "chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym/rsa"
+	bcx509 "chainmaker.org/chainmaker/common/v2/crypto/x509"
 )

 type TEEProof struct {

--- a/crypto/x509/x509.go
+++ b/crypto/x509/x509.go
@@ -32,10 +32,10 @@ import (
 	"time"
 	"unicode/utf8"

-	bccrypto "chainmaker.org/chainmaker/common/crypto"
-	"chainmaker.org/chainmaker/common/crypto/asym"
-	bcecdsa "chainmaker.org/chainmaker/common/crypto/asym/ecdsa"
-	bcrsa "chainmaker.org/chainmaker/common/crypto/asym/rsa"
+	bccrypto "chainmaker.org/chainmaker/common/v2/crypto"
+	"chainmaker.org/chainmaker/common/v2/crypto/asym"
+	bcecdsa "chainmaker.org/chainmaker/common/v2/crypto/asym/ecdsa"
+	bcrsa "chainmaker.org/chainmaker/common/v2/crypto/asym/rsa"
 	"github.com/tjfoc/gmsm/sm2"
 	"golang.org/x/crypto/cryptobyte"
 	cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1"

--- a/errors/json_errors.go
+++ b/errors/json_errors.go
@@ -10,7 +10,7 @@ package errors
 import (
 	"fmt"

-	"chainmaker.org/chainmaker/common/json"
+	"chainmaker.org/chainmaker/common/v2/json"
 )

 var (

--- a/go.mod
+++ b/go.mod
-module chainmaker.org/chainmaker/common
+module chainmaker.org/chainmaker/common/v2

 go 1.15


--- a/go.sum
+++ b/go.sum
@@ -150,16 +150,10 @@ github.com/tebeka/strftime v0.1.5 h1:1NQKN1NiQgkqd/2moD6ySP/5CoZQsKa1d3ZhJ44Jpmg
 github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
 github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
 github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
-github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
-github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
 github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/tinylru v1.0.2 h1:W4mp7iUz4cnVMqAvWy2zbzC35ASv5sqdyyEjoQKKBFg=
 github.com/tidwall/tinylru v1.0.2/go.mod h1:HDVL7TsWeezQ4g44Um84TOVBMFcq7Xa9giqNc805KJ8=
 github.com/tjfoc/gmsm v1.2.3/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=

--- a/helper/libp2pcrypto/ecdsa.go
+++ b/helper/libp2pcrypto/ecdsa.go
@@ -10,7 +10,7 @@ import (
 	"io"
 	"math/big"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"

 	sha256 "github.com/minio/sha256-simd"
 )

--- a/helper/libp2pcrypto/ed25519.go
+++ b/helper/libp2pcrypto/ed25519.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"io"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"
 )

 // Ed25519PrivateKey is an ed25519 private key.

--- a/helper/libp2pcrypto/key.go
+++ b/helper/libp2pcrypto/key.go
@@ -16,7 +16,7 @@ import (
 	"hash"
 	"io"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"

 	"github.com/gogo/protobuf/proto"
 	sha256 "github.com/minio/sha256-simd"

--- a/helper/libp2pcrypto/rsa_go.go
+++ b/helper/libp2pcrypto/rsa_go.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"sync"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"

 	"github.com/minio/sha256-simd"
 )

--- a/helper/libp2pcrypto/secp256k1.go
+++ b/helper/libp2pcrypto/secp256k1.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"

 	btcec "github.com/btcsuite/btcd/btcec"
 	sha256 "github.com/minio/sha256-simd"

--- a/helper/libp2pcrypto/sm2.go
+++ b/helper/libp2pcrypto/sm2.go
@@ -4,7 +4,7 @@ import (
 	"encoding/asn1"
 	"math/big"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto/pb"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto/pb"
 	"github.com/tjfoc/gmsm/sm2"

 	sha256 "github.com/minio/sha256-simd"

--- a/helper/libp2ppeer/peer.go
+++ b/helper/libp2ppeer/peer.go
 package libp2ppeer

 import (
-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto"
 	b58 "github.com/mr-tron/base58/base58"
 	mh "github.com/multiformats/go-multihash"
 )

--- a/helper/net_helper.go
+++ b/helper/net_helper.go
@@ -16,8 +16,8 @@ import (
 	"fmt"
 	"strings"

-	"chainmaker.org/chainmaker/common/helper/libp2pcrypto"
-	"chainmaker.org/chainmaker/common/helper/libp2ppeer"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2pcrypto"
+	"chainmaker.org/chainmaker/common/v2/helper/libp2ppeer"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/tjfoc/gmsm/sm2"
 )

--- a/log/file-rotatelogs/options.go
+++ b/log/file-rotatelogs/options.go
@@ -9,7 +9,7 @@ package rotatelogs
 import (
 	"time"

-	"chainmaker.org/chainmaker/common/log/file-rotatelogs/internal/option"
+	"chainmaker.org/chainmaker/common/v2/log/file-rotatelogs/internal/option"
 )

 const (

--- a/log/log.go
+++ b/log/log.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"

-	rotatelogs "chainmaker.org/chainmaker/common/log/file-rotatelogs"
+	rotatelogs "chainmaker.org/chainmaker/common/v2/log/file-rotatelogs"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )

--- a/msgbus/mock/msg_bus_mock.go
+++ b/msgbus/mock/msg_bus_mock.go
@@ -7,7 +7,7 @@ package mock
 import (
 	reflect "reflect"

-	msgbus "chainmaker.org/chainmaker/common/msgbus"
+	msgbus "chainmaker.org/chainmaker/common/v2/msgbus"
 	gomock "github.com/golang/mock/gomock"
 )