Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"private": true,
"devDependencies": {
"@types/jest": "29.5.13",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.9.0",
"mysql2": "^3.9.3",
"sequelize": "^6.37.2",
"sequelize-cli": "^6.6.2",
"typescript": "^5.8.2"
"@typescript-eslint/eslint-plugin": "8.58.2",
"@typescript-eslint/parser": "8.58.2",
"dotenv": "16.4.5",
"eslint": "9.39.4",
"eslint-config-airbnb-base": "15.0.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "28.14.0",
"mysql2": "3.22.0",
"sequelize": "6.37.2",
"sequelize-cli": "6.6.2",
"typescript": "5.8.2"
},
"packageManager": "yarn@4.7.0",
"dependencies": {
Expand All @@ -37,11 +37,11 @@
"@aws-sdk/client-sqs": "3.540.0",
"@hathor/wallet-lib": "2.12.0",
"@wallet-service/common": "1.5.0",
"bip32": "^4.0.0",
"bitcoinjs-lib": "^6.1.5",
"bitcoinjs-message": "^2.2.0",
"jest": "^29.7.0",
"tiny-secp256k1": "^2.2.3",
"bip32": "4.0.0",
"bitcoinjs-lib": "6.1.5",
"bitcoinjs-message": "2.2.0",
"jest": "29.7.0",
"tiny-secp256k1": "2.2.3",
"winston": "3.13.0"
}
}
8 changes: 4 additions & 4 deletions packages/daemon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
"@opentelemetry/sdk-trace-node": "1.30.1",
"assert": "2.1.0",
"aws-sdk": "2.1454.0",
"axios": "1.6.2",
"axios": "1.13.5",
"dotenv": "8.2.0",
"lodash": "4.17.21",
"mysql2": "3.5.2",
"lodash": "4.17.23",
"mysql2": "3.9.8",
"sequelize": "6.33.0",
"websocket": "1.0.33",
"winston": "3.13.0",
"ws": "8.13.0",
"ws": "8.17.1",
"xstate": "4.38.2",
"zod": "3.23.8"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/wallet-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
"@opentelemetry/sdk-trace-node": "1.30.1",
"@types/redis": "2.8.28",
"aws-lambda": "1.0.7",
"axios": "0.21.1",
"axios": "1.13.5",
"bip32": "3.0.1",
"bitcoinjs-lib": "6.1.5",
"bitcoinjs-message": "2.2.0",
"bitcore-lib": "8.25.10",
"bitcore-mnemonic": "8.25.10",
"firebase-admin": "13.0.0",
"joi": "17.4.0",
"jsonwebtoken": "8.5.1",
"lodash": "4.17.21",
"jsonwebtoken": "9.0.0",
"lodash": "4.17.23",
"mysql": "2.18.1",
"mysql2": "2.2.5",
"mysql2": "3.9.8",
"prom-client": "13.2.0",
"redis": "3.1.2",
"serverless-mysql": "1.5.4",
Expand Down Expand Up @@ -90,7 +90,7 @@
"ts-loader": "9.4.4",
"typescript": "4.9.3",
"typescript-eslint": "0.0.1-alpha.0",
"webpack": "5.88.2",
"webpack": "5.104.1",
"webpack-node-externals": "3.0.0"
}
}
46 changes: 8 additions & 38 deletions packages/wallet-service/src/fullnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ export const create = (baseURL = BASE_URL) => {
});

const version = async (): Promise<FullNodeApiVersionResponse> => {
const response = await api.get('version', {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get('version');
const { value, error } = FullnodeVersionSchema.validate(response.data);
if (error) {
throw new Error(error.message);
Expand All @@ -39,19 +36,13 @@ export const create = (baseURL = BASE_URL) => {
};

const downloadTx = async (txId: string) => {
const response = await api.get(`transaction?id=${txId}`, {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get(`transaction?id=${txId}`);

return response.data;
};

const getConfirmationData = async (txId: string) => {
const response = await api.get(`transaction_acc_weight?id=${txId}`, {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get(`transaction_acc_weight?id=${txId}`);

return response.data;
};
Expand All @@ -62,67 +53,46 @@ export const create = (baseURL = BASE_URL) => {
maxLevel: number,
) => {
const url = `graphviz/neighbours.dot/?tx=${txId}&graph_type=${graphType}&max_level=${maxLevel}`;
const response = await api.get(url, {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get(url);

return response.data;
};

const getStatus = async () => {
const response = await api.get('status', {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get('status');

return response.data;
}

const getHealth = async () => {
const response = await api.get('health', {
data: null,
headers: { 'content-type': 'application/json' },
});
const response = await api.get('health');

return response.data;
}

const getNCState = async (params: FullnodeGetNCStateAPIParams) => {
const response = await api.get('nano_contract/state', {
data: null,
params,
headers: { 'content-type': 'application/json' },
});
const response = await api.get('nano_contract/state', { params });

return response.data;
}

const getNCHistory = async (params: FullnodeGetNCHistoryAPIParams) => {
const response = await api.get('nano_contract/history', {
data: null,
params,
headers: { 'content-type': 'application/json' },
});
const response = await api.get('nano_contract/history', { params });

return response.data;
}

const getNCBlueprintInfo = async (blueprintId: string) => {
const response = await api.get('nano_contract/blueprint/info', {
data: null,
params: { blueprint_id: blueprintId },
headers: { 'content-type': 'application/json' },
});

return response.data;
}

const getTokenDetails = async (tokenId: string) => {
const response = await api.get('thin_wallet/token', {
data: null,
params: { id: tokenId },
headers: { 'content-type': 'application/json' },
});

return response.data;
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet-service/tests/commons.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ test('getFullnodeData with an uninitialized version_data database should call th
console.log(JSON.stringify(data));

expect(spy).toHaveBeenCalledTimes(1);
expect(spy).toHaveBeenCalledWith('version', expect.any(Object));
expect(spy).toHaveBeenCalledWith('version');
});

test('getFullnodeData with an initialized version_data database should query data from the database', async () => {
Expand Down
Loading
Loading