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.

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

v10.4.0 #2242

Merged
merged 228 commits into from
Sep 18, 2024
Merged

v10.4.0 #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
73c397f
Dispenser must be created by source
Ouziel May 15, 2024
d34f680
status == STATUS_OPEN_EMPTY_ADDRESS means open_address != source
Ouziel May 15, 2024
249bc95
Don't raise error on closing
Ouziel Aug 8, 2024
1be848d
Compose dispense
Ouziel May 22, 2024
b3620d5
Add some tests
Ouziel May 22, 2024
74c5b0d
More tests; remove None from potential dispensers
Ouziel May 23, 2024
6b299b3
Add 'disable_vanilla_btc_dispense' protocol change
Ouziel Aug 8, 2024
65ba64d
update blueprint
Ouziel Aug 8, 2024
5efcff0
compose only if 'enable_dispense_tx' is enabled
Ouziel Aug 8, 2024
40b3f40
Update release notes
Ouziel Aug 8, 2024
61ab6a3
update release notes
Ouziel Aug 8, 2024
9447d1d
update blueprint
Ouziel Aug 8, 2024
e3400f9
Introduce fairminter.py
Ouziel Aug 8, 2024
ec47956
Simplify pack format
Ouziel Aug 8, 2024
e9553ce
Description cannot contain the '|' character.
Ouziel Aug 8, 2024
c61a1ff
clean arguments order
Ouziel Aug 8, 2024
855034d
disable too-many-arguments and too-many-locals
Ouziel Aug 9, 2024
2051bb0
Make dispense transaction more normal
Ouziel Aug 10, 2024
280caf0
fix tests
Ouziel Aug 10, 2024
0abd4c7
Merge branch 'develop' into composedispense
Ouziel Aug 10, 2024
e92b455
Merge branch 'develop' into requiresource
Ouziel Aug 10, 2024
0fecf05
Merge branch 'develop' into fairminting
Ouziel Aug 10, 2024
46af7b4
let's add some tests!
Ouziel Aug 10, 2024
4a7cb00
fairminter.py progress
Ouziel Aug 10, 2024
0fbf16d
open and close fairminters
Ouziel Aug 11, 2024
c51fe9b
Introduce 'fairmint.py'
Ouziel Aug 11, 2024
c6ed2a2
fairmint.py progress
Ouziel Aug 11, 2024
6c93e6f
soft cap management
Ouziel Aug 11, 2024
6b00eb5
close fairminter when hardcap is reached
Ouziel Aug 11, 2024
3e72fdb
Add compose functions and endpoints
Ouziel Aug 11, 2024
a95f2c3
use asset supply to check hardcap
Ouziel Aug 11, 2024
7aee9e1
commission management
Ouziel Aug 12, 2024
786cb08
Fair Minting API
Ouziel Aug 12, 2024
d8afe65
Destroy burnt payment
Ouziel Aug 12, 2024
a26ed7f
review and comments
Ouziel Aug 12, 2024
3a39526
Add missing check
Ouziel Aug 12, 2024
768d2a0
fix typos and tests
Ouziel Aug 12, 2024
fdf49b9
test progress
Ouziel Aug 13, 2024
72d1283
Add fairminters and fairmints in unit tests fixtures; Fix tests
Ouziel Aug 13, 2024
1e87690
more fairminters tests
Ouziel Aug 13, 2024
8831648
fix and tweak pre-minting support
Ouziel Aug 13, 2024
1894951
more tests
Ouziel Aug 13, 2024
5eedb2d
Add vectors file for fairmint module
Ouziel Aug 13, 2024
e5a241f
setup lockable issuance descriptions protocol change
warrenpuffett Aug 9, 2024
f3a0223
add column to create
warrenpuffett Aug 10, 2024
7ae9f5f
fix query
warrenpuffett Aug 10, 2024
d5c9a76
add validation for reseting description locked issuance
warrenpuffett Aug 12, 2024
51b67fb
fix tests
Ouziel Aug 13, 2024
ef3b05f
make more easy to add transaction in scenarios.py
Ouziel Aug 13, 2024
347a466
create release notes
warrenpuffett Aug 13, 2024
0f69cba
Add fairminters in 'scenarios.py'
Ouziel Aug 14, 2024
c08600c
more fairmint tests
Ouziel Aug 14, 2024
f543bdc
More tests and more fixes
Ouziel Aug 14, 2024
37b5e2a
introduce regtest node
Ouziel Aug 14, 2024
c78fa79
Regtest node: BTC and XCP for all addresses, clean shutdown and tweaks
Ouziel Aug 15, 2024
09dcaf1
Scenarios test for regtest
Ouziel Aug 15, 2024
eb340a0
lock description when description="lock_description"
warrenpuffett Aug 15, 2024
2daaa5b
Add context variables for scenarios
Ouziel Aug 15, 2024
520834b
update release notes
warrenpuffett Aug 15, 2024
188e14b
Merge pull request #2153 from CounterpartyXCP/wp/issue-1857
warrenpuffett Aug 15, 2024
dfba1ae
More tests and fixes
Ouziel Aug 15, 2024
1180b2a
more tests; fix
Ouziel Aug 15, 2024
6d5b3cc
More tests, fixes
Ouziel Aug 16, 2024
0c326f6
Merge branch 'develop' into fairminting
Ouziel Aug 16, 2024
242ed6f
Enable lock description with fairmint
Ouziel Aug 16, 2024
3e9b9ec
Tweak Text in Problems for Fair Minting
adamkrellenstein Aug 18, 2024
b91bcbc
misc fixes
warrenpuffett Aug 20, 2024
769e87e
rust fetcher now respects JSON_LOGS config option
warrenpuffett Aug 21, 2024
77b1815
Merge pull request #2173 from CounterpartyXCP/wp/rsfetcher-json-logs
warrenpuffett Aug 21, 2024
1defb27
Merge pull request #2142 from CounterpartyXCP/fairminting
ouziel-slama Aug 25, 2024
4e3d1e7
Merge branch 'develop' into composedispense
Ouziel Aug 26, 2024
4632988
fix tests
Ouziel Aug 26, 2024
187c208
Merge branch 'requiresource' into composedispense
Ouziel Aug 26, 2024
b60047f
fix tests
Ouziel Aug 26, 2024
2606453
fix issuances migration
Ouziel Aug 26, 2024
c134ce0
fix fixtures
Ouziel Aug 26, 2024
e003434
fix regtest scenarios
Ouziel Aug 26, 2024
b44fdbc
Add test; fix dispense.validate()
Ouziel Aug 26, 2024
ae9344c
remove wrong fix; fix test
Ouziel Aug 26, 2024
ee73020
Test expected errors with regtest
Ouziel Aug 26, 2024
54dc5e9
more regtest tests
Ouziel Aug 26, 2024
6785872
tweak release notes
Ouziel Aug 26, 2024
836d659
update release notes
Ouziel Aug 26, 2024
74c7e64
UTXO support initial commit
Ouziel Aug 26, 2024
9de93ff
linting
warrenpuffett Aug 26, 2024
3858fef
Merge pull request #2141 from CounterpartyXCP/composedispense
warrenpuffett Aug 26, 2024
668c26f
Introduce 'utxo.py' contract; Fix tests
Ouziel Aug 27, 2024
363b3af
Merge branch 'develop' into utxosupport
Ouziel Aug 27, 2024
9799950
fix typo
Ouziel Aug 27, 2024
6d74b60
fix/tweak invalid tx management
Ouziel Aug 27, 2024
cebbc1b
Monitor utxo moves with get_tx_info()
Ouziel Aug 27, 2024
7f62b81
add a row in 'sends' table for utxo moves
Ouziel Aug 27, 2024
6822c4c
unit tests and fixes
Ouziel Aug 27, 2024
05bc7ad
add intergation tests; fixes
Ouziel Aug 27, 2024
5e951e8
more unit tests
Ouziel Aug 27, 2024
58c61ab
always store potential utxo destination
Ouziel Aug 28, 2024
33e8a23
destination is optional for attachment
Ouziel Aug 28, 2024
ae1c9dd
add fee payment
Ouziel Aug 28, 2024
61aa9fd
Gas System
Ouziel Aug 28, 2024
5d368f6
tweak gas system
Ouziel Aug 28, 2024
a2de3e2
different fee params for each transaction
Ouziel Aug 28, 2024
94aa4c2
more unit tests; fix
Ouziel Aug 28, 2024
2f26ada
more test, more fixes
Ouziel Aug 28, 2024
3a49213
more tests; more fixes
Ouziel Aug 28, 2024
ccdbba5
add compose function to move assets from utxo to utxo
Ouziel Aug 29, 2024
a5d252a
more regtest tests
Ouziel Aug 29, 2024
fc4f440
Add 'exclude_utxos' parameter; More regtest test
Ouziel Aug 29, 2024
5695476
fix tests
Ouziel Aug 29, 2024
a17166c
update release notes
Ouziel Aug 29, 2024
cf938a8
no fee for detach
Ouziel Aug 29, 2024
8e1fb58
More regtest test; fix attach to new utxo
Ouziel Aug 29, 2024
27eeaba
Add 'more_utxos' parameter; test move from 2 utxos
Ouziel Aug 29, 2024
86e8dda
Typo
adamkrellenstein Aug 29, 2024
db3437c
Add 'utxo_address' fields in 'balances', 'credits' and 'debits'
Ouziel Aug 30, 2024
10e93b3
tweak
Ouziel Aug 30, 2024
eb76875
update API: search also by utxo_address
Ouziel Aug 30, 2024
63e0bbd
more regtest tests; fix api
Ouziel Aug 30, 2024
01f3c32
rolling average to calculate fee
Ouziel Aug 30, 2024
ccb8dfd
tweak
Ouziel Aug 30, 2024
2fe62fe
clean debug
Ouziel Aug 31, 2024
17cd84e
Add regtest test for divident to utxo
Ouziel Aug 31, 2024
06e80c5
Merge pull request #2180 from CounterpartyXCP/utxosupport
ouziel-slama Sep 1, 2024
2bc1d19
free subassets protocol change
warrenpuffett Sep 3, 2024
c271ad9
Merge pull request #2194 from CounterpartyXCP/wp/issue-1840
ouziel-slama Sep 3, 2024
5b55945
Add test for Atomic Swap
Ouziel Sep 5, 2024
89d32f4
Cleaning
Ouziel Sep 5, 2024
b531a07
Test Atomic Swap with Counterparty TX
Ouziel Sep 5, 2024
9f33d3e
protocol change allow subassets on numerics
warrenpuffett Sep 3, 2024
f060ec5
Merge pull request #2195 from CounterpartyXCP/wp/issue-1842
warrenpuffett Sep 5, 2024
ef74caf
update release notes
Ouziel Sep 5, 2024
a75def1
update release notes
Ouziel Sep 5, 2024
7d9a81a
Merge branch 'develop' into atomicswap
Ouziel Sep 6, 2024
a4dee32
Add regtest test for issuance updates
Ouziel Sep 6, 2024
6ed3e09
Add regtest test for orders updates
Ouziel Sep 6, 2024
619419a
fix test
Ouziel Sep 6, 2024
43e545a
Add 'quantity_by_price' argument
Ouziel Sep 6, 2024
bc67468
More tests, fix quantity_by_price
Ouziel Sep 6, 2024
079c61c
more tests; fix paid_quantity calculation
Ouziel Sep 7, 2024
1d89ae6
tweaks
Ouziel Sep 7, 2024
9912c93
Merge pull request #2203 from CounterpartyXCP/atomicswap
warrenpuffett Sep 7, 2024
8f97267
Distinguish Between Different "Issuance" Events
Ouziel Sep 9, 2024
c936a92
udpate release notes
Ouziel Sep 9, 2024
bc9c5b5
lock -> lock_quantity
Ouziel Sep 9, 2024
4663f10
Return only valid issuances
Ouziel Sep 9, 2024
e0f8442
Fix mempool on regtest and testnet
Ouziel Sep 9, 2024
5f935df
update release notes
Ouziel Sep 9, 2024
cca5b32
fix get asset dispensers query
warrenpuffett Sep 9, 2024
b26ba91
Merge pull request #2208 from CounterpartyXCP/wp/issue-2175
ouziel-slama Sep 10, 2024
5ea64dc
Merge pull request #2212 from CounterpartyXCP/validissuances
ouziel-slama Sep 10, 2024
077c440
Merge branch 'develop' into fixmempool
Ouziel Sep 10, 2024
5aaea4d
Merge pull request #2214 from CounterpartyXCP/fixmempool
ouziel-slama Sep 10, 2024
b525774
Merge branch 'develop' into assetevents
Ouziel Sep 10, 2024
cfca232
Merge pull request #2210 from CounterpartyXCP/assetevents
ouziel-slama Sep 10, 2024
e2b0ce8
Add routes to get all order_matches
Ouziel Sep 10, 2024
69c6352
All cursors as string
Ouziel Sep 10, 2024
43845a9
update release notes
Ouziel Sep 10, 2024
78a18d2
Use regtest to generate blueprint
Ouziel Sep 10, 2024
8eacc8d
More regtest tests; More docs
Ouziel Sep 10, 2024
611bf07
more scenarios, more doc
Ouziel Sep 11, 2024
ccf2d88
More tests, doc and fixes
Ouziel Sep 11, 2024
eecf182
Add regtest tests and doc for mempool routes
Ouziel Sep 11, 2024
cd45a5f
update unpack doc generation for regtest
Ouziel Sep 11, 2024
8da0d43
add regtest test for destroy transacion
Ouziel Sep 11, 2024
00367d7
Fix groups toc; Add fair minting and utxo events
Ouziel Sep 11, 2024
1ec9ac2
fix typo
Ouziel Sep 11, 2024
ddd5aaf
fix typo
Ouziel Sep 12, 2024
5076fdb
Test everything with dredd except Bet API
Ouziel Sep 12, 2024
29879d7
Remove dredd test from docker compose test
Ouziel Sep 12, 2024
032b63e
update release notes
Ouziel Sep 12, 2024
66b30b5
Merge pull request #2215 from CounterpartyXCP/apifixes
ouziel-slama Sep 12, 2024
0637612
Dynamic block_index, tx_index and event_index in regtest scenarios
Ouziel Sep 12, 2024
635fe1f
no more harcoded index in scenarios
Ouziel Sep 12, 2024
7e69843
static fees
Ouziel Sep 12, 2024
4a2ee48
tweak regtest mempool test
Ouziel Sep 12, 2024
b631cef
generate blueprint and run dredd test after regtest scenarios test
Ouziel Sep 12, 2024
d8183f6
be able to disable protocol change in regtest scenario
Ouziel Sep 12, 2024
93d454b
fix refill after protocol change
Ouziel Sep 12, 2024
c18e469
Add test to refill dispenser open by another address
Ouziel Sep 12, 2024
5567484
Merge pull request #2216 from CounterpartyXCP/regtest
ouziel-slama Sep 13, 2024
d9ef328
More tests; More fixes
Ouziel Sep 13, 2024
d3d08fc
update release notes
Ouziel Sep 13, 2024
bb1ffab
delete mempool events older than 24 hours
Ouziel Sep 13, 2024
cb372c9
test that the mempool is properly cleaned after each regtest transact…
Ouziel Sep 13, 2024
989c393
update release notes
Ouziel Sep 13, 2024
e2c84fd
Merge pull request #2217 from CounterpartyXCP/regtest
ouziel-slama Sep 13, 2024
109aaf3
Basic counterparty-server and bitcoin core client
Ouziel Sep 13, 2024
2fdb883
fix tests
Ouziel Sep 13, 2024
a57a441
Merge pull request #2218 from CounterpartyXCP/regtest
ouziel-slama Sep 14, 2024
dee7428
Colored Json; Code tweaks
Ouziel Sep 14, 2024
4dcfe2e
tweaks
Ouziel Sep 14, 2024
e7907e9
Add github workflow for regtest
Ouziel Sep 15, 2024
36b55e7
fix missing key
Ouziel Sep 15, 2024
857d85b
update server versions
Ouziel Sep 15, 2024
a46ab4d
download bitcoin core binaries
Ouziel Sep 15, 2024
31bd41a
use abspath for datadir
Ouziel Sep 15, 2024
20b16b7
wait a little more
Ouziel Sep 15, 2024
dba8e94
clean logs before restarting
Ouziel Sep 15, 2024
4891542
fix regtest workflow
Ouziel Sep 15, 2024
cf469cb
Merge pull request #2220 from CounterpartyXCP/testcompose
ouziel-slama Sep 16, 2024
3b3a2fd
Merge pull request #2219 from CounterpartyXCP/xcpcli
ouziel-slama Sep 16, 2024
942f477
Add checkpoint at 650000
Ouziel Sep 16, 2024
7d3cb81
update spec urls in release notes
Ouziel Sep 16, 2024
e91ef2a
bump version
Ouziel Sep 16, 2024
8a03917
Add checkpoint at 861500
Ouziel Sep 16, 2024
4938cb9
Reduce Sentry Reporting Rate
Ouziel Sep 16, 2024
5974a62
clean debug
Ouziel Sep 16, 2024
7a0b6ca
trigger docker compose test
Ouziel Sep 16, 2024
cecb0b0
more comments
Ouziel Sep 16, 2024
462a469
set protocol changes activation at block 866000
Ouziel Sep 16, 2024
cc9b72e
set disable_vanilla_btc_dispense at 866000
Ouziel Sep 16, 2024
879167a
Add getmempoolinfo endpoint
Ouziel Sep 16, 2024
f4f14cc
update fixtures
Ouziel Sep 16, 2024
fc0629d
Merge pull request #2227 from CounterpartyXCP/getmempoolinfo
ouziel-slama Sep 16, 2024
23970a5
Check previous block
Ouziel Sep 17, 2024
49facee
Merge pull request #2233 from CounterpartyXCP/fixmissblock
ouziel-slama Sep 17, 2024
463cf16
Log API v1 responses
Ouziel Sep 17, 2024
a120f02
update release notes
Ouziel Sep 17, 2024
58d4d56
Merge pull request #2236 from CounterpartyXCP/redirecttov1
ouziel-slama Sep 17, 2024
df171c1
Merge branch 'develop' into preprelease
Ouziel Sep 18, 2024
7a918d8
Fix reparse
Ouziel Sep 18, 2024
bf4db54
Merge pull request #2239 from CounterpartyXCP/testcompose
ouziel-slama Sep 18, 2024
ffb0242
Use orders cache only on catch up
Ouziel Sep 18, 2024
788240b
update release notes
Ouziel Sep 18, 2024
99257c7
update release notes
Ouziel Sep 18, 2024
781f56c
Merge pull request #2241 from CounterpartyXCP/testcompose
ouziel-slama Sep 18, 2024
a1291b2
Release Notes
adamkrellenstein Sep 18, 2024
177b640
Merge pull request #2224 from CounterpartyXCP/preprelease
ouziel-slama Sep 18, 2024
c269d31
Merge pull request #2243 from CounterpartyXCP/master
ouziel-slama Sep 18, 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
46 changes: 46 additions & 0 deletions .github/workflows/regtest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Regtest test

on:
push:
branches: "**"

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
default: true
- name: Install dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y libgirepository1.0-dev libleveldb-dev nodejs npm
python -m pip install --upgrade pip
pip install maturin sh rich pyyaml
cd counterparty-rs && pip install -e . && cd ..
cd counterparty-core && pip install -e . && cd ..
pip install evdev
git clone https://github.com/CounterpartyXCP/addrindexrs.git
cd addrindexrs
cargo install --path=.
wget https://bitcoincore.org/bin/bitcoin-core-27.1/bitcoin-27.1-x86_64-linux-gnu.tar.gz
tar -xvf bitcoin-27.1-x86_64-linux-gnu.tar.gz
sudo cp bitcoin-27.1/bin/bitcoin-cli /usr/local/bin/bitcoin-cli
sudo cp bitcoin-27.1/bin/bitcoind /usr/local/bin/bitcoind
sudo cp bitcoin-27.1/bin/bitcoin-wallet /usr/local/bin/bitcoin-wallet
npm install dredd --global
- name: Run regtest tests
run: |
cd counterparty-core
python3 counterpartycore/test/regtest/testscenarios.py
10 changes: 5 additions & 5 deletions .github/workflows/test_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,24 @@ CURRENT_HEIGHT=$(curl http://localhost:4000/v2/ --silent | jq '.result.counterpa
REPARSE_FROM=$(($CURRENT_HEIGHT-50))

# Stop, reparse and start counterparty-core mainnet
echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
docker compose --profile mainnet stop counterparty-core
docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
--backend-connect=bitcoind \
--indexd-connect=addrindexrs \
--rpc-host=0.0.0.0 \
--api-host=0.0.0.0

echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)

docker compose --profile mainnet up -d counterparty-core

# wait for counterparty-core to be ready
while [ "$(docker compose logs counterparty-core 2>&1 | grep 'API Watcher - Catch up completed')" = "" ]; do
while [ "$(docker compose logs counterparty-core 2>&1 | grep 'Watching for new blocks...')" = "" ]; do
echo "Waiting for counterparty-core mainnet to be ready"
sleep 1
done

# Run dredd test
dredd


# Run compare hashes test
. "$HOME/.profile"
cd counterparty-core
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Docker Compose

on:
push:
branches: ['develop', 'master', 'testcompose']
branches: ['develop', 'master', 'preprelease']

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ dist/
.env.leave
.venv/
test-results/

# cursor
._*
Loading
Loading