Skip to content

Prepare 23.2.3 rc2 #1363

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

Merged
jamesdorfman merged 4 commits into from
Sep 10, 2024
Merged

Prepare 23.2.3 rc2 #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f107021
fix: discountct package mining
delta1 Sep 9, 2024
99ca072
Merge pull request #1362 from delta1/ct-discount-package
psgreco Sep 9, 2024
49549ab
Merge branch 'master' into elem-23.2.3-rc2
psgreco Sep 9, 2024
4b22137
Bump version to 23.2.3rc2
psgreco Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 23)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_RC, 2)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2024)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
1 change: 1 addition & 0 deletions src/node/miner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ struct update_for_parent_inclusion
{
e.nModFeesWithAncestors -= iter->GetFee();
e.nSizeWithAncestors -= iter->GetTxSize();
e.discountSizeWithAncestors -= iter->GetDiscountTxSize();
e.nSigOpCostWithAncestors -= iter->GetSigOpCost();
}

Expand Down
57 changes: 57 additions & 0 deletions test/functional/feature_discount_ct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def set_test_params(self):
"-con_connect_genesis_outputs=1",
"-initialfreecoins=2100000000000000",
"-txindex=1",
"-blindedaddresses=1",
"-minrelaytxfee=0.00000100",
"-blockmintxfee=0.00000100",
"-fallbackfee=0.00000100",
Expand Down Expand Up @@ -184,6 +185,62 @@ def run_test(self):
tx = node0.getrawtransaction(txid, True)
assert_equal(tx['vsize'], 2575)

# check transaction package
self.log.info("Create discounted package")
addr = node1.getnewaddress()
addr2 = node1.getnewaddress()
utxo = node1.listunspent()[0]
fee = Decimal('0.00000035')
inputs = [{"txid": utxo["txid"], "vout": utxo["vout"]}]
change = Decimal('0.00001000')
amount = utxo["amount"] - change - fee
outputs = [
{addr: amount},
{addr2: change},
{"fee": fee}
]
raw = node1.createrawtransaction(inputs, outputs)
blind = node1.blindrawtransaction(raw, False)
signed = node1.signrawtransactionwithwallet(blind)
assert_equal(signed["complete"], True)
test = node1.testmempoolaccept([signed['hex']])
assert_equal(test[0]["allowed"], True)
txid = node1.sendrawtransaction(signed['hex'])
tx = node1.gettransaction(txid, True, True)
assert_equal(tx['decoded']['discountvsize'], 341)

for i in range(24):
self.log.info(f"Add package descendant {i+1}")
addr = node1.getnewaddress()
addr2 = node1.getnewaddress()
fee = Decimal('0.00000035')
change = Decimal('0.00001000')
inputs = [{"txid": txid, "vout": 0}]
amount -= change + fee
outputs = [
{addr: amount},
{addr2: change},
{"fee": fee}
]
raw = node1.createrawtransaction(inputs, outputs)
blind = node1.blindrawtransaction(raw, False)
signed = node1.signrawtransactionwithwallet(blind)
assert_equal(signed["complete"], True)
hex = signed["hex"]
test = node1.testmempoolaccept([hex])
assert_equal(test[0]["allowed"], True)
txid = node1.sendrawtransaction(hex)
tx = node1.gettransaction(txid, True, True)
assert_equal(tx['decoded']['discountvsize'], 341)
assert_equal(len(node1.getrawmempool()), i + 2)

assert_equal(len(node1.getrawmempool()), 25)
self.log.info("Mine the package")
self.generate(node1, 1, sync_fun=self.sync_blocks)
assert_equal(len(node1.getrawmempool()), 0)
tx = node1.gettransaction(txid, True, True)
assert_equal(tx["confirmations"], 1)
self.log.info("Success")

if __name__ == '__main__':
CTTest().main()