@@ -11,20 +11,20 @@ import (
1111 "crypto/rand"
1212 "crypto/sha256"
1313 "crypto/sha512"
14+ "math/big"
1415 "strings"
1516
16- "github.com/holiman/uint256"
1717 "github.com/pkg/errors"
1818 "golang.org/x/crypto/pbkdf2"
1919)
2020
2121var (
22- one = uint256 .NewInt (1 )
23- two = uint256 .NewInt (2 )
22+ one = big .NewInt (1 )
23+ two = big .NewInt (2 )
2424
2525 bitsChunkSize = 11
26- shift11BitsMask = new (uint256 .Int ).Lsh (one , uint (bitsChunkSize )) // 2^11 = 2048
27- last11BitsMask = new (uint256 .Int ).Sub (shift11BitsMask , one ) // 2^11 - 1 = 2047
26+ shift11BitsMask = new (big .Int ).Lsh (one , uint (bitsChunkSize )) // 2^11 = 2048
27+ last11BitsMask = new (big .Int ).Sub (shift11BitsMask , one ) // 2^11 - 1 = 2047
2828)
2929
3030// NewEntropy will create random entropy bytes
@@ -61,10 +61,10 @@ func NewMnemonic(entropy []byte) (string, error) {
6161
6262 // Add checksum to entropy.
6363 // Entropy as an int so we can bitmask without worrying about bytes slices.
64- entropyInt := new (uint256. Int ). SetBytes ( addChecksum (entropy ) )
64+ entropyInt := addChecksum (entropy )
6565
66- // Throw away uint256 .Int for AND masking.
67- word := uint256 .NewInt (0 )
66+ // Throw away big .Int for AND masking.
67+ word := big .NewInt (0 )
6868
6969 // Slice to hold words in.
7070 words := make ([]string , sentenceLength )
@@ -92,10 +92,10 @@ func NewSeed(mnemonic, password string) []byte {
9292}
9393
9494// Appends to data the first (len(data) / 32)bits of the result of sha256(data)
95- // abd returns the result as a uint256 .Int.
95+ // abd returns the result as a big .Int.
9696//
9797// Currently only supports data up to 32 bytes.
98- func addChecksum (data []byte ) [] byte {
98+ func addChecksum (data []byte ) * big. Int {
9999 // Get first byte of sha256
100100 hash := computeChecksum (data )
101101 firstChecksumByte := hash [0 ]
@@ -106,7 +106,7 @@ func addChecksum(data []byte) []byte {
106106 // For each bit of check sum we want we shift the data one the left
107107 // and then set the (new) right most bit equal to checksum bit at that index
108108 // staring from the left
109- dataInt := new (uint256 .Int ).SetBytes (data )
109+ dataInt := new (big .Int ).SetBytes (data )
110110 for i := uint (0 ); i < checksumBitLength ; i ++ {
111111 // Bitshift 1 left
112112 dataInt .Mul (dataInt , two )
@@ -117,7 +117,7 @@ func addChecksum(data []byte) []byte {
117117 }
118118 }
119119
120- return dataInt . Bytes ()
120+ return dataInt
121121}
122122
123123func computeChecksum (data []byte ) []byte {
0 commit comments