Skip to content

backport 0.31x: add http timeout & more data decode tx resp #1602

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

Closed
wants to merge 2 commits into from
Closed

backport 0.31x: add http timeout & more data decode tx resp #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44114e9
backport: add http timeout & more data decode tx resp
ducphamle2 Aug 16, 2024
e3b8e69
feat: also return more data from tx in searchTx
ducphamle2 Aug 17, 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
1 change: 1 addition & 0 deletions packages/stargate/src/stargateclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ export class StargateClient {
return results.txs.map((tx): IndexedTx => {
const txMsgData = TxMsgData.decode(tx.result.data ?? new Uint8Array());
return {
...tx,
height: tx.height,
txIndex: tx.index,
hash: toHex(tx.hash).toUpperCase(),
Expand Down
7 changes: 6 additions & 1 deletion packages/tendermint-rpc/src/rpcclients/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,14 @@ export async function http(
headers: Record<string, string> | undefined,
request?: any,
): Promise<any> {
const timeout = Number(
//@ts-ignore
process.env.HTTP_TIMEOUT || 30000,
);
if (typeof fetch === "function" && !isExperimental(fetch)) {
const settings = {
method: method,
signal: timeout,
body: request ? JSON.stringify(request) : undefined,
headers: {
// eslint-disable-next-line @typescript-eslint/naming-convention
Expand All @@ -55,7 +60,7 @@ export async function http(
.then((res: any) => res.json());
} else {
return axios
.request({ url: url, method: method, data: request, headers: headers })
.request({ url: url, method: method, data: request, headers: headers, timeout })
.then((res) => res.data);
}
}
1 change: 1 addition & 0 deletions packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ interface RpcTxResponse {

function decodeTxResponse(data: RpcTxResponse): responses.TxResponse {
return {
...data,
tx: fromBase64(assertNotEmpty(data.tx)),
result: decodeTxData(assertObject(data.tx_result)),
height: apiToSmallInt(assertNotEmpty(data.height)),
Expand Down
1 change: 1 addition & 0 deletions packages/tendermint-rpc/src/tendermint37/adaptor/responses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@ interface RpcTxResponse {

function decodeTxResponse(data: RpcTxResponse): responses.TxResponse {
return {
...data,
tx: fromBase64(assertNotEmpty(data.tx)),
result: decodeTxData(assertObject(data.tx_result)),
height: apiToSmallInt(assertNotEmpty(data.height)),
Expand Down