Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

multi: v2 reputation and client bond refactor #2501

Merged
merged 16 commits into from
Oct 3, 2023
Merged

multi: v2 reputation and client bond refactor #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc1f696
connect result v2
buck54321 Aug 4, 2023
3ffd1b1
send score with tier report
buck54321 Aug 11, 2023
79c1b24
refactor client reserves
buck54321 Sep 2, 2023
3d6504a
some basic tests
buck54321 Sep 4, 2023
0927111
merging bonds
buck54321 Sep 4, 2023
795571e
monitor v1 reputation
buck54321 Sep 5, 2023
9ce1068
score change notifications
buck54321 Sep 5, 2023
034eec0
optional balance checks
buck54321 Sep 5, 2023
f566974
add bond strength
buck54321 Sep 5, 2023
f013d4c
update exported core types
buck54321 Sep 5, 2023
5d5d5db
fix some stuff
buck54321 Sep 5, 2023
4988a7b
update rpcserver bondopts and some fixes
buck54321 Sep 5, 2023
ab4747a
better reserves calcs. other review fixes
buck54321 Sep 12, 2023
dfe6812
review followup
buck54321 Sep 17, 2023
ac22a22
fix maxbonded when lowering tier
buck54321 Sep 25, 2023
d77aee6
joegruff review
buck54321 Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
242 changes: 12 additions & 230 deletions client/asset/btc/btc.go
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions client/asset/btc/btc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,13 +858,13 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
}

type test struct {
name string
multiOrder *asset.MultiOrder
allOrNothing bool
maxLock uint64
utxos []*ListUnspentResult
bondReservesEnforced int64
balance uint64
name string
multiOrder *asset.MultiOrder
allOrNothing bool
maxLock uint64
utxos []*ListUnspentResult
bondReserves uint64
balance uint64

// if expectedCoins is nil, all the coins are from
// the split output. If any of the coins are nil,
Expand Down Expand Up @@ -1081,8 +1081,8 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
multiSplitKey: "false",
},
},
maxLock: 46e5,
bondReservesEnforced: 12e5,
maxLock: 46e5,
bondReserves: 12e5,
utxos: []*ListUnspentResult{
{
Confirmations: 1,
Expand Down Expand Up @@ -1486,7 +1486,7 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
multiSplitKey: "true",
},
},
bondReservesEnforced: 2e6,
bondReserves: 2e6,
utxos: []*ListUnspentResult{
{
Confirmations: 1,
Expand Down Expand Up @@ -1540,7 +1540,7 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
multiSplitKey: "true",
},
},
bondReservesEnforced: 2e6,
bondReserves: 2e6,
utxos: []*ListUnspentResult{
{
Confirmations: 1,
Expand Down Expand Up @@ -1783,10 +1783,10 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
Vout: 0,
},
},
maxLock: 0,
bondReservesEnforced: 1e6,
balance: 144e5,
expectSendRawTx: true,
maxLock: 0,
bondReserves: 1e6,
balance: 144e5,
expectSendRawTx: true,
expectedInputs: []*wire.TxIn{
{
PreviousOutPoint: wire.OutPoint{
Expand Down Expand Up @@ -1823,7 +1823,7 @@ func testFundMultiOrder(t *testing.T, segwit bool, walletType string) {
},
}
wallet.fundingCoins = make(map[outPoint]*utxo)
wallet.bondReservesEnforced = test.bondReservesEnforced
wallet.bondReserves.Store(test.bondReserves)

allCoins, _, splitFee, err := wallet.FundMultiOrder(test.multiOrder, test.maxLock)
if test.expectErr {
Expand Down Expand Up @@ -3781,10 +3781,10 @@ func testSender(t *testing.T, senderType tSenderType, segwit bool, walletType st
}

type test struct {
name string
val uint64
unspents []*ListUnspentResult
bondReservesEnforced int64
name string
val uint64
unspents []*ListUnspentResult
bondReserves uint64

expectedInputs []*outPoint
expectSentVal uint64
Expand Down Expand Up @@ -3829,9 +3829,9 @@ func testSender(t *testing.T, senderType tSenderType, segwit bool, walletType st
{txHash: txHash,
vout: 0},
},
expectSentVal: expectedSentVal(toSatoshi(5), expectedFees(1)),
expectChange: expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1)),
bondReservesEnforced: int64(expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1))),
expectSentVal: expectedSentVal(toSatoshi(5), expectedFees(1)),
expectChange: expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1)),
bondReserves: expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1)),
},
{
name: "not enough change for bond reserves",
Expand All @@ -3850,8 +3850,8 @@ func testSender(t *testing.T, senderType tSenderType, segwit bool, walletType st
{txHash: txHash,
vout: 0},
},
bondReservesEnforced: int64(expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1))) + 1,
expectErr: true,
bondReserves: expectedChangeVal(toSatoshi(5.2), toSatoshi(5), expectedFees(1)) + 1,
expectErr: true,
},
{
name: "1 satoshi less than needed",
Expand Down Expand Up @@ -3892,7 +3892,7 @@ func testSender(t *testing.T, senderType tSenderType, segwit bool, walletType st

for _, test := range tests {
node.listUnspent = test.unspents
wallet.bondReservesEnforced = test.bondReservesEnforced
wallet.bondReserves.Store(test.bondReserves)

_, err := sender(addr.String(), test.val)
if test.expectErr {
Expand Down