Skip to content

[BCN] fix gnosis token history casing gap and return 400 for invalid ethmultisig addresses #4199

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

Open
msalcala11 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −9
Open

[BCN] fix gnosis token history casing gap and return 400 for invalid ethmultisig addresses #4199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions packages/bitcore-node/src/providers/chain-state/evm/api/gnosis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ export class GnosisApi {
const transactionQuery = getCSP(chain, network).getWalletTransactionQuery(params);
delete transactionQuery.wallets;
delete transactionQuery['wallets.0'];
// effects.* addresses were stored raw (lowercase) until 1df63364f and were
// never backfilled (fixEvmTxToFromAddressesCase.js only rewrites top-level
// to/from), so match either casing
const eitherCase = (address: string) => ({ $in: [address, address.toLowerCase()] });
let query;
if (tokenAddress) {
query = {
Expand All @@ -176,13 +180,13 @@ export class GnosisApi {
},
{
...transactionQuery,
'effects.contractAddress': tokenAddress,
'effects.from': normalizedMultisigContractAddress
'effects.contractAddress': eitherCase(tokenAddress),
'effects.from': eitherCase(normalizedMultisigContractAddress)
},
{
...transactionQuery,
'effects.contractAddress': tokenAddress,
'effects.to': normalizedMultisigContractAddress
'effects.contractAddress': eitherCase(tokenAddress),
'effects.to': eitherCase(normalizedMultisigContractAddress)
}
]
};
Expand All @@ -191,7 +195,7 @@ export class GnosisApi {
$or: [
{ ...transactionQuery, to: normalizedMultisigContractAddress },
{ ...transactionQuery, 'internal.action.to': normalizedMultisigContractAddress.toLowerCase() },
{ ...transactionQuery, 'effects.to': normalizedMultisigContractAddress }
{ ...transactionQuery, 'effects.to': eitherCase(normalizedMultisigContractAddress) }
]
};
}
Expand Down
9 changes: 9 additions & 0 deletions packages/bitcore-node/src/providers/chain-state/evm/api/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,15 @@ export class EVMRouter {
private streamGnosisWalletTransactions(router: Router) {
router.get(`/api/${this.chain}/:network/ethmultisig/transactions/:multisigContractAddress`, async (req, res) => {
const { network, multisigContractAddress } = req.params;
const { tokenAddress } = req.query;
// Validate and return a helpful 400 before toChecksumAddress throws downstream (which
// would surface as a 500). isAddress(x, false) accepts exactly what toChecksumAddress accepts.
if (!Web3.utils.isAddress(multisigContractAddress, false)) {
return res.status(400).send('Invalid multisig contract address');
}
if (tokenAddress !== undefined && (typeof tokenAddress !== 'string' || !Web3.utils.isAddress(tokenAddress, false))) {
return res.status(400).send('Invalid token address');
}
try {
return await Gnosis.streamGnosisWalletTransactions({
chain: this.chain,
Expand Down
8 changes: 4 additions & 4 deletions packages/bitcore-node/test/unit/models/transaction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ describe('Transaction Model', function() {
expect(findQuery.$or).to.deep.include({
chain: 'ETH',
network: 'mainnet',
'effects.contractAddress': gnosisBusdToken,
'effects.to': gnosisMultisigContractAddress
'effects.contractAddress': { $in: [gnosisBusdToken, gnosisBusdToken.toLowerCase()] },
'effects.to': { $in: [gnosisMultisigContractAddress, gnosisMultisigContractAddress.toLowerCase()] }
});
});

Expand All @@ -528,8 +528,8 @@ describe('Transaction Model', function() {
expect(findQuery.$or).to.deep.include({
chain: 'ETH',
network: 'mainnet',
'effects.contractAddress': gnosisBusdToken,
'effects.to': gnosisMultisigContractAddress
'effects.contractAddress': { $in: [gnosisBusdToken, gnosisBusdToken.toLowerCase()] },
'effects.to': { $in: [gnosisMultisigContractAddress, gnosisMultisigContractAddress.toLowerCase()] }
});
});

Expand Down