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

Add router Runes balance and format Tx response to JSON #2978

Merged
merged 24 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
55 changes: 29 additions & 26 deletions src/subcommand/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ impl Server {
.route("/rare.txt", get(Self::rare_txt))
.route("/rune/:rune", get(Self::rune))
.route("/runes", get(Self::runes))
.route("/runes/balances", get(Self::runes_balances))
.route("/sat/:sat", get(Self::sat))
.route("/search", get(Self::search_by_query))
.route("/search/*query", get(Self::search_by_path))
Expand Down Expand Up @@ -685,6 +686,10 @@ impl Server {
})
}

async fn runes_balances(Extension(index): Extension<Arc<Index>>) -> ServerResult<Response> {
Ok(Json(index.get_rune_balance_map()?).into_response())
lugondev marked this conversation as resolved.
Show resolved Hide resolved
}

async fn home(
Extension(server_config): Extension<Arc<ServerConfig>>,
Extension(index): Extension<Arc<Index>>,
Expand Down Expand Up @@ -787,33 +792,31 @@ impl Server {
Path(txid): Path<Txid>,
AcceptJson(accept_json): AcceptJson,
) -> ServerResult<Response> {
task::block_in_place(|| {
let transaction = index
.get_transaction(txid)?
.ok_or_not_found(|| format!("transaction {txid}"))?;

let inscription_count = index.inscription_count(txid)?;

Ok(if accept_json {
Json(TransactionJson {
chain: server_config.chain,
etching: index.get_etching(txid)?,
inscription_count,
transaction,
txid,
})
.into_response()
} else {
TransactionHtml {
transaction,
txid,
inscription_count,
chain: server_config.chain,
etching: index.get_etching(txid)?,
}
.page(server_config)
.into_response()
let transaction = index
.get_transaction(txid)?
.ok_or_not_found(|| format!("transaction {txid}"))?;

let inscription_count = index.inscription_count(txid)?;

Ok(if accept_json {
Json(TransactionJson {
transaction,
txid,
inscription_count,
chain: server_config.chain,
etching: index.get_etching(txid)?,
})
.into_response()
} else {
TransactionHtml {
transaction,
txid,
inscription_count,
chain: server_config.chain,
etching: index.get_etching(txid)?,
}
.page(server_config)
.into_response()
lugondev marked this conversation as resolved.
Show resolved Hide resolved
})
}

Expand Down
55 changes: 55 additions & 0 deletions tests/json_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -635,3 +635,58 @@ fn get_runes() {
}
);
}
#[test]
fn get_runes_balances() {
let bitcoin_rpc_server = test_bitcoincore_rpc::builder()
.network(Network::Regtest)
.build();

let ord_rpc_server =
TestServer::spawn_with_server_args(&bitcoin_rpc_server, &["--index-runes", "--regtest"], &[]);

create_wallet(&bitcoin_rpc_server, &ord_rpc_server);

bitcoin_rpc_server.mine_blocks(3);

let rune0 = Rune(RUNE);
let rune1 = Rune(RUNE + 1);
let rune2 = Rune(RUNE + 2);
let e0 = etch(&bitcoin_rpc_server, &ord_rpc_server, rune0);
let e1 = etch(&bitcoin_rpc_server, &ord_rpc_server, rune1);
let e2 = etch(&bitcoin_rpc_server, &ord_rpc_server, rune2);

bitcoin_rpc_server.mine_blocks(1);

let response = ord_rpc_server.json_request("/runes/balances");
assert_eq!(response.status(), StatusCode::OK);

let runes_balance_json: BTreeMap<Rune, BTreeMap<OutPoint, u128>> =
serde_json::from_str(&response.text().unwrap()).unwrap();

let mut runes_balances: BTreeMap<Rune, BTreeMap<OutPoint, u128>> = BTreeMap::new();
let mut b0: BTreeMap<OutPoint, u128> = BTreeMap::new();
let o0: OutPoint = OutPoint {
txid: e0.transaction,
vout: 1,
};
b0.insert(o0, 1000);
runes_balances.insert(rune0, b0);

let mut b1: BTreeMap<OutPoint, u128> = BTreeMap::new();
let o1: OutPoint = OutPoint {
txid: e1.transaction,
vout: 1,
};
b1.insert(o1, 1000);
runes_balances.insert(rune1, b1);

let mut b2: BTreeMap<OutPoint, u128> = BTreeMap::new();
let o2: OutPoint = OutPoint {
txid: e2.transaction,
vout: 1,
};
b2.insert(o2, 1000);
runes_balances.insert(rune2, b2);

pretty_assert_eq!(runes_balance_json, runes_balances);
}
Loading