wallet - nut-02 fees

elnosh · Jul 16, 2024 · a64be06 · a64be06
1 parent c1a53ce
commit a64be06
Show file tree

Hide file tree

Showing 4 changed files with 358 additions and 117 deletions.
diff --git a/cashu/cashu.go b/cashu/cashu.go
@@ -258,3 +258,20 @@ func AmountSplit(amount uint64) []uint64 {
  }
  return rv
 }
+
+func Max(x, y uint64) uint64 {
+ if x > y {
+ return x
+ }
+ return y
+}
+
+func Count(amounts []uint64, amount uint64) uint {
+ var count uint = 0
+ for _, amt := range amounts {
+ if amt == amount {
+ count++
+ }
+ }
+ return count
+}
diff --git a/crypto/keyset.go b/crypto/keyset.go
@@ -182,21 +182,23 @@ func (kp *KeyPair) UnmarshalJSON(data []byte) error {
 type KeysetsMap map[string]map[string]WalletKeyset
 
 type WalletKeyset struct {
- Id string
- MintURL string
- Unit string
- Active bool
- PublicKeys map[uint64]*secp256k1.PublicKey
- Counter uint32
+ Id string
+ MintURL string
+ Unit string
+ Active bool
+ PublicKeys map[uint64]*secp256k1.PublicKey
+ Counter uint32
+ InputFeePpk uint
 }
 
 type WalletKeysetTemp struct {
- Id string
- MintURL string
- Unit string
- Active bool
- PublicKeys map[uint64][]byte
- Counter uint32
+ Id string
+ MintURL string
+ Unit string
+ Active bool
+ PublicKeys map[uint64][]byte
+ Counter uint32
+ InputFeePpk uint
 }
 
 func (wk *WalletKeyset) MarshalJSON() ([]byte, error) {
@@ -212,7 +214,8 @@ func (wk *WalletKeyset) MarshalJSON() ([]byte, error) {
  }
  return m
  }(),
- Counter: wk.Counter,
+ Counter: wk.Counter,
+ InputFeePpk: wk.InputFeePpk,
  }
 
  return json.Marshal(temp)
@@ -230,6 +233,7 @@ func (wk *WalletKeyset) UnmarshalJSON(data []byte) error {
  wk.Unit = temp.Unit
  wk.Active = temp.Active
  wk.Counter = temp.Counter
+ wk.InputFeePpk = temp.InputFeePpk
 
  wk.PublicKeys = make(map[uint64]*secp256k1.PublicKey)
  for k, v := range temp.PublicKeys {