diff --git a/go.mod b/go.mod index 129e411..3638f14 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/Salvionied/apollo v1.0.10 - github.com/blinklabs-io/bursa v0.6.0 + github.com/blinklabs-io/bursa v0.7.0 github.com/blinklabs-io/cardano-models v0.2.0 github.com/blinklabs-io/gouroboros v0.69.2 github.com/blinklabs-io/snek v0.17.0 diff --git a/go.sum b/go.sum index a690382..c0b7fa9 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/Salvionied/apollo v1.0.10/go.mod h1:5hgk1k4EiWmAoy2yU3q6+clmA4tgnHC4X github.com/Salvionied/cbor/v2 v2.6.0 h1:OEwlZLiodLdNeM9wFoSydLvj6/rHRaxu5G8VzwXSeuY= github.com/Salvionied/cbor/v2 v2.6.0/go.mod h1:oFxaUo/mQ5sG1k459nzctGdYa80jy0ZqZ9pln9C/fGw= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/blinklabs-io/bursa v0.6.0 h1:h4INnhuKjOs+zXXOuGMMAlm+GzvMtzbPKisd3iuTDdU= -github.com/blinklabs-io/bursa v0.6.0/go.mod h1:k+fdY+TTZ1/lwPmJFPqRsdMDkCKA2OXxqVl16EJAOPk= +github.com/blinklabs-io/bursa v0.7.0 h1:i0VbHfnQ/MjStIDN6ApZYV4NWtLPcYkCmym+PcCjPgA= +github.com/blinklabs-io/bursa v0.7.0/go.mod h1:5oA7x2aBuRXnQUG/xJK64BqsJHoA+Thj0HU41BJonQI= github.com/blinklabs-io/cardano-models v0.2.0 h1:fQ2vkvMLFgQodtFpYE73i+6+eNN5vaIB3GBIys8FsyI= github.com/blinklabs-io/cardano-models v0.2.0/go.mod h1:iH8IqSca4WzFQIAT3Ssd3TviILfoCgaJQ8mc3JrIvwE= github.com/blinklabs-io/gouroboros v0.69.2 h1:6FQwC1KxTPYbbugolNU03Dvm3vaCZWoceaaWLx6Skw0= diff --git a/internal/tx/tx.go b/internal/tx/tx.go index 31b6b55..3b2e7a0 100644 --- a/internal/tx/tx.go +++ b/internal/tx/tx.go @@ -208,7 +208,7 @@ func createTx(blockData any, nonce [16]byte) ([]byte, error) { if err != nil { return nil, err } - sKeyBytes, err := hex.DecodeString(bursa.PaymentSKey.CborHex) + sKeyBytes, err := hex.DecodeString(bursa.PaymentESKey.CborHex) if err != nil { return nil, err } diff --git a/internal/wallet/wallet.go b/internal/wallet/wallet.go index 71c6ffb..2693443 100644 --- a/internal/wallet/wallet.go +++ b/internal/wallet/wallet.go @@ -64,23 +64,14 @@ func Setup() { panic(err) } } - rootKey, err := bursa.GetRootKeyFromMnemonic(mnemonic) + wallet, err := bursa.NewWallet( + mnemonic, + cfg.Network, + 0, 0, 0, 0, + ) if err != nil { panic(err) } - accountKey := bursa.GetAccountKey(rootKey, 0) - paymentKey := bursa.GetPaymentKey(accountKey, 0) - stakeKey := bursa.GetStakeKey(accountKey, 0) - addr := bursa.GetAddress(accountKey, cfg.Network, 0) - wallet := &bursa.Wallet{ - Mnemonic: mnemonic, - PaymentAddress: addr.String(), - StakeAddress: addr.ToReward().String(), - PaymentVKey: bursa.GetPaymentVKey(paymentKey), - PaymentSKey: bursa.GetPaymentSKey(paymentKey), - StakeVKey: bursa.GetStakeVKey(stakeKey), - StakeSKey: bursa.GetStakeVKey(stakeKey), - } globalWallet = wallet }