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

fix(wallet): add back missing txData for signTransaction,sendTransaction #263

Merged
merged 3 commits into from
Nov 6, 2023
Merged

fix(wallet): add back missing txData for signTransaction,sendTransaction #263

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39088fc
fix(wallet): add back missing txData for signTransaction,sendTransaction
legobeat Oct 26, 2023
bb639eb
chore: simplify txParams handling
legobeat Oct 26, 2023
9300187
Sign and Send should not override other request params
cryptodev-2s Nov 6, 2023
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
10 changes: 6 additions & 4 deletions src/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@
throw rpcErrors.invalidInput();
}

const params = req.params as [TransactionParams?];
const params = req.params[0] as TransactionParams | undefined;
const txParams: TransactionParams = {
from: await validateAndNormalizeKeyholder(params[0]?.from || '', req),
...params,
from: await validateAndNormalizeKeyholder(params?.from || '', req),
};
res.result = await processTransaction(txParams, req);
}
Expand All @@ -176,9 +177,10 @@
throw rpcErrors.invalidInput();
}

const params = req.params as [TransactionParams?];
const params = req.params[0] as TransactionParams | undefined;
const txParams: TransactionParams = {
from: await validateAndNormalizeKeyholder(params[0]?.from || '', req),
...params,
from: await validateAndNormalizeKeyholder(params?.from || '', req),
};
res.result = await processSignTransaction(txParams, req);
}
Expand Down Expand Up @@ -441,7 +443,7 @@
*
* @param address - The address to validate and normalize.
* @param req - The request object.
* @returns {string} - The normalized address, if valid. Otherwise, throws

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (16.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (20.x) 

Types are not permitted on @returns

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

There must be no hyphen before @returns description

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

JSDoc description does not satisfy the regex pattern

Check warning on line 446 in src/wallet.ts

View workflow job for this annotation

GitHub Actions / Build, lint, and test / Lint (18.x) 

Types are not permitted on @returns
* an error
*/
async function validateAndNormalizeKeyholder(
Expand Down
Loading