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

Merge Develop into Main; Bump to v1.1.2 #75

Merged
merged 29 commits into from
Jun 11, 2024
Merged

Merge Develop into Main; Bump to v1.1.2 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b2c8015
api: add routes for serializing and deserializing binary transactions…
Apr 26, 2024
79af253
api: allow JSON transaction deserialization to accept both hex string…
Apr 29, 2024
4b161d9
api: separate hex transaction decoding from json transaction conversion
Apr 29, 2024
cb17c95
Merge remote-tracking branch 'refs/remotes/upstream/develop' into fea…
Apr 29, 2024
eb804f5
api: add tests for [de]serialize_transactions routes
May 7, 2024
fa7accd
Restructuring user node payments to return tx data
BHouwens May 7, 2024
f42e8bc
Merge pull request #63 from AIBlockOfficial/lite-node-resp-struct
BHouwens May 7, 2024
8168061
Remove user seed from docker initial_block.json
BHouwens May 8, 2024
325aa4a
miner: actually sign aggregate transaction inputs
May 11, 2024
fd96db6
miner: forward b_num to functions called by receive_pre_block_and_random
May 11, 2024
7b8941e
Merge pull request #58 from DaMatrix/feature_api_tx_serialize
BHouwens May 13, 2024
087a27b
Merge pull request #65 from DaMatrix/dev/sign_miner_aggregate_txn
BHouwens May 13, 2024
68f1d72
Merge pull request #66 from DaMatrix/dev/fix_miner_underflow
BHouwens May 13, 2024
6abb0cf
chore: attempt fix for slack notifications
deowk May 13, 2024
2b60bac
Update status of mempool tx fetch
BHouwens May 13, 2024
865e2b8
Merge pull request #68 from AIBlockOfficial/chore_fix-slack-notify
deowk May 13, 2024
3b5ecf7
Transaction statuses added with lifetimes; Align with tw_chain v1.1.2
BHouwens May 13, 2024
866fa21
Merge pull request #69 from AIBlockOfficial/api_transaction_status
BHouwens May 13, 2024
b7301a8
Working update thread
BHouwens May 13, 2024
e0ca082
Implementing locktime fix via User request update
BHouwens May 14, 2024
a9c9b1f
Reset User alignment to every 120 seconds (2 mins)
BHouwens May 14, 2024
2c99a97
Merge pull request #70 from AIBlockOfficial/auto_update_total
BHouwens May 14, 2024
ed91add
Provide rails for handling handshake failure past peer limit
BHouwens May 21, 2024
14145f3
Cargo fmt
BHouwens May 21, 2024
46ec8e4
Merge pull request #72 from AIBlockOfficial/bugfix_peer_limit_handshake
BHouwens May 21, 2024
02606d0
Updating tw_chain dependency to v1.1.3
BHouwens Jun 6, 2024
80b4cfe
Adding sub-peer limit and list for miners on mempool nodes
BHouwens Jun 10, 2024
be196dd
Merge pull request #74 from AIBlockOfficial/separate_peer_lists
BHouwens Jun 11, 2024
541c751
Bumping to v1.1.2
BHouwens Jun 11, 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
9 changes: 1 addition & 8 deletions .docker/conf/initial_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@
]
},
"user_wallet_seeds": [
[
{
"out_point": "0-000010",
"secret_key": "3053020101300506032b6570042204200f49984bb4f0a1276af12b31b81245a47ba56ad4fd9aca163e056dea3ff00f73a123032100c111594923b43ddceb8031a5ac3dceeaba566dea24aa6119b62dcefb02ace5b8",
"public_key": "bf686a959447d6277513a9e7a534bab4bc3ee384afe5abbace6c31e2b2cc01ee",
"amount": 123
}
]
[]
],
"user_test_auto_gen_setup": {
"user_initial_transactions": [],
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
pull_request:
branches: ["*"]

permissions:
contents: read
security-events: write

jobs:
integration-tests:
name: Integration tests
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "aiblock_network"
version = "1.1.1"
authors = ["Byron Houwens <zhion360@gmail.com>"]
version = "1.1.2"
authors = ["Byron Houwens <byron.houwens@a-block.net>"]
edition = "2018"
readme = "README.md"
description = "The AIBlock Network"
Expand All @@ -21,7 +21,7 @@ hex = "0.4.2"
merkletree = "0.23.0"
merkle-log = "0.0.3"
moka = { version = "0.8.1", features = ["future"] }
tw_chain = "1.1.1"
tw_chain = "1.1.3"
keccak_prime = "0.1.0"
protobuf = "2.6.0"
raft = { git = "https://github.com/ABlockOfficial/raft-rs", branch = "0.5.1" }
Expand Down
Loading
Loading